m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 21:00:13 +01:00
Code
6,255 Commits 2 Branches 0 Tags 265 MiB
40bbca5d0d
Commit Graph

2094 Commits

Author SHA1 Message Date
Thomas Huang
b7c7083a11
Merge branch 'master' into i18n 2018-03-12 10:50:55 -04:00
Alexander Tseung
a07550d2ab Increase tap areas for menu buttons on mobile 2018-03-09 18:50:00 +01:00
Alexander Tseung
ab1b39f554
Remove de-selected token from selectedTokens hash instead of setting to null (#3494) 2018-03-09 16:31:53 +01:00
Alexander Tseung
d84341f323
Add empty object default value for tokenData (#3493) 2018-03-09 16:31:17 +01:00
Alexander Tseung
4b2e52795d
Explicitly define state in import account from json component (#3491) 2018-03-09 16:30:31 +01: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
2d6b378bf8 Adds inline opening of gas customization to confirm-send-ether screen. 2018-03-09 02:03:36 -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
6cee76b3e7 Add html and css for responsive retry button. 2018-03-08 16:12:25 -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
09dae760bc Correct caps of Send button on main screen. 2018-03-07 22:47:29 -03:30
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 J Miller
ca047b1ea0
Update network colours for better accessibility. (#3469) 2018-03-07 15:22:10 -03:30
Dan
b8dec68271 Make new-ui create password screen responsive. 2018-03-07 12:47:33 -03:30
Dan Finlay
abe8bc19a8
Merge branch 'master' into i18n 2018-03-06 20:13:53 -08:00
Dan
2420ad2477 Correct merge conflict resolution errors. 2018-03-06 22:26:13 -03:30
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 17:13:57 -08:00
kumavis
8e0131cbb5
Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording 
Replace Lock wording with Log Out / Log In
 2018-03-06 17:12:32 -08:00
Dan
9d215bab0f Merge branch 'master' into i18n 2018-03-06 20:45:45 -03:30
Dan Finlay
f06bca1151 Implemented feedback to make i18n work on mac 2018-03-06 15:32:35 -08:00
Dan Finlay
9762a73041
Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined 
Shapeshift form handles 'market info unavailable' errors.
 2018-03-06 15:07:51 -08:00
Dan Finlay
52b4876cf9
Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit 
Gracefully handle null token balance in new ui send.
 2018-03-06 15:05:43 -08:00
Dan Finlay
31e7d9263f
Merge pull request #3444 from danjm/i3348-minus-not-a-number 
Prevent user from selecting max amount until gas is estimated.
 2018-03-06 15:05:25 -08:00
Dan Finlay
cb4ad60800 Merge branch 'master' into i2475-UnifyLogInWording 2018-03-06 14:57:01 -08:00
Dan Finlay
b87687110d Replace Lock wording with Log Out / Log In 
Fixes #2475
 2018-03-06 14:51:26 -08:00
Dan J Miller
5ac330a89e
Default add-token decimal value to string (#3451) 2018-03-06 15:15:26 -03:30
Dan Finlay
a4bd7992cd
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 10:32:47 -08:00
Dan
376ffb758f Shapeshift form handles market info unavailable errors. 2018-03-06 13:49:41 -03:30
Alexander Tseung
5f8a632fec
Fix seed phrase validation clearing form (#3417) 
* Fix seed phrase validation clearing form

* Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
 2018-03-06 09:14:57 -08:00
Dan
462d57cb6a Gracefully handle null token balance in new ui send. 2018-03-06 00:23:29 -03:30
criw
b393b54e35 FIX #3440 improved verification of restore from seed phrase 2018-03-06 04:43:12 +01:00
Dan
68604b53dd Prevent user from selecting max amount until there is an estimated gas total. 2018-03-05 23:12:06 -03:30
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. (#3416) 2018-03-05 13:33:46 -03:30
Csaba Solya
2b86d65d0c verify seedwords on log in 2018-03-03 22:08:10 +01:00
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -08:00
Thomas
ee254b4f6f Import Account disclaimer 2018-03-02 18:24:09 -08:00
Thomas
6f8077f587 Swap color scheme for import account label 2018-03-02 18:23:27 -08:00
Dan J Miller
0d97ff2210
Fix NewUI reveal seed flow. (#3410) 2018-03-02 22:44:05 -03:30
Dan J Miller
0c163dcb32
Allow adding 0 balance tokens in old ui and editing custom token info in new (#3395) 
* Shows tokens with 0 balance in old ui; goHome after adding tokens.

* Allow users to edit custom token info when not autofilled. (New UI add token screen).
 2018-03-02 19:07:25 -03:30
Alexander Tseung
f22dfd4ae8 Fix network menu for custom URLs (#3366) 2018-03-01 17:42:10 -03:30
Alexander Tseung
ace4f0d998 Fix exception thrown when styleOverride is not present (#3364) 2018-03-01 17:41:35 -03:30
Kevin Serrano
923c702164
Merge pull request #3356 from MetaMask/cdn-minimization 
Check in all font files locally.
 2018-03-01 12:30:03 -08:00
Dan
94a60fe4a9 Correct ttf format name to 'truetype' 2018-03-01 16:36:27 -03:30
kumavis
46d94a241c
Merge pull request #3359 from MetaMask/token-check-url 
[new-ui] add token - check for logo url before trying to use
 2018-02-28 14:55:42 -08:00
kumavis
40537f9290 add token - check for logo url before trying to use 2018-02-28 14:04:32 -08:00
Kevin Serrano
d45116824c
Check in all font files locally. 2018-02-28 13:03:46 -08:00
kumavis
6c472b73eb
Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvements 
[NewUI] Onboarding flow style improvements
 2018-02-28 12:40:14 -08:00
kumavis
28c6347cdd
Merge pull request #3340 from danjm/i3338-contract-published-terminology 
[NewUI] Replace 'Contract Published' label with 'Contract Deployment'
 2018-02-28 11:16:55 -08:00
Dan
78f6a48664 Define event locally in onClickOutside method in account-dropdowns.js 2018-02-28 13:18:37 -03:30
Dan
2b9af0734b Replace 'Contract Published' with 'Contract Deployment' for clearer indication of contract tx state. 2018-02-27 20:09:02 -03:30
Thomas
7aa324bdf6 Remove committed out merge code 2018-02-27 12:06:24 -08:00
Thomas
ac2e92fa54 Change Loose label to Imported 2018-02-27 12:02:48 -08:00
Thomas
50f20358c1 Add import account disclaimer 2018-02-27 12:01:09 -08:00
Dan
0739d3507b Adds beta label to Metamask name in full screen app bar. 2018-02-27 14:13:05 -03:30
Dan
def369ba07 Move beta warning to app header. 2018-02-27 14:13:05 -03:30
Dan
746c3e5f18 Body width container in first time flow is consistent with app bar. 2018-02-27 14:12:45 -03:30
Thomas Huang
84c023ba40 Use same logic for downloading state logs in the old/uat 2018-02-20 19:52:32 -08:00
Dan
66f55f954e Render loading inside notice screen, and don't set isLoading from unMarkPasswordForgotten. 2018-02-20 20:52:41 -03:30
Dan Finlay
a1b72e5252 Try fixing notice screen synchronous state call 2018-02-20 13:51:06 -08:00
Dan
c26e0d555b Fix Import Existing DEN in popup New UI first time flow. 2018-02-19 22:46:18 -03:30
Dan J Miller
81eb5c8796
Ensures that mascara initialize screen is not shown in popup. (#3279) 2018-02-16 19:21:16 -03:30
kumavis
4e8d9fef84
Merge pull request #3200 from alextsg/cb-703 
[NewUI] Remove accessing PropTypes from main React package
 2018-02-16 16:11:36 +00:00
Dan J Miller
170c7602b7
[NewUI] Adds the mascara first time flow to betaUI extension (#3257) 
* Adds the mascara first time flow to the extension when opened in browser.

* Fix tests after addition of mascara first time flow to new ui.
 2018-02-16 06:15:09 -03:30
Dan J Miller
eb61f69f92
Merge pull request #3231 from danjm/MM-744-restore-from-seed-fix 
[NewUI] Only open a new window on restore from seed if in extension view.
 2018-02-13 15:32:29 -03:30
Dan
5e9dc74a59 Remove isInBrowser method and use environment-type.js 2018-02-13 15:20:24 -03:30
Dan Finlay
ee1197192f
Merge pull request #3209 from danjm/MM-634-newui-reset-account 
[NewUI] Add reset account button to new UI.
 2018-02-13 19:50:19 +01:00
Dan
b5b16e4ce0 Only open a new window on restore from seed if in extension view. 2018-02-13 15:19:53 -03:30
Dan Finlay
96d40ee618
Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screens 
[NewUI] Try beta link on unlock and privacy screens.
 2018-02-13 19:28:49 +01:00
Dan J Miller
35c762da47 Updates the styling of confirm send ether and token screens. (#3235) 2018-02-12 22:51:05 -08:00
Dan J Miller
e4c83466be Send screen style updates. (#3234) 2018-02-12 22:39:15 -08:00
Dan J Miller
fe2ed68f11 Remove chrome focus outline for mouse users. (#3230) 2018-02-12 09:45:53 -08:00
Dan
bb79fb354b Try beta link on unlock and privacy screens. 2018-02-08 22:47:32 -03:30
Alexander Tseung
7f70943fa2
Fix exception thrown in selected token tx list with shapeshift txs (#3215) 2018-02-08 17:37:22 -08:00
Dan J Miller
c8c2dfdc0f Fixes shapeshift txs so that they render in tx list. (#3208) 2018-02-08 16:40:15 -08:00
Dan
cd976a2765 Add reset account button to new UI. 2018-02-08 20:23:16 -03:30
Dan J Miller
f39222c9af
Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019 
[NewUI] Merge uat to uatnext feb072019
 2018-02-08 12:20:04 -03:30
Alexander Tseung
e9c2c0eec1
Make blockies icon round to match identicons (#3205) 2018-02-07 18:46:27 -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
8b90b1d1b1 Remove accessing PropTypes from main React package 2018-02-06 22:03:37 -08:00
Alexander Tseung
9db0a32dac
Update modal header design on send screen (#3196) 2018-02-06 21:07:00 -08:00
Dan J Miller
9ed3a5512e Fix alignment of ellipsis and address in wallet view. (#3198) 2018-02-06 16:51:32 -08:00
Dan J Miller
d84dc5da42 Remove duplicate token balance on uat next. (#3195) 2018-02-06 10:21:21 -08:00
Alexander Tseung
d452403322
Add functional integration testing to Add Token flow (#3189) 2018-02-05 18:47:46 -08:00
Dan J Miller
d4da419c5b Wallet view supports screen sizes between 576px and 667px (#3193) 2018-02-05 18:31:21 -08:00
Thomas
10e75dc4dd Scrollable Settings screen for Firefox 2018-02-01 14:53:43 -08:00
Dan J Miller
78bce55858 [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) 
* Use tooltip for display of helper text in wallet views copy to clipboard feature.

* Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change.

* Remove unnecessary tabIndex attribute from wallet view address element.
 2018-01-31 16:27:35 -08:00
Frankie
0b4e3c5d6a
Merge pull request #3161 from MetaMask/AddResetExplanation 
Add reset explanation
 2018-01-31 14:49:29 -08:00
Dan Finlay
86d56419f4 Add explanation of account resetting 2018-01-31 14:31:56 -08:00
Dan Finlay
4f61029177 Remove unused file 2018-01-31 14:20:59 -08:00
Frankie
1a93b1ade2
Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs 
Set address to default with empty string, add test validation.
 2018-01-31 14:18:47 -08:00
Dan J Miller
971112d413 [NewUI] Updates capitalization and alignment for the import account screen. (#3122) 
* Updates capitalization and alignment for the import account screen.

* Align elements in import form.
 2018-01-31 13:41:13 -08:00
Dan J Miller
8378445112 [NewUI] Set default new account name as placeholder, but not value (#3121) 
* Set default new account name as placehold, and not value, in new account create screen.

* Set new account number in create-form.js in constructor.
 2018-01-31 13:40:14 -08:00
Bruno Barbieri
e6fda855a5 added reset account feature 2018-01-31 03:33:15 -05:00
Dan Finlay
11a944719f Add warning when importing no valid file 
Fixes #3089
 2018-01-30 15:11:05 -08:00
Thomas
c2cef0f815 Set address to default with empty string, add test validation. 2018-01-30 13:26:37 -08:00
Dan J Miller
100642c0ea Fix bug stemming from erroneously persistant unlock failure error message. (#3123) 2018-01-29 18:44:43 -08:00
Nick Doiron
abfa74f09a complete i18n across new UI 2018-01-29 15:29:01 -05:00
Nick Doiron
9c133aaab3 get t imported in all files currently using i18n 2018-01-24 19:41:29 -10:00
Nick Doiron
7da52c5997 separate out cross-browser i18n for extensions 2018-01-24 10:10:28 -10:00
Nick Doiron
99898ac775 better organization of locale file; i18n in more view files 2018-01-23 22:14:47 -10:00
Thomas Huang
a9ecf9c6fc
Merge branch 'master' into uat 2018-01-23 10:55:21 -08:00
Nick Doiron
bad70eb1b3 first steps to i18n 2018-01-22 23:48:03 -10:00
Thomas
ce0de5feed String interpolate version in settings 2018-01-22 16:09:23 -08:00
Chi Kei Chan
338ebe5f40
Merge pull request #3049 from chikeichan/newmaster 
Merge master to uat
 2018-01-19 15:58:26 -08:00
Dan
c554e52e82 Get version from manifest instead of hard coding in New UI info page. 2018-01-19 15:31:11 -08:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
Alexander Tseung
b05d21b1ba Fix transaction list font sizes, padding 2018-01-18 13:34:57 -08:00
Kevin Serrano
5fff2e19d8
Merge pull request #3024 from alextsg/cb-529 
[NewUI] Update popout to fullscreen icon
 2018-01-18 12:39:09 -08:00
Dan J Miller
4fae461a67 [NewUI] Send screen gas loading fixes (#3027) 
* Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send.

* Fix variable name.
 2018-01-17 20:47:01 -08:00
Alexander Tseung
853e7f8420 Fix lint errors 2018-01-17 18:50:18 -08:00
frankiebee
8bb57f33b1 add a x close button to gas calc loding screen on conf-tx 2018-01-17 18:47:56 -08:00
Alexander Tseung
f8bf8cb527 Update popout to fullscreen icon 2018-01-17 17:56:18 -08:00
Dan
fdaf6eacb2 Show now tokens by default and improve search on add token screen. 2018-01-17 13:52:59 -08:00
Alexander Tseung
40e58d3132 Fix tx-list, confirmation screen styling 2018-01-17 13:50:16 -08:00
Chi Kei Chan
ba0762c582
Merge pull request #3005 from alextsg/cb-385 
[NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
 2018-01-17 13:49:48 -08:00
Chi Kei Chan
b80ed2c451
Merge pull request #3007 from alextsg/uat-master-011618 
[NewUI] Merge master into uat branch
 2018-01-17 13:48:16 -08:00
Thomas
8c792ba3ee Add network-indicator classname to network loading spinner 2018-01-17 10:51:23 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Alexander Tseung
65e9d9efc5 Fix rendering QR code in old UI, hide unnecessary back button 2018-01-16 17:41:42 -08:00
Alexander Tseung
ccb80594be Readjust gas fees when switching networks on the send screen 2018-01-16 17:26:34 -08:00
Dan J Miller
668aab11d1 Vertically centers the text of the new ui modal header. (#2987) 2018-01-16 12:15:18 -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 Finlay
003b4a721c
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight 2018-01-16 10:15:11 -08:00
Thomas Huang
27ca48b369
Merge pull request #2984 from MetaMask/RenameLockToLogout 
Rename lock to log out
 2018-01-16 09:48:23 -08:00
Dan
a4fd4f013f Restore display of all unconfirmed transactions. 2018-01-15 18:32:25 -08:00
Alexander Tseung
baebf64afd Fix send screen value input 2018-01-15 18:28:21 -08:00
Alexander Tseung
644adeccf6 Fix Hide Token modal styling, popup positioning 2018-01-15 18:26:16 -08:00
Dan Finlay
0121892141
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight 2018-01-15 16:15:50 -08:00
Dan Finlay
58be1742e1 Rename lock to log out 
Fixes #2475
 2018-01-15 16:04:49 -08:00
Frankie
f18ed8bfd4
Merge branch 'master' into open-popup 2018-01-15 15:25:14 -08:00
Dan Finlay
85b2012106
Merge pull request #2964 from alextsg/cb-505c 
[NewUI] Move blockies option to the bottom of Settings
 2018-01-15 13:55:43 -08:00
Dan J Miller
aa833a0928 [NewUI] Place all users of extension into old UI (disable auto adding). (#2946) 
* Place all users of extension into old UI (disable auto adding).

* Fix lint errors.
 2018-01-15 13:23:44 -08:00
Alexander Tseung
27cbfa44c3 Move blockies option to the bottom of Settings 2018-01-14 21:39:40 -08:00
frankiebee
d5c311b13e add a loading spinner to conf-tx view 2018-01-14 13:56:54 -08:00
Alexander Tseung
b42baacdf4 Fix confirm Add Token button order 2018-01-12 17:07:10 -08:00
Alexander Tseung
dce6dcf437 Fix Add Token button order, styling 2018-01-12 17:07:10 -08:00
Dan
2bc85ea72f Fix input box padding and select highlight in new account create and import page. 2018-01-12 13:42:51 -08:00
Dan
980e1bfcf8 New add account page with create and import options. 2018-01-12 13:42:51 -08:00
Chi Kei Chan
71a308d98b
Merge branch 'uat' into cb-388 2018-01-12 13:41:03 -08:00
Alexander Tseung
bdcee058dc Fix styling in initialization 2018-01-12 13:39:26 -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
Dan Finlay
429db74508 Use https 2018-01-12 11:03:03 -08:00
Alexander Tseung
0f4bfcb02e Fix token balance color 2018-01-11 17:12:58 -08:00
Alexander Tseung
b35e4e0264 Fix lint errors 2018-01-11 17:06:30 -08:00
Alexander Tseung
b0a6bfdeec Change styling for network dropdown 2018-01-11 16:59:00 -08:00
Alexander Tseung
376e136572 Update styling for buttons, font weights 2018-01-11 16:30:07 -08:00
Alexander Tseung
b8310ac62e Fix logging out of old UI causing infinite spinner (#2914) 2018-01-11 15:49:10 -08:00
Dan J Miller
7c97b2f37c Fix padding of a hovered tx-list-item (#2859) 2018-01-11 09:21:41 -08:00
tmashuang
be604391d0 Add max height for Firefox addon overflow and hide horizontal scroll 2018-01-10 21:56:07 -08:00
tmashuang
60a52b2608 Add one px to address for Firefox clipping 2018-01-10 21:54:43 -08:00
Alexander Tseung
208e94d3bf Update main view styling 2018-01-10 21:09:09 -08:00
Dan Finlay
e5b34b3d04
Update support links for helpscout 2018-01-09 14:09:29 -08:00
kumavis
096fb226a6
Merge pull request #2855 from abitrolly/patch-2 
info.js  Remove width element to fix email layout
 2018-01-09 07:25:24 -08:00
Kevin Serrano
0cf5c22178
Merge pull request #2851 from MetaMask/i2812-seedworderrorfix 
Fix condition where failing seed word checks would infinite-spin future attempts.
 2018-01-08 11:43:43 -08:00
kumavis
ade1c404bd ui - fix font path name 2018-01-08 09:44:11 -08:00
Anatoli Babenia
5312ed9a20
info.js Remove width element to fix email layout 2018-01-04 17:10:40 +03:00
Kevin Serrano
20aa135ad8
Add fix for infinite spinner for incorrect seed phrase. 2018-01-03 16:06:46 -08:00
Alexander Tseung
be398500de
Merge pull request #2848 from MetaMask/NewUI-flat 
[NewUI] Merge NewUI-flat into uat
 2018-01-03 13:24:17 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
oosthuizenr
1da385f78b
fix comment 2018-01-02 21:29:26 +02:00
Renier Oosthuizen
4a598fc7ac Fixes #2834 2018-01-02 21:07:48 +02:00
Kevin Serrano
e682fb05fc
Add frontend validation to ensure that ether inputs are valid. 2017-12-27 18:22:10 -08:00
Kevin Serrano
92eb16fc11
Add frontend validation to check if send ether input is a valid number. 2017-12-27 17:36:56 -08:00
Kevin Serrano
3e562f1a1e
Add backend fix for util in normalizeethstringtowei. 2017-12-27 17:31:38 -08:00
Alexander Tseung
409d1d30e9
Merge pull request #2799 from MetaMask/NewUI-flat 
Update UAT to version 4.0.5
 2017-12-22 11:40:20 -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
Dan J Miller
4acd48966e [NewUI] Fixes tests and sends user to NewUI after registering. (#2788) 
* Fixes tests and sends user to NewUI after registering.

* Karma config?

* Empty commit

* Remove unneeded json state mock file.
 2017-12-21 19:03:01 -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
e7e1b7a951 Clone transaction while editing instead of mutating object from state. 2017-12-20 17:37:18 -08:00
Dan
9ced63584b Add constanst for token transfer function signature. 2017-12-20 17:37:18 -08:00
Dan
5fe3c5aae6 Lint fixes. 2017-12-20 17:37:18 -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
Dan
109e4e5d96 Hide fiat values on account details screen when eth/token value is 0. 2017-12-20 10:21:36 -08:00
Dan
0feb5b210b Hides the sidebar after the an account menu actions changes the screen behind the sidebar. 2017-12-20 10:17:29 -08:00
Thomas Huang
453bfd34e3
Merge pull request #2706 from danjm/MM-fix-buy-cancel-button 
Fixes the cancel button in the buy screen to take the user home.
 2017-12-14 15:06:53 -05:00
Dan J Miller
339eb7d1a6 Fix edit to field bug. (#2738) 2017-12-12 22:24:41 -08:00
Dan
4e0485938a Fix height of login screen 2017-12-12 12:31:52 -08:00
Chi Kei Chan
515437a4c9 Fix isMascara and update yarn.lock 2017-12-12 12:22:22 -08:00
Dan
57c91435a7 Substitute isMascara check for explicit check if user is on mobile browser. 2017-12-12 12:14:40 -08:00
Dan
4b654669e6 Hide open in browser button on mobile (but still show on extension); adds a function to detect if viewing with mobile browser. 2017-12-12 12:14:40 -08:00
Dan
05c6789030 Adds button for opening app in main browser window in extension. 2017-12-12 12:14:40 -08:00
Dan Finlay
d110c916a4 Show watched tokens with no balance 2017-12-12 09:47:51 -08:00
Dan
bfec077d79 Fixes the cancel button in the buy screen to take the user home. 2017-12-08 16:18:50 -03:30
Chi Kei Chan
41d281a527
Merge branch 'NewUI-flat' into cb-372 2017-12-07 09:54:37 -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
Kevin Serrano
6553ba132d
Merge pull request #2654 from abitrolly/patch-2 
Download State Logs with .json extension
 2017-12-07 07:41:12 -08:00
Dan Finlay
c82fd990aa Add 10% price bump to retry attempts. 
Turns out geth requires at least a 10% price bump to replace txs:
9619a61024/core/tx_pool.go (L133)
 2017-12-07 04:02:11 -05:00
Dan
2e9137dddd Update max amount behaviour to meet new specs. 2017-12-06 21:15:39 -08:00
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Alexander Tseung
b9f2f8c2a7 Show retry button on submitted transactions greater than 30 seconds, add hover styling 2017-12-07 00:01:11 -05:00
Dan Finlay
73da8a5a4f Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction 2017-12-06 23:43:11 -05:00
Dan Finlay
0e25129028 Enforce retry tx at minimum gas of previous tx 2017-12-06 23:42:47 -05:00