aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into rinkebyDan Finlay2017-04-289-16/+12
|\
| * Fix linting warningsThomas Huang2017-04-279-16/+12
| |
* | Linting.Kevin Serrano2017-04-262-2/+2
| |
* | Add missing changes. Create unique style for rinkeby icon.Kevin Serrano2017-04-267-4/+20
| |
* | change network name to rinkeby when selectedNickyg2017-04-261-1/+10
| |
* | add rinkeby networkNickyg2017-04-264-1/+21
|/
* fix spellingfrankiebee2017-04-252-4/+4
|
* Css fixesfrankiebee2017-04-242-7/+9
|
* make buy button greenfrankiebee2017-04-241-1/+1
|
* Fix issue where stopPropagation didnt stop submitting the tx when clicking ↵frankiebee2017-04-241-1/+1
| | | | buy button
* remove updateCoinBaseAmount actionJared Pereira2017-04-243-25/+0
|
* remove updateBuyAddress actionJared Pereira2017-04-244-29/+1
|
* remove case buyFormJared Pereira2017-04-231-3/+0
|
* remove buyButtonDeligator functionJared Pereira2017-04-231-12/+0
|
* remove extra buyAddress in stateJared Pereira2017-04-231-1/+0
|
* Initial redo attempt of the buy view to look like vladt's desighnfrankiebee2017-04-196-195/+173
|
* Create a custom radio list componentfrankiebee2017-04-191-0/+61
|
* Fix account detail transition fix.Kevin Serrano2017-04-062-2/+2
|
* clean - remove unused extension refkumavis2017-04-051-3/+2
|
* add platforms to mascara + move buyEther window open to uikumavis2017-04-053-10/+13
|
* Merge branch 'master' into mascarafrankiebee2017-04-037-63/+52
|\
| * ui - use global.platform for extension interactionkumavis2017-04-014-22/+13
| |
| * ui - move popup auto-close after tx conf to ui entrypointkumavis2017-04-011-5/+4
| |
| * ui - startPopup returns store after bootkumavis2017-04-012-10/+14
| |
| * ui - reducer - app - code cleanupkumavis2017-04-011-27/+20
| |
| * etc - fix notification-manager ref, remove duplicated test filekumavis2017-03-311-2/+4
| |
| * introduce platform api and rename notifications to notification-managerkumavis2017-03-311-1/+1
| |
| * extension - prefer extensionizer modulekumavis2017-03-315-5/+5
| |
* | Merge branch 'master' into mascarafrankiebee2017-04-032-4/+8
|\|
| * Fix potential formatting issues for seed word display.Kevin Serrano2017-03-292-4/+8
| |
* | Merge branch 'master' into mascarafrankiebee2017-03-2916-523/+536
|\|
| * Merge pull request #1268 from MetaMask/kovan-faucet-instructionsDan Finlay2017-03-291-2/+9
| |\ | | | | | | Add Kovan faucet instructions
| | * Merge branch 'master' into kovan-faucet-instructionsDan Finlay2017-03-296-131/+47
| | |\
| | * \ Merge branch 'master' into kovan-faucet-instructionsKevin Serrano2017-03-281-0/+3
| | |\ \
| | * | | Add link to kovan faucet instructions.Kevin Serrano2017-03-281-2/+9
| | | | |
| * | | | Merge pull request #1273 from MetaMask/i1267-seedfixDan Finlay2017-03-293-32/+5
| |\ \ \ \ | | |_|_|/ | |/| | | 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-283-32/+5
| | | |/ | | |/|
| * | | Merge pull request #1272 from MetaMask/hideseedwordsfromlogstateDan Finlay2017-03-291-1/+5
| |\ \ \ | | | | | | | | | | Hide seed words from UI State Dump
| | * | | Remove seedWords from UI state dump.Kevin Serrano2017-03-281-1/+5
| | |/ /
| * | | Filter txs by txMeta network value in account detailkumavis2017-03-292-3/+3
| | | |
| * | | Detect tx network from txMetaDan Finlay2017-03-291-1/+1
| | | |
| * | | Improve UI gas calculation logicDan Finlay2017-03-293-127/+39
| |/ / | | | | | | | | | | | | | | | | | | | | | - 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.
| * / Fix edge case where notice does not require scrollbar.Kevin Serrano2017-03-281-0/+3
| |/
| * Merge branch 'ropsten-fix-2' of github.com:MetaMask/metamask-plugin into ↵kumavis2017-03-281-1/+1
| |\ | | | | | | | | | ropsten-fix
| | * block explorer - ropstenkumavis2017-03-281-1/+1
| | | | | | | | | | | | etherscan differentiates between "attacked ropsten" vs "revived ropsten" https://ropsten.etherscan.io/ is the revived ropsten
| * | block explorer - account link - ropstenkumavis2017-03-281-1/+1
| |/ | | | | | | etherscan differentiates between "attacked ropsten" vs "revived ropsten" https://ropsten.etherscan.io/ is the revived ropsten
| * Merge branch 'master' into kovan-noticeDan Finlay2017-03-258-452/+563
| |\
| | * Add personalMessages to function to calculate pending tx index.Kevin Serrano2017-03-251-1/+2
| | |
| | * Fix tx selecting bugDan Finlay2017-03-252-2/+3
| | |
| | * Remove goHome action causing erratic UI behavior.Kevin Serrano2017-03-251-1/+0
| | |
| | * Remove unnecessary logDan Finlay2017-03-251-2/+0
| | |
| | * Disable accept button when gas limit is too lowDan Finlay2017-03-251-8/+5
| | |
| | * Make gas calculations on render more consistentDan Finlay2017-03-241-10/+16
| | |
| | * Fix initial tx fee estimationDan Finlay2017-03-242-4/+5
| | |
| | * Fix a couple thingsDan Finlay2017-03-242-15/+42
| | | | | | | | | | | | | | | | | | | | | | | | Sorry apparently the gas fixes weren't in the last commit, but are in this one. As reported in previous commit, fixes a bug where initial estimate is not derived from the network. Also fixes a bug where clicking "reset" does not clear our custom validation warnings.
| | * Make reset button clear errorsDan Finlay2017-03-241-0/+1
| | |
| | * Fix initial gas price estimateDan Finlay2017-03-241-4/+5
| | |
| | * Prevent default for reset and reject buttonsDan Finlay2017-03-242-1/+3
| | |
| | * Override browser default validation messageDan Finlay2017-03-241-0/+1
| | |
| | * Fix some broken refsDan Finlay2017-03-241-2/+2
| | |
| | * Merge branch 'i1234-HardGasLimits-BrowserForm' of ↵Dan Finlay2017-03-2413-12/+47
| | |\ | | | | | | | | | | | | github.com:MetaMask/metamask-plugin into i1234-HardGasLimits-BrowserForm
| | | * Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-241-1/+1
| | | |\
| | | * \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-2310-8/+41
| | | |\ \
| | | * \ \ Merge branch 'master' into i1234-HardGasLimits-BrowserFormKevin Serrano2017-03-232-3/+5
| | | |\ \ \
| | * | | | | Combine pending-tx-details component into pending-tx-detailsDan Finlay2017-03-242-370/+346
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were only separated originally so we could make the notification-based TX approval work, which provided its own buttons. This two templates are logically highly coupled, and keeping them working while separate has been difficult at times, and has even required resorting to dubious practices, like using React's `refs` pattern. This combines them into one fairly large component, but I think it's ok, we can still break this up into components, just not the separation that it had previously.
| | * | | | Merge branch 'master' into i1234-HardGasLimits-BrowserFormDan Finlay2017-03-233-46/+75
| | |\ \ \ \
| | * | | | | Got basic validations workingDan Finlay2017-03-235-108/+199
| | | | | | |
| | * | | | | Some progressDan Finlay2017-03-232-7/+16
| | | | | | |
| * | | | | | Reset disabled state for confirm button after every notice.Kevin Serrano2017-03-231-1/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' into mascarafrankiebee2017-03-2420-89/+218
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Enable etherscan linking on Kovan transaction list items.Kevin Serrano2017-03-231-1/+1
| |/ / / /
| * | | | Merge branch 'master' into i238-kovanKevin Serrano2017-03-233-4/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into hide-passwordKevin Serrano2017-03-232-4/+2
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' into i1193-errorstylefixDan Finlay2017-03-232-3/+5
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Fix styling of error message.Kevin Serrano2017-03-232-4/+2
| | | | |_|/ | | | |/| |
| | * | | | Merge branch 'master' into hide-passwordKevin Serrano2017-03-232-3/+5
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Hide the password in the private key retrieval screen.Kevin Serrano2017-03-231-0/+1
| | | |/ / | | |/| |
| * | | | Merge branch 'master' into i238-kovanDan Finlay2017-03-232-3/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' into i1033-spinnerfixkumavis2017-03-233-45/+74
| | |\| |
| | * | | 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-222-5/+3
| | | | | | | | | | | | | | | | | | | | disappear with display warning.
| | * | | Add action to hide loading indication on an incorrect pw.Kevin Serrano2017-03-211-2/+5
| | | |/ | | |/|
| * | | Add Kovan test network to our application.Kevin Serrano2017-03-231-0/+9
| | | |
| * | | Add kovan to drop-menu-itemKevin Serrano2017-03-231-1/+4
| | | |
| * | | Add conditional kovan to current network component.Kevin Serrano2017-03-231-0/+12
| | | |
| * | | Add kovan conditional to config screen.Kevin Serrano2017-03-231-0/+5
| | | |
| * | | Add conditional kovan logic to etherscan link generators.Kevin Serrano2017-03-232-2/+7
| | | |
| * | | Modify css rule for unused hollow diamond.Kevin Serrano2017-03-231-1/+1
| | |/ | |/|
| * | Adjust private key confirmation style and logic.Kevin Serrano2017-03-213-46/+75
| |/
| * Improve personal_sign styleDan Finlay2017-03-172-11/+23
| | | | | | | | textarea was not resizing the way I'd expected, so made it permanently larger, to accomodate larger messages.
| * Merge branch 'master' into i1165-predictiveKevin Serrano2017-03-154-16/+13
| |\
| | * Merge branch 'master' into i1211-currencyretentionKevin Serrano2017-03-151-1/+5
| | |\
| | * | Rename variables to proper currency state variables.Kevin Serrano2017-03-154-16/+13
| | | |
| * | | Merge branch 'i1165-predictive' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-151-1/+5
| |\ \ \ | | | | | | | | | | | | | | | i1165-predictive
| | * \ \ Merge branch 'master' into i1165-predictivekumavis2017-03-151-1/+5
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Render config screen from unlock.Kevin Serrano2017-03-141-0/+4
| | | | |
| | | * | Display Custom RPC on lock screen.Kevin Serrano2017-03-141-1/+1
| | | |/
| * | / Minor change in removing opts object.Kevin Serrano2017-03-151-4/+1
| |/ /
| * | Add comments.Kevin Serrano2017-03-112-0/+6
| | |
| * | Allow for adding recently used addresses to address book.Kevin Serrano2017-03-103-4/+36
| | |
| * | Create persistence address book.Kevin Serrano2017-03-101-0/+1
| | |
| * | Create distinct labels and names for addresses.Kevin Serrano2017-03-101-1/+5
| | |
| * | Display owned addresses in datalist.Kevin Serrano2017-03-102-0/+12
| |/
* | WIP: indexdb is at an err state "provider is undefined"frankiebee2017-03-241-1/+0
| |
* | WIP: streams->indexdbfrankiebee2017-03-241-1/+1
|/
* Add ENS click to copyDan Finlay2017-03-091-9/+8
| | | | Also bump ethjs-ens version to get proper error for unregistered names.
* Get basic ENS workingDan Finlay2017-03-0911-59/+188
|\ | | | | | | & merge master into ENS branch.
| * Add more informative messageKevin Serrano2017-03-091-0/+6
| |
| * 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-082-21/+10
| |
| * Merge branch 'master' into i1144-moarrpcKevin Serrano2017-03-085-41/+93
| |\
| | * Remove logDan Finlay2017-03-071-1/+0
| | |
| | * Render personal_sign messages as utf-8 textDan Finlay2017-03-072-12/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calls to `personal_sign` are now: - When hex encoded, preserved as hex encoded, but displayed as utf-8 text. - When not hex encoded, decoded as utf-8 text as hex for signing. - The messages proposed for signing are displayed as UTF-8 text. - When the message cannot be rendered as UTF-8 text, it is displayed as hexadecimal. Fixes #1173
| | * Prevent submission of invalid gas parameters.Kevin Serrano2017-03-022-3/+26
| | |
| | * Various improvements to gas input.Kevin Serrano2017-03-023-27/+22
| | |
| | * Only allow numbers in gas inputsDan Finlay2017-03-021-0/+1
| | |
| * | Break out rpc update and rpclist into two reducers.Kevin Serrano2017-03-083-11/+31
| | |
| * | More conflict resolution.Kevin Serrano2017-03-022-2/+10
| |\ \
| | * \ Merge branch 'master' into i1144-moarrpcDan Finlay2017-02-2810-87/+263
| | |\ \
| | * | | Concatenate custom RPC labels that are too longDan Finlay2017-02-281-1/+9
| | | | |
| * | | | Fix merge conflicts.Kevin Serrano2017-03-0214-180/+534
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/|
| * | | Tested against code to play nice with unit tests.Kevin Serrano2017-02-243-8/+17
| | | |
| * | | Make the UI play nice with empty RPC lists.Kevin Serrano2017-02-231-1/+1
| | | |
| * | | LintoKevin Serrano2017-02-231-1/+1
| | | |
| * | | Implemented functionality for displaying recent custom RPCsKevin Serrano2017-02-232-2/+26
| | | |
| * | | Connect to actions.Kevin Serrano2017-02-222-0/+2
| | | |
* | | | Add ens recognition to send form inputDan Finlay2017-03-012-5/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attempts to lookup `.eth` addresses on ENS. Is currently failing. I've written an isolation example of the problem here: https://github.com/flyswatter/ens-test
* | | | Fix loading indication for conf-tx viewDan Finlay2017-03-011-1/+1
| |/ / |/| |
* | | Add reset button to reset gas fields.Kevin Serrano2017-03-012-4/+20
| | |
* | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-011-2/+12
|\ \ \ | | | | | | | | | | | | i765-gaslimits
| * \ \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-012-3/+3
| |\ \ \ | | | | | | | | | | | | | | | i765-gaslimits
| * | | | Gas and Gaslimit revert to default if set to 0Kevin Serrano2017-03-011-2/+12
| | | | |
* | | | | Add a couple more debug logsDan Finlay2017-03-011-0/+1
| |/ / / |/| | |
* | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-011-18/+4
|\| | | | | | | | | | | | | | | i765-gaslimits
| * | | lintsKevin Serrano2017-03-011-3/+0
| | | |
| * | | Remove advanced options for now.Kevin Serrano2017-03-011-15/+4
| | | |
* | | | Use correct action to update and submit txDan Finlay2017-03-012-3/+3
|/ / /
* | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-011-0/+2
|\ \ \ | | | | | | | | | | | | i765-gaslimits
| * | | lintKevin Serrano2017-03-011-2/+4
| | | |
* | | | LintedDan Finlay2017-03-012-4/+2
| | | |
* | | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-03-012-4/+17
|\| | | | | | | | | | | | | | | i765-gaslimits
| * | | Hide gas options behind an advanced options checkbox.Kevin Serrano2017-03-011-4/+16
| | | |
| * | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-011-1/+1
| |\ \ \ | | | | | | | | | | | | | | | i765-gaslimits
| * \ \ \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-012-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | i765-gaslimits
| * \ \ \ \ Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-03-012-30/+39
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | i765-gaslimits
| * | | | | | Add margins to align.Kevin Serrano2017-03-011-0/+1
| | | | | | |
* | | | | | | Remove gasMultiplier txMeta paramDan Finlay2017-03-013-84/+7
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Fix bug that showed conf-tx screen on boot at wrong timesDan Finlay2017-03-011-1/+1
| |_|/ / / |/| | | |
* | | | | Fixed bug that made send screen sometimes transition to account detailDan Finlay2017-03-012-2/+3
| |/ / / |/| | |
* | | | Fix infinite loop bugDan Finlay2017-03-012-30/+39
|/ / /
* | | Fix referenceDan Finlay2017-03-011-1/+1
| | |
* | | Reorder rows for better table logicDan Finlay2017-02-281-32/+37
| | |
* | | Emit updated tx values on accept clickDan Finlay2017-02-282-1/+20
| | |
* | | Remove unused functionDan Finlay2017-02-281-5/+0
| | |
* | | Add action for updating and approving a tx in one actionDan Finlay2017-02-281-0/+15
| | |
* | | Got gas live re-estimatingDan Finlay2017-02-282-20/+23
| | |
* | | Align input fields for gas.Kevin Serrano2017-02-281-0/+1
| | |
* | | Fix merge conflicts.Kevin Serrano2017-02-282-8/+68
|\ \ \
| * | | LintedDan Finlay2017-02-282-12/+6
| | | |
| * | | Add non-working gas recalculating logic to tx-details viewDan Finlay2017-02-281-6/+69
| | | |
* | | | Further styling to get hex component working. Fix some typos.Kevin Serrano2017-02-283-16/+44
|/ / /
* | | Merge branch 'i765-gaslimits' of github.com:MetaMask/metamask-plugin into ↵Kevin Serrano2017-02-2810-73/+249
|\ \ \ | | | | | | | | | | | | i765-gaslimits
| * \ \ Merge branch 'master' into i765-gaslimitsDan Finlay2017-02-2810-73/+249
| |\ \ \ | | | |/ | | |/|
| | * | Improve pending tx blue dot styleDan Finlay2017-02-242-9/+4
| | | |
| | * | Fix cancel msg signing behavior.Dan Finlay2017-02-244-13/+20
| | | |
| | * | Make personal sign view look niceDan Finlay2017-02-241-5/+16
| | | |
| | * | Got personal_sign workingDan Finlay2017-02-248-48/+133
| | | | | | | | | | | | | | | | Also fixed bug where signing would not close popup.
| | * | Add alternate UI for pending personal_sign messagesDan Finlay2017-02-242-14/+12
| | | |
| | * | Add personal sign actions and templateDan Finlay2017-02-234-26/+106
| | |/
* | / Move input boxes into table and into details component.Kevin Serrano2017-02-283-17/+39
|/ /
* | Make gasPrice accessible to the UI.Kevin Serrano2017-02-251-2/+1
| |
* | Merge github.com:MetaMask/metamask-plugin into i765-gaslimitsKevin Serrano2017-02-245-3/+46
|\|
| * Fix UI Dev Mode for Tx ApprovalDan Finlay2017-02-212-0/+10
| | | | | | | | | | | | | | | | | | | | The state object had been changed, but our mock states for tx approval were using the old keys. Rather than try to muck about and figure out each and every change, I've re-generated a UI dev state for tx approval, which should help @zanibas on his current project. We can continue adding new dev states as needed from here. If anyone catches a state that doesn't render correctly, it's worth checking if a new snapshot doesn't solve things. Debugged by adding new debugging loggers, and I've left them in place for easier future debugging.
| * Merge branch 'master' into i1128-noticesdevDan Finlay2017-02-212-0/+24
| |\
| | * Set default log levelsDan Finlay2017-02-211-0/+1
| | |
| | * Add debug logging to ui routing logic.Dan Finlay2017-02-212-0/+23
| | |
| * | Notices must be scrolled down to proceed from.Kevin Serrano2017-02-211-0/+9
| | |
| * | Fix typo.Kevin Serrano2017-02-211-2/+2
| | |
| * | Re-enable notices on dev.Kevin Serrano2017-02-211-1/+1
| |/
* | Broke hex decimal input into its own componentDan Finlay2017-02-183-25/+71
| | | | | | | | Also added a new state to try to make UI dev mode work again, but it has other issues, like #1128, that need to be addressed before UI dev mode can be used again.
* | Change state to props, add modifiable fields.Kevin Serrano2017-02-182-28/+54
|/
* Merge branch 'master' into i1089-networkfrontKevin Serrano2017-02-161-0/+9
|\
| * Revert old style message sighingFrankie2017-02-101-0/+9
| |
* | Remove custom RPC option when on lock screen.Kevin Serrano2017-02-161-1/+1
| |
* | Change networks from lock screen.Kevin Serrano2017-02-162-7/+7
| |
* | fix debugKevin Serrano2017-02-101-1/+1
| |
* | Prevent notices from opening in test and debug mode.Kevin Serrano2017-02-101-1/+1
| |
* | Delete all code related to disclaimers.Kevin Serrano2017-02-104-155/+13
|/
* 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
|
* Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-021-1/+1
|\
| * default a return of an empty arrayFrankie2017-02-021-1/+1
| |
| * lintingFrankie2017-02-021-1/+1
| |
| * fix transactions not showing up in historyFrankie2017-02-021-1/+1
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-02-0213-39/+22
|\|
| * rename selectedAccount to selectedAddresskumavis2017-01-3113-39/+22
| |
* | code clan up and testsFrankie2017-02-021-3/+3
| |
* | Merge branch 'dev' into messageManagerCleanUpFrankie2017-01-293-5/+6
|\|
| * migration 5 - move keyring controller state to substatekumavis2017-01-293-5/+6
| |
* | Clean up message manger includes:Frankie2017-01-2913-49/+52
|/ | | | | | | | | Provider egine bump Remove presence of message manger in keyring controller Change the status wording fom conf to approved make Message manager a class fix messages not being apart of the badge re write message manger to better reflect controller pattern
* Merge branch 'dev' of github.com:MetaMask/metamask-plugin into kumavis-refactor2kumavis2017-01-271-2/+0
|\
| * Fix ui overlapFrankie2017-01-271-2/+0
| |
* | metamask controller - cleanup remote apikumavis2017-01-271-2/+1
|/
* Merge branch 'dev' into i#1048kumavis2017-01-258-12/+107
|\
| * Merge pull request #1050 from MetaMask/fixConfTxBalanceLogickumavis2017-01-251-1/+1
| |\ | | | | | | Fix conf tx balance logic
| | * fix baseFrankie2017-01-251-2/+2
| | |
| | * Fix issue where ConfTx view lets you approve txs when the account has ↵Frankie2017-01-251-1/+1
| | | | | | | | | | | | insufficient balance
| * | 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
| | |
| * | Merge branch 'dev' into i715-AddJsonImportDan Finlay2017-01-191-1/+1
| |\|
| * | Add ability to import v3 JSON walletsDan Finlay2017-01-194-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Implement naieve JSON file importingDan Finlay2017-01-192-5/+76
| | | | | | | | | | | | Doesn't work on any JSON file I have, it's a very naieve strategy provided by ethereumjs-wallet. Will need to raise its sophistication before deploying to production.
| * | Added new modular private key import systemDan Finlay2017-01-192-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
* | | Fix issue where generating a new account would put it in loose keysFrankie2017-01-251-2/+2
| |/ |/|
* | Merge branch 'master' into Version-3.1.0Dan Finlay2017-01-191-1/+1
|\ \ | |/ |/|
| * Merge branch 'master' into fixSignedVsSubmittedFrankie2017-01-195-10/+11
| |\
| * | Fix the dissplay for submitted transactions and the listner wating to hear ↵Frankie2017-01-191-1/+1
| | | | | | | | | | | | when tx's were included in a block
* | | Fix test to log out despite number of menu itemsDan Finlay2017-01-181-1/+1
| | |
* | | Remove outdated referenceDan Finlay2017-01-181-4/+0
| | |
* | | Remove unused UI filesDan Finlay2017-01-182-109/+0
| | |
* | | Allow importing of private key stringsDan Finlay2017-01-184-8/+95
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #1021 A top-right menu item now allows `Account Import`. It has a menu (with one item for now) that allows importing a private key string. Errors are displayed, and a success navigates the user to their account list, where the imported account is labeled `LOOSE`.
* | | Merge branch 'i328-MultiVault-v1' into i715-AddImportMenuDan Finlay2017-01-1815-74/+368
|\ \ \
| * | | Develop import subviewsDan Finlay2016-11-055-17/+86
| | | |
| * | | Add import account placeholder templateDan Finlay2016-11-053-30/+71
| | | |
| * | | LintedDan Finlay2016-11-053-12/+8
| | | |
| * | | Add account adding subview placeholdersDan Finlay2016-11-054-39/+121
| | | |
| * | | Remove unused classDan Finlay2016-11-051-1/+1
| | | |
| * | | Convert buy subview to new tab bar componentDan Finlay2016-11-051-36/+47
| | | |
| * | | Scaffold new account viewDan Finlay2016-11-057-1/+125
| | | |
* | | | Add "import account" menu item + template viewDan Finlay2017-01-184-0/+63
| | | |
* | | | Fix message signing UI renderingDan Finlay2017-01-171-5/+10
| |_|/ |/| | | | | | | | | | | | | | [A recent PR](https://github.com/MetaMask/metamask-plugin/pull/1004) removed logic that rendered pending messages for approval. This commit fixes that.
* | | Merge branch 'master' into devDan Finlay2017-01-174-8/+7
|\ \ \
| * | | update coinbase info and viewFrankie2017-01-112-5/+5
| | | |
| * | | remove network Id 2 from explorer link and Add network Id 3Frances Pangilinan2016-12-212-3/+2
| | | |
* | | | Dont render conf-tx if their are no txParams to showFrankie2017-01-151-2/+4
| |_|/ |/| |
* | | remove orphaned commentFrankie2017-01-141-1/+0
| | |
* | | lintFrankie2017-01-141-1/+1
| | |
* | | Clean up codeFrankie2017-01-143-33/+37
| | |
* | | Fix sorting and instances where something could be undefinedFrankie2017-01-123-4/+5
| | |
* | | Merge branch 'dev' into integrateTxManagerUIFrankie2017-01-121-5/+4
|\ \ \
| * | | Send update to UI when changing selected accountDan Finlay2017-01-121-5/+4
| | | | | | | | | | | | | | | | Fixes #981
* | | | Fix wording and icon of failed txsFrankie2017-01-121-0/+6
| | | |
* | | | Take some of the tx Logic out of the UI and create a visble state for ↵Frankie2017-01-126-45/+40
|/ / / | | | | | | | | | pending and unaproved transactions
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 10:12:14 +0800