m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 20:57:12 +01:00
Code
8,585 Commits 2 Branches 0 Tags 265 MiB
9b9a2cc2e0
Commit Graph

387 Commits

Author SHA1 Message Date
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Dan
4f0881e41b Merge branch 'master' into i18n-translator-redux 2018-03-26 16:13:49 -02:30
Dan
a109a774a5 Use ens-input component in send-v2 to allow sending to ens names. 2018-03-26 11:40:11 -02:30
kumavis
29cc2f8ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-20 13:01:08 -07:00
Dan
2ddc2cc1fb Lint fixes. 2018-03-19 16:53:06 -02:30
Dan
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
Dan
798988597b Merge branch 'master' into retry-tx-refractor 2018-03-14 00:02:27 -02:30
kumavis
572234e383
Merge branch 'master' into i3033-responsive-newui-onboarding 2018-03-13 10:46:14 -07:00
kumavis
1fa5cec2ec
Merge pull request #3470 from danjm/newui-onboarding-fonts 
Change fonts in new-ui onboarding to Roboto, with weight 400.
 2018-03-13 10:44:08 -07:00
Dan
c1ff927fa0 Lint fixes. 2018-03-09 10:00:37 -03:30
Dan
81e72147ef Merge branch 'master' into retry-tx-refractor 2018-03-09 02:07:27 -03:30
Dan
5433d2fe3a Retry transaction logic added to tx-list-item, confirm-send-ether, customize-gas-modal, and dependents. 2018-03-09 00:19:26 -03:30
Dan
91c890041c Add welcome screen to new-ui browser first time flow. 2018-03-08 14:21:54 -03:30
Alexander Tseung
cbb65cc493
Fix flashing to Log in screen after logging in or restoring from seed phrase (#3466) 2018-03-08 16:29:29 +01:00
Dan
6c400c2e92 Update first time flow button fonts, and first-time-flow default font, to Roboto. 2018-03-07 22:37:53 -03:30
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification 
Add seed phrase verification script into background process
 2018-03-07 16:47:13 -08:00
Dan
376ffb758f Shapeshift form handles market info unavailable errors. 2018-03-06 13:49:41 -03:30
Csaba Solya
2b86d65d0c verify seedwords on log in 2018-03-03 22:08:10 +01:00
Dan J Miller
0d97ff2210
Fix NewUI reveal seed flow. (#3410) 2018-03-02 22:44:05 -03:30
Dan
66f55f954e Render loading inside notice screen, and don't set isLoading from unMarkPasswordForgotten. 2018-02-20 20:52:41 -03:30
Dan
b5b16e4ce0 Only open a new window on restore from seed if in extension view. 2018-02-13 15:19:53 -03:30
Dan J Miller
fe2ed68f11 Remove chrome focus outline for mouse users. (#3230) 2018-02-12 09:45:53 -08:00
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan J Miller
7f151b861c
[NewUI] Opens to full screen when restoring from seed. (#3201) 
* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
 2018-02-07 21:08:55 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Bruno Barbieri
e6fda855a5 added reset account feature 2018-01-31 03:33:15 -05:00
Dan J Miller
100642c0ea Fix bug stemming from erroneously persistant unlock failure error message. (#3123) 2018-01-29 18:44:43 -08:00
Alexander Tseung
ecc39c5a7a Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254 2018-01-29 18:22:52 -08:00
Dan J Miller
d7a1019a2c Adding one or more tokens sets the selected token before returning the user to the main screen. (#2995) 2018-01-16 12:14:03 -08:00
Dan
980e1bfcf8 New add account page with create and import options. 2018-01-12 13:42:51 -08:00
Dan J Miller
5c1dcf3e9b [NewUI-flat] New deposit ether modal UI. (#2642) 
* 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
 2018-01-12 11:48:18 -08:00
Alexander Tseung
b8310ac62e Fix logging out of old UI causing infinite spinner (#2914) 2018-01-11 15:49:10 -08:00
Alexander Tseung
a218008adf
Track usage of old and new UI (#2794) 
[NewUI] Track usage of old and new UI
 2017-12-22 10:43:02 -08:00
Chi Kei Chan
9959aea598
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 2017-12-20 17:38:28 -08:00
Dan
bf4043c59b Adds updateTransaction to background and used it to update after editing in send-v2. 2017-12-20 17:37:18 -08:00
Dan
1f1fc2c49e Canceled, edited transactions show edited amount. 2017-12-20 17:37:18 -08:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
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