aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/actions.js
Commit message (Collapse)AuthorAgeFilesLines
* good progress adding pathsbrunobar792018-08-141-9/+18
|
* refactor to support multiple hw walletsbrunobar792018-08-111-4/+4
|
* Merge pull request #4897 from MetaMask/qr-code-scanBruno Barbieri2018-08-111-1/+38
|\ | | | | QR Code Scanner
| * add commentbrunobar792018-08-091-0/+5
| |
| * fix merge conflictsbrunobar792018-08-081-1/+2
| |\
| * | added crossbrowser support and error handlingbrunobar792018-08-011-1/+25
| | |
| * | use existing modalsbrunobar792018-07-311-24/+0
| | |
| * | fix merge conflictsbrunobar792018-07-271-9/+64
| |\ \
| * | | working without injectionbrunobar792018-07-251-15/+26
| | | |
| * | | camera working back and forthbrunobar792018-07-241-0/+21
| | | |
* | | | Get nonce for showing retry button using ethQuery transaction count.Dan Miller2018-08-091-0/+20
| |_|/ |/| |
* | | add & delete tokens per networkEsteban MIno2018-07-271-1/+2
| |/ |/|
* | Add close window support to signature requests. Move logic to actionsAlexander Tseung2018-07-241-9/+64
|/
* Merge pull request #4625 from MetaMask/initial-trezor-supportBruno Barbieri2018-07-201-0/+125
|\ | | | | Initial trezor support
| * added new global alertbrunobar792018-07-191-0/+18
| |
| * Merge branch 'develop' into initial-trezor-supportbrunobar792018-07-171-1/+1
| |\
| * \ Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-131-20/+50
| |\ \ | | | | | | | | | | | | initial-trezor-support
| * | | forget device and autiload account features addedbrunobar792018-07-121-0/+44
| | | |
| * | | account removal is workingbrunobar792018-07-111-0/+21
| | | |
| * | | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵brunobar792018-07-071-14/+20
| |\ \ \ | | | | | | | | | | | | | | | initial-trezor-support
| * \ \ \ fix merge conflictsbrunobar792018-07-021-1/+20
| |\ \ \ \
| * | | | | initial trezor supportBruno2018-06-101-0/+42
| | | | | |
* | | | | | Add updateSendHexData actionWhymarrh Whitby2018-07-181-0/+9
| |_|_|_|/ |/| | | |
* | | | | Remove send_ directory, revert to just having sendDan2018-07-161-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Revert accidentally changed constants. Require defaults in ens-input, gas-fee-display and confirm screens.
* | | | Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-071-20/+50
| |_|/ |/| |
* | | Improve error and promise resolution handling in action.js updateGasData().Dan2018-07-051-13/+14
| | |
* | | Remove unnecessary anonymous function call in actions.js gas estimation.Dan2018-07-041-7/+6
| | |
* | | Use background gas price estimation method in new ui.Dan2018-06-291-8/+14
| |/ |/|
* | Only show the customize gas modal if the estimateGas call is not currently ↵Dan2018-06-191-1/+20
|/ | | | in flight.
* Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-071-4/+6
|\
| * Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-031-10/+16
| |\
| * | Importing account by json and private key shows error and does not change ↵Dan2018-05-311-4/+6
| | | | | | | | | | | | account if no selectedAddress comes after import.
* | | Fix calculation of data property for gas estimation on token transfers.Dan2018-06-021-2/+0
| | |
* | | Merge branch 'i3725-refactor-send-component-' into ↵Dan2018-06-011-18/+32
|\ \ \ | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation
| * \ \ Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-011-18/+32
| |\ \ \ | | | |/ | | |/|
| | * | Add new alert modalsAlexander Tseung2018-06-011-10/+16
| | |/
| | * Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-301-8/+16
| | |
* | | Auto update gas estimate when to changes.Dan2018-05-311-1/+6
| | |
* | | Estimate gas using same algorithm as backend.Dan2018-05-311-4/+15
| | |
* | | Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks ↵Dan2018-05-311-44/+7
| | | | | | | | | | | | method.
* | | getParamsForGasEstimate extracts symbol from token instead of just accepting ↵Dan2018-05-311-2/+1
| | | | | | | | | | | | symbol.
* | | Rename gas change actions.Dan2018-05-311-8/+8
| | |
* | | Split out getGasEstimate logic from updateGasTotalDan2018-05-311-3/+12
|/ /
* | Send refactor: fix amount max button for tokens.Dan2018-05-241-1/+1
| |
* | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-241-23/+28
|\|
| * Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-231-0/+23
| |\ | | | | | | Update designs for Add Token screen
| | * Update designs for Add Token screenAlexander Tseung2018-05-201-0/+23
| | |
| * | Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-171-6/+6
| |/
| * Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-171-1/+3
| |\ | | | | | | | | | network-controller-remove-setNetworkEndpoints
| | * Add new unlock screen designAlexander Tseung2018-05-121-0/+2
| | |
| | * ui - actions - importNewAccount - rethrow err on failurekumavis2018-05-021-1/+1
| | |
| * | network - remove setNetworkEndpointskumavis2018-05-011-18/+0
| |/
| * ui - actions - importNewAccount - use async and pify for cleaner syntaxkumavis2018-05-011-24/+20
| |
| * Use new design for reveal seed screen. Persist seed words only in first time ↵Alexander Tseung2018-04-231-1/+43
| | | | | | | | flow
| * Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-221-14/+2
| | | | | | | | This reverts commit 2c8156ebe91941309d49e8f8f1ed8e9d740bb9de.
* | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-141-54/+70
| |
* | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-301-10/+60
| |
* | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-251-29/+30
|\ \
| * | Fix exception thrown when revealing seed wordsAlexander Tseung2018-04-191-6/+18
| |/
| * Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-191-2/+14
| |
| * Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-171-0/+1
| |\
| | * Require loglevel singleton in each module that uses itbitpshr2018-04-141-0/+1
| | |
| * | Maintain token prices using a background servicebitpshr2018-04-161-52/+6
| | |
| * | Fetch token prices based on contract addressbitpshr2018-04-161-23/+45
| |/
* | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-101-54/+128
|\|
| * Fix merge conflicts. Modify send workflowAlexander Tseung2018-04-031-2/+3
| |\
| * | Refactor onboarding flowAlexander Tseung2018-04-021-2/+3
| | |
| * | Fix i18n merge conflictsAlexander Tseung2018-03-301-1/+41
| |\ \
| * \ \ Fix merge conflictsAlexander Tseung2018-03-271-46/+101
| |\ \ \
| * \ \ \ Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵Alexander Tseung2018-02-091-0/+40
| |\ \ \ \ | | | | | | | | | | | | | | | | | | into cb-254
| * \ \ \ \ Fix merge conflicts from uat-nextAlexander Tseung2018-02-011-1/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-301-12/+96
| |\ \ \ \ \ \
| * | | | | | | Add route for signature requestAlexander Tseung2017-12-151-34/+97
| | | | | | | |
| * | | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-151-30/+50
| | | | | | | |
* | | | | | | | first commitDan2018-04-071-0/+2
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | network - use providerType for localhostkumavis2018-03-311-2/+3
| |_|_|_|_|/ |/| | | | |
* | | | | | ui - actions - fix log for background callkumavis2018-03-281-1/+1
| | | | | |
* | | | | | Merge branch 'master' into i18n-translator-reduxDan2018-03-271-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Use ens-input component in send-v2 to allow sending to ens names.Dan2018-03-261-2/+2
| | | | | |
* | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2018-03-211-1/+3
|\| | | | | | | | | | | | | | | | | | | | | | | i18n-translator-redux
| * | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-141-1/+9
| |\ \ \ \ \
| * | | | | | Lint fixes.Dan2018-03-091-1/+1
| | | | | | |
| * | | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-091-39/+87
| |\ \ \ \ \ \
| * | | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, ↵Dan2018-03-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | customize-gas-modal, and dependents.
* | | | | | | | Lint fixes.Dan2018-03-201-1/+0
| | | | | | | |
* | | | | | | | Handle i18n with redux.Dan2018-03-161-1/+42
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'master' into i3033-responsive-newui-onboardingkumavis2018-03-141-40/+87
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #3470 from danjm/newui-onboarding-fontskumavis2018-03-141-1/+1
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | Change fonts in new-ui onboarding to Roboto, with weight 400.
| | * | | | | | Update first time flow button fonts, and first-time-flow default font, to ↵Dan2018-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Roboto.
| * | | | | | | Fix flashing to Log in screen after logging in or restoring from seed phrase ↵Alexander Tseung2018-03-081-45/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3466)
| * | | | | | | Merge pull request #3409 from scsaba/seed-phrase-verificationDan Finlay2018-03-081-0/+7
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Add seed phrase verification script into background process
| | * | | | | | verify seedwords on log inCsaba Solya2018-03-041-0/+7
| | | | | | | |
* | | | | | | | Add welcome screen to new-ui browser first time flow.Dan2018-03-091-0/+8
|/ / / / / / /
* | / / / / / Shapeshift form handles market info unavailable errors.Dan2018-03-071-0/+1
| |/ / / / / |/| | | | |
* | | | | | Fix NewUI reveal seed flow. (#3410)Dan J Miller2018-03-031-2/+3
|/ / / / /
* | | | | Render loading inside notice screen, and don't set isLoading from ↵Dan2018-02-211-1/+0
| | | | | | | | | | | | | | | | | | | | unMarkPasswordForgotten.
* | | | | Only open a new window on restore from seed if in extension view.Dan2018-02-141-2/+0
| | | | |
* | | | | Remove chrome focus outline for mouse users. (#3230)Dan J Miller2018-02-131-0/+10
| |_|_|/ |/| | |
* | | | Merge branch 'uat' into uat-nextDan2018-02-081-0/+16
|\ \ \ \
| * \ \ \ Merge branch 'master' into uatDan2018-02-081-0/+16
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | added reset account featureBruno Barbieri2018-01-311-0/+16
| | | | |
* | | | | [NewUI] Opens to full screen when restoring from seed. (#3201)Dan J Miller2018-02-081-0/+24
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call.
* | | | Fix bug stemming from erroneously persistant unlock failure error message. ↵Dan J Miller2018-01-301-0/+10
|/ / / | | | | | | | | | (#3123)
* | | Adding one or more tokens sets the selected token before returning the user ↵Dan J Miller2018-01-171-0/+3
| | | | | | | | | | | | to the main screen. (#2995)
* | | New add account page with create and import options.Dan2018-01-131-0/+18
| | |
* | | [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-131-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New deposit ether modal. * New deposit modal full screen on mobile, and other style fixes. * Hide shapeshift option from deposit modal for now. * Add shapeshift form to new deposit modal. * Store recipient address for shapeshift tx in background. * Use Simpledropdown to achieve desired styling in coin selector. * Lint fix * Fix typos and remove dead code. * Remove storage of shapeshift receiving address from background. * Fix typos
* | | Fix logging out of old UI causing infinite spinner (#2914)Alexander Tseung2018-01-121-1/+5
| | |
* | | Track usage of old and new UI (#2794)Alexander Tseung2017-12-231-4/+33
| | | | | | | | | [NewUI] Track usage of old and new UI
* | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-211-0/+19
|\ \ \
| * | | Adds updateTransaction to background and used it to update after editing in ↵Dan2017-12-211-11/+11
| | | | | | | | | | | | | | | | send-v2.
| * | | Canceled, edited transactions show edited amount.Dan2017-12-211-0/+19
| | | |
* | | | Merge branch 'master' into NewUI-flatDan2017-12-211-0/+15
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Fix retry actionDan Finlay2017-12-071-2/+2
| | |
| * | View tx after editing state to unconfirmedDan Finlay2017-12-071-1/+9
| | |
| * | Fix actionDan Finlay2017-12-071-2/+2
| | |
| * | Add retry background method and actionDan Finlay2017-12-071-0/+6
| | |
* | | [NewUI] Hide UI toggle in mascara (#2772)Dan J Miller2017-12-211-5/+2
| |/ |/| | | | | | | | | * Hides old-UI on mascara. * Improve code clarity in select-app.js
* | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-081-0/+9
|\ \
| * | Update max amount behaviour to meet new specs.Dan2017-12-071-0/+9
| | |
* | | Show user notifications after switch between UIsDan2017-12-051-0/+4
| | |
* | | New-ui actions accomodates old-ui.Dan2017-12-051-7/+10
| | |
* | | Add UI selectionDan2017-12-051-0/+29
|/ /
* | making eslint happyJason Clark2017-11-261-2/+2
| |
* | toggle wired up to preferences property storeJason Clark2017-11-251-6/+17
| |
* | incremental commitClark, Jason (Contractor)2017-11-241-0/+9
| |
* | Create single action for updating all of send in redux state.Dan2017-11-151-0/+9
| |
* | Allow editing of send ether.Dan2017-11-151-0/+21
| |
* | Token balance in send state; validating sufficient tokens, validation ↵Dan2017-11-071-0/+9
| | | | | | | | updates on 'from' switching.
* | More lint fixesDan2017-11-021-6/+6
| |
* | Lint fixes for NewUI-flat.Dan2017-11-021-0/+2
| |
* | Fix Settings/Info screen being visible on logout (#2490)Alexander Tseung2017-10-271-1/+42
| |
* | Allow editing account name in account details modalAlexander Tseung2017-10-261-9/+17
| |
* | Fix send token bug.Dan2017-10-261-1/+2
| |
* | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-251-46/+103
|\|
| * Add Import With Seed PhraseChi Kei Chan2017-10-211-4/+14
| |
| * Fix linterChi Kei Chan2017-10-211-1/+1
| |
| * ShapeShift IntegrationChi Kei Chan2017-10-211-3/+21
| |
| * Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-211-0/+9
| |
| * Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-211-1/+1
| |
| * Implement Import Account ScreenJacky Chan2017-10-211-10/+17
| |
| * Add BackupPhraseScreenJacky Chan2017-10-211-7/+11
| |
| * Add NoticeScreenJacky Chan2017-10-211-13/+15
| |
| * Add UniqueImageScreenJacky Chan2017-10-211-10/+17
| |
* | Clear send state on cancelling and signing.Dan2017-10-241-1/+8
| |
* | Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-191-38/+393
|\ \ | |/ |/|
| * Handling to and amount errors.Dan2017-10-191-0/+10
| |
| * Move all of send state to metamask state.Dan2017-10-191-0/+46
| |
| * Get from and update addressBook in send-v2Dan2017-10-191-1/+1
| |
| * wipChi Kei Chan2017-10-181-0/+9
| |
| * Enable send-v2 functionality.Dan2017-10-181-0/+14
| |
| * Customize Gas connected to stateDan2017-10-161-0/+20
| |
| * Clear selected token when changing network.Dan2017-10-091-4/+11
| |
| * Removes old/second setProviderType method from before merge (commit bd99bc2e)Dan2017-10-051-9/+0
| |
| * Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-041-8/+8
| |\
| * | Enables remove token and ensures add/remove update the list without need for ↵Dan2017-10-041-5/+30
| | | | | | | | | | | | refresh.
| * | Shapeshift deposit tx modal.Dan2017-10-021-1/+4
| | |
| * | Query for gas estimatesChi Kei Chan2017-09-291-2/+2
| | |
| * | Keep privateKey out of state and clear it after closing export private key ↵Dan2017-09-281-13/+26
| | | | | | | | | | | | modal.
| * | Gets gas and price estimates when send components mount.Dan2017-09-271-2/+2
| | |
| * | Refactor to store estimated gas and price in local state, return promise ↵Dan2017-09-261-42/+18
| | | | | | | | | | | | from actions.
| * | Estimate gasPrice and gasLimit in send screen.Dan2017-09-261-0/+57
| | |
| * | get identities from getState() instead of passing from caller, only set new ↵Dan2017-09-231-2/+3
| | | | | | | | | | | | account label if label set.
| * | New account modal now allows for addition of account name.Dan2017-09-231-2/+18
| | |
| * | Integrate Add TokenChi Kei Chan2017-09-221-8/+31
| | |
| * | Merge branch 'master' into nmChi Kei Chan2017-09-191-0/+13
| |\ \
| * | | Clear token selection when changing account.Dan2017-09-161-0/+1
| | | |
| * | | Add token exchange ratesChi Kei Chan2017-09-131-0/+24
| | | |
| * | | Improve styling in Confirmation Screen; Show decoded send token dataChi Kei Chan2017-09-131-1/+0
| | | |
| * | | Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-121-0/+16
| | | |
| * | | Show confirm transaction screen when clicking a pending transaction in the list.Dan2017-09-081-3/+4
| | | |
| * | | Send Token screen partial UIChi Kei Chan2017-09-071-0/+8
| | | |
| * | | Adding Token transaction detail screenChi Kei Chan2017-09-061-0/+9
| | | |
| * | | Send tx working; user is taken to confirm page with correct transaction ↵Dan2017-09-061-1/+1
| | | | | | | | | | | | | | | | information.
| * | | Clean up send.js and eth-balance.js with es6.Dan2017-08-311-3/+3
| | | |
| * | | Hook up showAddToken to dropdown menu item in account options dropdownsdtsui2017-08-231-2/+1
| | | |
| * | | Extend modal implementation and state management to accomodate multiple ↵sdtsui2017-08-211-2/+4
| | | | | | | | | | | | | | | | modal types
| * | | [WIP] Extract network dropdown into own componentsdtsui2017-08-141-0/+18
| | | |
| * | | Add actions and reducers for global modalsdtsui2017-08-091-0/+17
| | | |
| * | | Merge branch 'master' into feat/mm-ui-5sdtsui2017-08-071-3/+6
| |\ \ \
| * | | | Integrate slideout menu with tx viewsdtsui2017-08-031-0/+15
| | | | |
| * | | | Hook up responsive sidebarsdtsui2017-08-031-0/+3
| | | | |
* | | | | Merge remote-tracking branch 'upstream/master'Sergey Ukustov2017-10-031-25/+8
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | network - remove long dead etherscan provider codekumavis2017-09-301-10/+0
| | | | |
| * | | | network - convert localhost from custom rpc to network typekumavis2017-09-301-15/+8
| | |_|/ | |/| |
* / | | Add eth_signTypedData handlerSergey Ukustov2017-09-301-0/+27
|/ / /
* | | Merge branch 'master' of github.com:davidp94/metamask-extension into ↵Kevin Serrano2017-09-081-0/+11
|\ \ \ | | | | | | | | | | | | rejectallunapproved
| * | | fix goHomedavidp942017-08-151-2/+6
| | | |
| * | | remove unused action typedavidp942017-08-151-1/+0
| | | |
| * | | cancel all txsDavidNinja2017-08-151-0/+8
| | | |
* | | | Transition to home view after tx errorDan Finlay2017-08-171-18/+5
|/ / /
* | | Merge branch 'master' into NewUIkumavis2017-08-041-3/+6
|\ \ \ | |/ / |/| / | |/
| * fix cancelTransaction not reciving a callbackfrankiebee2017-08-041-3/+6
| |
* | Remove unused parameterDan Finlay2017-07-281-1/+1
| |
* | Fix custom provider indicationDan Finlay2017-07-271-1/+1
| |
* | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-211-0/+1031
| |
* | Make folder for responsive UIDan Finlay2017-07-041-1031/+0
|/
* Fix token adding bugDan Finlay2017-06-281-1/+3
|
* Add ability to add tokens to token listDan Finlay2017-06-161-0/+14
| | | | Fiex #1616
* Create add token button and template viewDan Finlay2017-06-151-1/+10
|
* Persist selected account tabDan Finlay2017-06-151-4/+21
| | | | Also improve error handling with token balances.
* ui - remove web3, use eth-querykumavis2017-05-091-1/+1
|
* Fix linting warningsThomas Huang2017-04-271-3/+3
|
* remove updateCoinBaseAmount actionJared Pereira2017-04-241-9/+0
|
* remove updateBuyAddress actionJared Pereira2017-04-241-9/+0
|
* add platforms to mascara + move buyEther window open to uikumavis2017-04-051-3/+5
|
* Merge pull request #1273 from MetaMask/i1267-seedfixDan Finlay2017-03-291-1/+3
|\ | | | | Assure that seed words are placed into state tree upon request.
| * Assure that seed words are placed into state tree upon request.Kevin Serrano2017-03-281-1/+3
| |
* | Improve UI gas calculation logicDan Finlay2017-03-291-0/+1
|/ | | | | | | | - Now striping hex prefixed gas values, which may have been causing mis-estimation. - Unified calculation logic to be entirely functional. - Greatly simplified how the pending-tx form keeps updated form state. Still needs a commit from @kumavis to ensure the background passes in a txMeta.txParams.gasPrice value.
* Remove goHome action causing erratic UI behavior.Kevin Serrano2017-03-251-1/+0
|
* Merge branch 'master' into i1033-spinnerfixkumavis2017-03-231-8/+16
|\
| * Adjust private key confirmation style and logic.Kevin Serrano2017-03-211-9/+17
| |
* | Add one more loading indication.Kevin Serrano2017-03-231-0/+1
| |
* | Uncomment lines relating to showing indicator.Kevin Serrano2017-03-221-2/+2
| |
* | Remove redundant removal of loading indicator. Integrate loading indicator ↵Kevin Serrano2017-03-221-5/+2
| | | | | | | | disappear with display warning.
* | Add action to hide loading indication on an incorrect pw.Kevin Serrano2017-03-211-2/+5
|/
* Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-151-4/+4
|\
| * Rename variables to proper currency state variables.Kevin Serrano2017-03-151-4/+4
| |
* | Add comments.Kevin Serrano2017-03-111-0/+1
| |
* | Allow for adding recently used addresses to address book.Kevin Serrano2017-03-101-0/+14
|/
* Fix typo, switch to log.errorKevin Serrano2017-03-091-3/+3
|
* Remove unneeded setrpc method.Kevin Serrano2017-03-091-20/+8
|
* Nodeify and promisify calls to background.Kevin Serrano2017-03-091-9/+25
|
* Refactor of code into separate reducers and actions.Kevin Serrano2017-03-081-21/+9
|
* Break out rpc update and rpclist into two reducers.Kevin Serrano2017-03-081-6/+24
|
* More conflict resolution.Kevin Serrano2017-03-021-1/+1
|\
| * Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-281-31/+64
| |\
* | \ Fix merge conflicts.Kevin Serrano2017-03-021-38/+82
|\ \ \ | |/ / |/| |
| * | Use correct action to update and submit txDan Finlay2017-03-011-2/+2
| | |
| * | Remove gasMultiplier txMeta paramDan Finlay2017-03-011-9/+5
| | | | | | | | | | | | | | | | | | This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic. Removed it and the logic that referred to this now-outdated parameter.
| * | Add action for updating and approving a tx in one actionDan Finlay2017-02-281-0/+15
| |/
| * Fix cancel msg signing behavior.Dan Finlay2017-02-241-4/+4
| |
| * Got personal_sign workingDan Finlay2017-02-241-33/+44
| | | | | | | | Also fixed bug where signing would not close popup.
| * Add personal sign actions and templateDan Finlay2017-02-231-0/+22
| |
* | Tested against code to play nice with unit tests.Kevin Serrano2017-02-241-6/+12
| |
* | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-231-2/+3
| |
* | Connect to actions.Kevin Serrano2017-02-221-0/+1
|/
* Delete all code related to disclaimers.Kevin Serrano2017-02-101-19/+0
|
* Remove egregious alertDan Finlay2017-02-071-1/+0
|
* Mostly got shapeshift tx management into its own controllerDan Finlay2017-02-041-1/+2
| | | | Rendering the list is still having issues, so this isn't done yet.
* migration #9 - break out CurrencyController substatekumavis2017-02-031-2/+6
|
* migration 7 - break off TransactionManager substatekumavis2017-02-031-0/+30
|
* actions - dont expect background to provide newState, manually updatekumavis2017-02-031-12/+27
|
* rename selectedAccount to selectedAddresskumavis2017-01-311-10/+3
|
* metamask controller - cleanup remote apikumavis2017-01-271-2/+1
|
* Merge branch 'dev' into i#1048kumavis2017-01-251-1/+18
|\
| * Merge pull request #1051 from MetaMask/hotfix1048Frankie2017-01-251-2/+2
| |\ | | | | | | hotfix - addNewAccount - dont assume hd keyring position
| | * hotfix - dont assume hd keyring positionkumavis2017-01-251-2/+2
| | |
| * | Add ability to import v3 JSON walletsDan Finlay2017-01-191-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | There is now a menu item labeled "JSON File" for importing, and it can digest either: - v1 MyEtherWallet JSON files - v3 Account files (used by Geth, Mist, and MyEtherWallet). Fixes #715
| * | Added new modular private key import systemDan Finlay2017-01-191-0/+16
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Now any strategy for importing a private key that can be described as a pure function can be very easily turned into a MetaMask import strategy. I've created a generic and reusable UI action called `importNewAccount(strategy, args)`. The `strategy` is a unique identifier defined in `app/scripts/account-import-strategies`, and the `args` will be passed to the member of the `strategies` array whose key matches the strategy string. Strategies return private key hex strings, and are used by the metamask-controller to create a new keyring, and select that new account, before calling back. This also implements @frankiebee's idea of showing the imported account when it's been imported (my oversight!). This commit only moves us to this architecture, keeping feature parity for private key import, but has some untested code for importing geth-style JSON files as well!
* | background controller - extract KeyringC.placeSeedWords to MetamaskCkumavis2017-01-251-1/+15
| |