1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 12:47:14 +01:00
Commit Graph

348 Commits

Author SHA1 Message Date
Dan J Miller
bccbf14b39 [NewUI] Hide UI toggle in mascara (#2772)
* Hides old-UI on mascara.

* Improve code clarity in select-app.js
2017-12-20 10:22:50 -08:00
Alexander Tseung
5d1187c37b Add route for signature request 2017-12-14 14:11:23 -08:00
Alexander Tseung
e226b10a89 Add react-router to allow use of the browser back button 2017-12-14 12:50:20 -08:00
Chi Kei Chan
845aec82b9
Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI 2017-12-07 09:46:28 -08:00
Dan
2e9137dddd Update max amount behaviour to meet new specs. 2017-12-06 21:15:39 -08:00
Dan Finlay
31564e0a86 Fix retry action 2017-12-06 23:20:15 -05:00
Dan Finlay
81fb9db1bc View tx after editing state to unconfirmed 2017-12-06 23:09:32 -05:00
Dan Finlay
97abbc5cbe Fix action 2017-12-06 22:55:47 -05:00
Dan Finlay
6ff580584a Add retry background method and action 2017-12-06 22:20:58 -05:00
Dan
9db00fa507 Show user notifications after switch between UIs 2017-12-04 23:36:54 -03:30
Dan
ce14ee2ffc New-ui actions accomodates old-ui. 2017-12-04 23:08:23 -03:30
Dan
7f79524070 Add UI selection 2017-12-04 23:08:23 -03:30
Jason Clark
75ef848196 making eslint happy 2017-11-25 15:47:34 -07:00
Jason Clark
fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
Dan
9e3f921ba9 Create single action for updating all of send in redux state. 2017-11-14 16:18:00 -08:00
Dan
34ca7290c5 Allow editing of send ether. 2017-11-14 16:18:00 -08:00
Dan
67bdfe87e3 Token balance in send state; validating sufficient tokens, validation updates on 'from' switching. 2017-11-06 15:57:57 -03:30
Dan
56e9f98bd0 More lint fixes 2017-11-02 09:45:59 -02:30
Dan
5a94775b3f Lint fixes for NewUI-flat. 2017-11-02 00:00:33 -02:30
Alexander Tseung
4e8d8639cb Fix Settings/Info screen being visible on logout (#2490) 2017-10-26 23:02:56 -07:00
Alexander Tseung
22d9e3a7e6 Allow editing account name in account details modal 2017-10-25 18:44:24 -07:00
Dan
0d39a3a8d4 Fix send token bug. 2017-10-25 12:21:35 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
Dan
b96ba55229 Clear send state on cancelling and signing. 2017-10-23 16:03:48 -02:30
Chi Kei Chan
f503120b82 Add Import With Seed Phrase 2017-10-20 22:31:59 -07:00
Chi Kei Chan
ac50db52a9 Fix linter 2017-10-20 21:51:37 -07:00
Chi Kei Chan
5cbbb476b3 ShapeShift Integration 2017-10-20 21:51:37 -07:00
Chi Kei Chan
c6a3d00d80 Fix merge conflict; separate onboarding buy screen 2017-10-20 21:51:37 -07:00
Jacky Chan
85e485128f Add Go to Coinbase; Show Buy Ether after signup 2017-10-20 21:51:37 -07:00
Jacky Chan
449bce5eea Implement Import Account Screen 2017-10-20 21:51:37 -07:00
Jacky Chan
1a9b217558 Add BackupPhraseScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
fd4fbdc0cd Add NoticeScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
e1497fafa6 Add UniqueImageScreen 2017-10-20 21:51:37 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan
60eda592b5 Handling to and amount errors. 2017-10-18 20:21:46 -07:00
Dan
f81226fbe9 Move all of send state to metamask state. 2017-10-18 20:21:46 -07:00
Dan
4f9ac1c4fe Get from and update addressBook in send-v2 2017-10-18 20:21:46 -07:00
Chi Kei Chan
5ee6e4d3b3 wip 2017-10-17 22:38:00 -07:00
Dan
ac43872c1a Enable send-v2 functionality. 2017-10-17 21:10:09 -04:00
Dan
a9244f5e42 Customize Gas connected to state 2017-10-15 23:09:05 -04:00
Dan
c9c940bfc1 Clear selected token when changing network. 2017-10-08 17:45:34 -07:00
Dan
583342bd56 Removes old/second setProviderType method from before merge (commit bd99bc2e) 2017-10-04 15:43:10 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Dan
ac4868170f Enables remove token and ensures add/remove update the list without need for refresh. 2017-10-03 15:46:01 -07:00
Sergey Ukustov
e11ca12890 Merge remote-tracking branch 'upstream/master' 2017-10-03 02:10:47 +03:00
Dan
ff64fe98dd Shapeshift deposit tx modal. 2017-10-01 18:58:57 -07:00
kumavis
a2b6d3ffc5 network - remove long dead etherscan provider code 2017-09-29 16:37:01 -07:00
kumavis
d6ea2fa425 network - convert localhost from custom rpc to network type 2017-09-29 16:35:58 -07:00
Sergey Ukustov
c2b8dada91 Add eth_signTypedData handler 2017-09-29 19:40:46 +03:00
Chi Kei Chan
67ee5b21e6 Query for gas estimates 2017-09-28 17:39:53 -07:00
Dan
10345a12c2 Keep privateKey out of state and clear it after closing export private key modal. 2017-09-27 18:06:26 -07:00
Dan
541b69dda9 Gets gas and price estimates when send components mount. 2017-09-26 18:43:26 -07:00
Dan
79bcb88db3 Refactor to store estimated gas and price in local state, return promise from actions. 2017-09-25 21:54:55 -02:30
Dan
88c4226bf1 Estimate gasPrice and gasLimit in send screen. 2017-09-25 21:54:55 -02:30
Dan
13f22ff6b0 get identities from getState() instead of passing from caller, only set new account label if label set. 2017-09-22 14:35:51 -07:00
Dan
a1d72a59fe New account modal now allows for addition of account name. 2017-09-22 14:35:51 -07:00
Chi Kei Chan
3ec2f53463 Integrate Add Token 2017-09-21 18:44:52 -07:00
Chi Kei Chan
6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
Dan
feb90f2fc4 Clear token selection when changing account. 2017-09-15 16:18:48 -07:00
Chi Kei Chan
8f31b05ac5 Add token exchange rates 2017-09-13 01:25:39 -07:00
Chi Kei Chan
8b5f2a95df Improve styling in Confirmation Screen; Show decoded send token data 2017-09-12 23:04:01 -07:00
Chi Kei Chan
7eb6dae418 Added signTokenTx; Adding token confirmation screen 2017-09-12 02:22:23 -07:00
Kevin Serrano
34e7bb5015
Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved 2017-09-07 13:20:14 -07:00
Dan
6d3b3d4203 Show confirm transaction screen when clicking a pending transaction in the list. 2017-09-07 10:25:56 -07:00
Chi Kei Chan
8b919758e5 Send Token screen partial UI 2017-09-07 04:24:03 -07:00
Chi Kei Chan
f1fb9e10a0 Adding Token transaction detail screen 2017-09-06 03:17:49 -07:00
Dan
78f39bcce6 Send tx working; user is taken to confirm page with correct transaction information. 2017-09-05 13:00:50 -07:00
Dan
3ce69e1b65 Clean up send.js and eth-balance.js with es6. 2017-08-30 16:46:24 -07:00
sdtsui
9d69401041 Hook up showAddToken to dropdown menu item in account options dropdown 2017-08-22 16:25:23 -07:00
sdtsui
4e9376ca71 Extend modal implementation and state management to accomodate multiple modal types 2017-08-20 18:32:58 -07:00
Dan Finlay
343a7e9cce Transition to home view after tx error 2017-08-16 17:06:21 -07:00
davidp94
f52ef5d496 fix goHome 2017-08-14 21:51:39 -07:00
davidp94
39424cdf45 remove unused action type 2017-08-14 21:35:57 -07:00
DavidNinja
399c51c048 cancel all txs 2017-08-14 21:29:21 -07:00
sdtsui
4cd33453dc [WIP] Extract network dropdown into own component 2017-08-13 22:15:21 +02:00
sdtsui
aab0fda9ac Add actions and reducers for global modal 2017-08-08 13:37:16 -07:00
sdtsui
02c2106c3b Merge branch 'master' into feat/mm-ui-5 2017-08-06 19:55:34 -07:00
kumavis
5a9257208c Merge branch 'master' into NewUI 2017-08-03 21:02:01 -07:00
frankiebee
7de58c8709 fix cancelTransaction not reciving a callback 2017-08-03 21:22:08 -04:00
sdtsui
dfa10763e3 Integrate slideout menu with tx view 2017-08-02 13:32:02 -07:00
sdtsui
7767f9f7ad Hook up responsive sidebar 2017-08-02 13:03:36 -07:00
Dan Finlay
f884477abb Remove unused parameter 2017-07-27 14:07:36 -07:00
Dan Finlay
c071591adb Fix custom provider indication 2017-07-26 15:30:41 -07:00
Dan Finlay
86d367957f Move responsive ui into its own folder for easier merges 2017-07-20 12:38:38 -07:00
Dan Finlay
5eb3d5d485 Make folder for responsive UI 2017-07-03 15:39:25 -07:00
Dan Finlay
5cfce8c45a Fix token adding bug 2017-06-27 14:45:43 -07:00
Dan Finlay
48789f2a3d Add ability to add tokens to token list
Fiex #1616
2017-06-15 16:22:53 -07:00
Dan Finlay
0e1e0aa323 Create add token button and template view 2017-06-14 20:55:56 -07:00
Dan Finlay
b7b9e0c1ac Persist selected account tab
Also improve error handling with token balances.
2017-06-14 14:21:50 -07:00
kumavis
68be86abe9 ui - remove web3, use eth-query 2017-05-08 12:29:08 -07:00
Thomas Huang
6bdb4c8728 Fix linting warnings 2017-04-26 21:05:45 -07:00
Jared Pereira
7f12be6a01 remove updateCoinBaseAmount action 2017-04-24 12:18:54 +04:00
Jared Pereira
5cabd3e02d remove updateBuyAddress action 2017-04-23 21:45:55 +04:00
kumavis
5a91adf7d8 add platforms to mascara + move buyEther window open to ui 2017-04-04 18:23:46 -07:00
Dan Finlay
f2587b7e80 Merge pull request #1273 from MetaMask/i1267-seedfix
Assure that seed words are placed into state tree upon request.
2017-03-28 14:54:04 -07:00
Dan Finlay
81d3658343 Improve UI gas calculation logic
- 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.
2017-03-28 11:52:15 -07:00
Kevin Serrano
a95d96d507
Assure that seed words are placed into state tree upon request. 2017-03-28 11:23:25 -04:00
Kevin Serrano
1dfcc54381
Remove goHome action causing erratic UI behavior. 2017-03-24 13:57:04 -04:00
kumavis
9ac2ce1744 Merge branch 'master' into i1033-spinnerfix 2017-03-22 09:57:15 -07:00
Kevin Serrano
f2e40e85b7 Add one more loading indication. 2017-03-22 12:18:13 -04:00
Kevin Serrano
b0c0c30689 Uncomment lines relating to showing indicator. 2017-03-21 13:38:27 -07:00
Kevin Serrano
605c2a7404 Remove redundant removal of loading indicator. Integrate loading indicator disappear with display warning. 2017-03-21 09:15:12 -07:00
Kevin Serrano
0e43606b16 Adjust private key confirmation style and logic. 2017-03-21 08:53:34 -07:00
Kevin Serrano
889132b16c Add action to hide loading indication on an incorrect pw. 2017-03-21 06:57:49 -07:00
Kevin Serrano
a186e40d17 Merge branch 'master' into i1165-predictive 2017-03-14 17:52:03 -07:00
Kevin Serrano
37ffcfcf0e Rename variables to proper currency state variables. 2017-03-14 17:06:16 -07:00
Kevin Serrano
2ab86b001d Add comments. 2017-03-10 09:34:13 -08:00
Kevin Serrano
b34ee4daa1 Allow for adding recently used addresses to address book. 2017-03-09 15:10:27 -08:00
Kevin Serrano
21769a008c
Fix typo, switch to log.error 2017-03-08 09:35:31 -08:00
Kevin Serrano
0ee8ca178e
Remove unneeded setrpc method. 2017-03-08 09:08:28 -08:00
Kevin Serrano
cf2268c3d2
Nodeify and promisify calls to background. 2017-03-08 09:06:41 -08:00
Kevin Serrano
e7e024bcdd
Refactor of code into separate reducers and actions. 2017-03-07 16:01:51 -08:00
Kevin Serrano
2a98beb878
Break out rpc update and rpclist into two reducers. 2017-03-07 10:25:50 -08:00
Kevin Serrano
e66035254f
More conflict resolution. 2017-03-01 10:04:25 -08:00
Kevin Serrano
0a3849ec84
Fix merge conflicts. 2017-03-01 10:01:21 -08:00
Dan Finlay
f908aaafbc Use correct action to update and submit tx 2017-02-28 14:45:21 -08:00
Dan Finlay
da88481560 Remove gasMultiplier txMeta param
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.
2017-02-28 14:08:00 -08:00
Dan Finlay
d844769c92 Add action for updating and approving a tx in one action 2017-02-27 18:26:04 -08:00
Dan Finlay
5edb3db969 Merge branch 'master' into i1144-moarrpc 2017-02-27 10:36:48 -08:00
Dan Finlay
961a83769b Fix cancel msg signing behavior. 2017-02-23 16:02:58 -08:00
Dan Finlay
4697aca02c Got personal_sign working
Also fixed bug where signing would not close popup.
2017-02-23 14:23:45 -08:00
Kevin Serrano
62854398f1
Tested against code to play nice with unit tests. 2017-02-23 13:56:58 -08:00
Dan Finlay
564f920ae0 Add personal sign actions and template 2017-02-22 16:30:09 -08:00
Kevin Serrano
7a0ce31bd3
Implemented functionality for displaying recent custom RPCs 2017-02-22 15:12:56 -08:00
Kevin Serrano
17a7436602
Connect to actions. 2017-02-21 12:51:56 -08:00
Kevin Serrano
65c84ac4b2
Delete all code related to disclaimers. 2017-02-09 18:17:50 -08:00
Dan Finlay
b529017149 Remove egregious alert 2017-02-06 16:45:40 -08:00
Dan Finlay
13ee92909c Mostly got shapeshift tx management into its own controller
Rendering the list is still having issues, so this isn't done yet.
2017-02-03 20:45:20 -08:00
kumavis
9e4ef45b6a migration #9 - break out CurrencyController substate 2017-02-02 23:32:24 -08:00
kumavis
99fa9ab13a migration 7 - break off TransactionManager substate 2017-02-02 20:20:13 -08:00
kumavis
296b278592 actions - dont expect background to provide newState, manually update 2017-02-02 16:46:56 -08:00
kumavis
f9b31fe2c3 rename selectedAccount to selectedAddress 2017-01-30 15:08:31 -08:00
kumavis
9ab8362843 metamask controller - cleanup remote api 2017-01-26 22:30:12 -08:00
kumavis
70b8e640f0 Merge branch 'dev' into i#1048 2017-01-24 15:39:33 -08:00
kumavis
463a56ff54 background controller - extract KeyringC.placeSeedWords to MetamaskC 2017-01-24 15:33:33 -08:00
Frankie
5811f2ab14 Merge pull request #1051 from MetaMask/hotfix1048
hotfix - addNewAccount  - dont assume hd keyring position
2017-01-24 13:38:24 -08:00
kumavis
745fff0c80 hotfix - dont assume hd keyring position 2017-01-24 13:29:48 -08:00
Frankie
8642ced310 Fix issue where generating a new account would put it in loose keys 2017-01-24 12:06:59 -08:00
Dan Finlay
5d8a3dd99b Add ability to import v3 JSON wallets
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
2017-01-18 16:45:39 -08:00
Dan Finlay
b52346388b Added new modular private key import system
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!
2017-01-18 15:20:48 -08:00
Dan Finlay
1ff4894b67 Allow importing of private key strings
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`.
2017-01-17 16:24:45 -08:00
Dan Finlay
958cbfbde4 Merge branch 'i328-MultiVault-v1' into i715-AddImportMenu 2017-01-17 13:58:54 -08:00
Dan Finlay
77bd010543 Add "import account" menu item + template view 2017-01-17 13:47:30 -08:00
Dan Finlay
d87a7b2a76 Send update to UI when changing selected account
Fixes #981
2017-01-11 15:15:37 -08:00
Dan Finlay
2c2cdc4475 Convert more actions to new simple pattern 2017-01-03 11:33:15 -08:00
Dan Finlay
10c818abac Restore missing line 2017-01-03 11:30:27 -08:00
Dan Finlay
013e6a608f Corrected instances of showWarning to displayWarning 2017-01-03 11:03:25 -08:00
Dan Finlay
8b7b097034 Apply new pattern to repetitive functions 2017-01-03 10:42:09 -08:00
Dan Finlay
3ebf029c04 Update account list after adding account
Fixed by finally making a function generator for a pattern we use frequently, communicating to the background process.

Fixes #961
2017-01-03 10:39:34 -08:00