m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-04 15:14:29 +01:00
Code
8,787 Commits 2 Branches 0 Tags 265 MiB
fc1655eecb
Commit Graph

2982 Commits

Author SHA1 Message Date
Dan J Miller
3c75be04a0
Merge pull request #4617 from TrejGun/fix-new-line 
fix white spaces in signature
 2018-07-05 13:55:18 -02:30
Whymarrh Whitby
2298daa53e Prevent calling setState in TxListItem after unmount 2018-07-05 13:17:53 -02:30
Dan J Miller
d4bc943b01
Merge pull request #4686 from MetaMask/tweak-token-list-amount-style 
Ensures token list amount is in its own row.
 2018-07-05 12:39:26 -02:30
Whymarrh Whitby
783559f94e Don't update token balances after tracker is stopped 2018-07-05 10:54:51 -02:30
Whymarrh Whitby
0116ea9b95 Remove TokenTracker listeners when unmounting component 2018-07-05 10:54:51 -02:30
Dan
5d721665d3 Ensures token list amount is in its own row. 2018-07-05 08:07:41 -02:30
Dan J Miller
46cda26f3b
Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui 
Use background gas price estimation method in new ui.
 2018-07-05 08:01:03 -02:30
TrejGun
94d1d846fb Merge branch 'develop' into contextTypes 
# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
 2018-07-05 11:34:13 +08:00
trejgun
c94f639de5 convert contextType to static prop for refactored components 2018-07-05 11:33:34 +08:00
TrejGun
b427743ab8 fix classname 2018-07-05 11:21:27 +08:00
Анна
90934bca46 Merge branch 'develop' into to-autocomplete 2018-07-05 11:15:28 +08:00
Dan
7d7662191a Improve error and promise resolution handling in action.js updateGasData(). 2018-07-04 21:47:19 -02:30
Dan
f262f0ea64 Update import from seed screen on new ui. 2018-07-04 21:21:12 -02:30
Dan
0796fc58e4 Improve send token error ux. 2018-07-04 16:09:29 -02:30
Sara Reynolds
6bc7647c05 fixes 4666 2018-07-03 16:05:20 -07:00
Sara Reynolds
d3c64358c5 :qw 
:wq
q
 2018-07-03 16:05:20 -07:00
Dan
7babacf062 Remove unnecessary anonymous function call in actions.js gas estimation. 2018-07-03 17:24:21 -02:30
brunobar79
9d3f2435e5 lint fix 2018-07-03 15:46:15 -04:00
brunobar79
3837c2ddd7 fix merge conflicts 2018-07-03 15:41:18 -04:00
Dan J Miller
a049627752
Merge pull request #4716 from MetaMask/i4663-clearErrorMessages 
fixes #4663 - Clear Error Messages when Importing Accounts are Successful
 2018-07-03 16:03:55 -02:30
Dan J Miller
8def5281b4
Merge pull request #4654 from TrejGun/bignumber 
fixes #4307 BigNumber casting issue
 2018-07-03 15:18:04 -02:30
Alexander Tseung
3fd5af636f
Merge pull request #4633 from MetaMask/i4580-import-account-errors 
Show all errors on account creation screen.
 2018-07-03 07:43:40 -10:00
Dan J Miller
4bdd59b055
Merge pull request #4699 from TrejGun/removeLeadingZeroes 
move removeLeadingZeroes to utils, add test
 2018-07-03 15:01:48 -02:30
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
Sara Reynolds
d126887bc3 fixes 4663 2018-07-03 09:50:59 -07:00
trejgun
1f6bf0a80d fixes #4664 2018-07-03 10:34:39 +08:00
brunobar79
a8f745f9fe eslint --fix . 2018-07-02 18:49:33 -04:00
brunobar79
f19ffaf08d move hardcoded strings to localization file 2018-07-02 15:16:05 -04:00
brunobar79
86a8c98148 always open connect hardware in full screen mode 2018-07-02 15:14:57 -04:00
trejgun
491f2d03cf move removeLeadingZeroes to utils, add test 2018-07-02 09:36:57 +08:00
brunobar79
1494cc5e6c fix merge conflicts 2018-07-01 11:41:34 -10:00
Dan J Miller
b2e64f24ec
Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency 
fixes #4623
 2018-06-29 17:03:09 -02:30
Dan J Miller
22debbfec8
Merge pull request #4640 from weijiekoh/develop 
Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt
 2018-06-29 17:00:51 -02:30
Sara Reynolds
ad6c454fd5 fixes #4623 2018-06-29 11:54:49 -07:00
Dan J Miller
f6238b2d39
Merge pull request #4647 from MetaMask/fix-overflow-currency-display 
Fix issues with scrollbar in currency display.
 2018-06-29 16:06:29 -02:30
Dan J Miller
464b97890d
Improve attribute syntax in send-amount-row.component.js 2018-06-29 15:44:30 -02:30
trejgun
a6f1734edd lint 2018-06-29 16:19:45 +08:00
Dan Finlay
a1fb1b8d3e
Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-ux 
Set base estimate for token sends to be updated once recipient address specified
 2018-06-28 17:48:05 -10:00
Dan
03f17d910a Check that error is defined in import-account error catch. 2018-06-28 21:45:46 -02:30
Dan
75581ceebe Show all errors on account creation screen. 2018-06-28 21:45:46 -02:30
Dan
d2845afd89 Remove input arrows for send screen amount row on firefox. 2018-06-28 21:45:04 -02:30
Dan
d5133fb429 Fix issues with scrollbar in currency display. 2018-06-28 21:45:04 -02:30
Dan
de01a6f112 Use background gas price estimation method in new ui. 2018-06-28 21:28:59 -02:30
Thomas Huang
218f2e84db
Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style 
Fix style of shapeshift screen in deposit modal.
 2018-06-28 16:57:32 -07:00
Dan
696d626133 Set based estimate for token sends to be updated once recipient address specified. 2018-06-28 21:03:09 -02:30
Dan J Miller
9f5ee94b69
Merge pull request #4678 from MetaMask/e2e-beta-tests-upgrade 
E2e beta tests upgrade
 2018-06-28 20:17:44 -02:30
Thomas Huang
db548adca7
Merge pull request #4674 from MetaMask/removeOnlyTests 
Remove .only on test
 2018-06-28 13:26:29 -07:00
Dan J Miller
08b69a0cb0
Merge pull request #4677 from MetaMask/customize-gas-loading-wait 
Only show the customize gas modal if the estimateGas call is not currently in flight.
 2018-06-27 17:27:51 -02:30
Dan J Miller
1839ab5346
Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements 
[new-ui] Improve ENS input errors and update ens validation on network change
 2018-06-27 17:09:44 -02:30
Dan
f5d43404dc Fix send token tests in beta ui e2e tests. 2018-06-27 11:01:26 -02:30
Dan
a242668872 Only show the customize gas modal if the estimateGas call is not currently in flight. 2018-06-27 11:01:26 -02:30
tmashuang
fb02e71e22 Remove .only on test 2018-06-26 18:14:21 -07:00
Dan J Miller
60feeb393b
Merge pull request #4627 from TrejGun/gas-fee-display 
refactor gas-fee-display component
 2018-06-26 16:25:26 -02:30
trejgun
74080e41f1 change numbers 2018-06-24 17:56:07 +08:00
trejgun
0d0120746d remove .only 2018-06-24 17:51:31 +08:00
trejgun
5d034006e8 fixes #4307 BigNumber casting issue 2018-06-24 17:48:02 +08:00
trejgun
e05eeb56da fix default import 2018-06-23 07:41:11 +08:00
Koh Wei Jie
cd90e8a869 removed stray console.log 2018-06-22 16:46:00 +08:00
Koh Wei Jie
1ff29c5b4a fixed blank boolean field for typed signing for new UI 2018-06-22 16:38:54 +08:00
Dan
e8fa18779d Fix style of shapeshift screen in deposit modal. 2018-06-21 15:50:51 -02:30
Dan
97a7bc4894 Remove commented out code in ens-input. 2018-06-21 15:01:13 -02:30
trejgun
778aec8c75 lint 2018-06-21 15:03:19 +08:00
trejgun
c27dfb01bb refactor gas-fee-display component 
#4622
 2018-06-21 14:43:48 +08:00
Whymarrh Whitby
3123073659 Scroll large amounts in the send component 2018-06-20 16:15:22 -02:30
Whymarrh Whitby
1f6f4977de Handle large token balances in tx list hero 2018-06-20 16:15:17 -02:30
trejgun
bbd1b8360a fix white spaces in signature 2018-06-20 12:51:21 +08:00
Dan
06307ef8ae Merge branch 'develop' into i4409-i4410-ens-input-enhancements 2018-06-19 21:39:52 -02:30
Dan
957d729c17 Only show the customize gas modal if the estimateGas call is not currently in flight. 2018-06-19 13:23:33 -02:30
Dan Finlay
d26ce807fb Linted 2018-06-18 15:44:43 -07:00
Dan Finlay
f14ed32980 Begin letting UI show suggested tokens 2018-06-18 15:33:50 -07:00
kumavis
62df446385
Merge pull request #4584 from MetaMask/fix-send-token 
Add hex-prefix to gas estimate result
 2018-06-18 11:54:26 -07:00
Csaba S
8aab4dd1fa View address of an added token (#4591) 
* adding menu actions for tokens

* apply common style
 2018-06-18 10:29:09 -07:00
Dan
ac7c0277b5 On send screen amount change, updateGas call now includes current to address. 2018-06-18 14:07:01 -02:30
Dan
70abe54c94 Send screen returns simple gas cost if no to address specified when not sending token. 2018-06-18 13:55:20 -02:30
Dan
6c9302f985 Remove leading zeroes from send screen amount row input. 2018-06-18 13:50:21 -02:30
Dan
36de213c6c Fix currency-display.js rendering of token amounts. 2018-06-18 13:49:21 -02:30
Dan
347d1984cf Revert to updating amount on blur of input change; update gas on blur of amount input change; validate onchange. 2018-06-18 13:47:14 -02:30
Alexander Tseung
adb71073c8 Fix unit tests 2018-06-15 15:31:16 -07:00
Alexander Tseung
5685c4bafe Estimate gas limit when the token amount changes. Fix amount input 2018-06-15 14:36:52 -07:00
Dan
e4d3bdba12 Update send.utils.js estimateGas tests. 2018-06-14 21:20:10 -07:00
Dan
b9b6cbf561 Add a buffer to new ui gas estimates 2018-06-14 22:32:03 -02:30
Alexander Tseung
1b9ed23752 Add hex-prefix to gas estimate result 2018-06-14 14:58:42 -07:00
Dan
bb855707ef ENS input in send form shows distinct errors for invalid addresses and non-existent addresses. 2018-06-14 15:43:14 -02:30
Dan Finlay
3a5089da6f
Merge pull request #4566 from MetaMask/notice-phishing 
Push new notice on recent phishing incidents
 2018-06-14 09:49:38 -07:00
kumavis
44a8e48a04 notices - replace getLatestNotice with getNextNotice 2018-06-13 23:30:31 -07:00
Dan
5995b6d68d ENS name revalidates on network change. 2018-06-13 09:26:21 -02:30
Bruno
bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -04:00
Bruno
8763ea898e move TrezorKeyring to its own package 2018-06-13 01:32:13 -04:00
Bobby Dresser
4196b16f06 add help link to eth_sign warning 2018-06-11 14:28:57 -07:00
Bruno
d1880073f6 balances working 2018-06-10 21:10:22 -04:00
Bruno
8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
Dan
049071a743 Access correct property from state in confirm screen components gatherTxMeta() 2018-06-08 12:52:38 -02:30
Dan
ae55e8a3c1 Merge branch 'develop' into i3725-refactor-send-component- 2018-06-06 16:40:43 -02:30
kumavis
72f7a4e1d0
Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui 
Handle errors for null selected address after Importing account (json or private key)
 2018-06-06 11:47:45 -07:00
03-26
ccd4884db1 i18n - ja improvements 2018-06-06 11:38:57 -07:00
Whymarrh Whitby
d9d09f953b Render the accounts in keyring order 2018-06-05 17:17:27 -07:00
Whymarrh Whitby
8b449b325d Remove unused identities reducer from UI 2018-06-05 17:17:27 -07:00
Whymarrh Whitby
665ac860e5 Remove selectedIdentity prop from wallet view 
The selectedIdentity property is computed based on the selectedAddress
which means that using both the selectedAddress and the selectedIdentity
is redundant. In the case of the Array#find call on the set of keyrings,
we wouldn't have a situation where one is included and the other isn't.

This changeset removes the selectedIdentity from the wallet view because
it isn't needed.
 2018-06-05 12:25:06 -07:00
Whymarrh Whitby
762695bfd9 Ensure selectedAddress exists when render wallet 2018-06-05 12:04:03 -07:00
Dan
49f0df3174 Merge branch 'develop' into handle-import-account-failure-in-ui 2018-06-05 09:56:36 -02:30
Dan
aee9247faa Merge branch 'develop' into i3725-refactor-send-component- 2018-06-04 22:32:30 -02:30
Dan J Miller
3b6e96bac9 Update hide-token-confirmation-modal.js to use new modalState schema (#4482) 
* Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55).

* Fix modalState props
 2018-06-04 16:13:32 -07:00
Dan
ada59054c9 Simplify recipient code check in send.utils estimateGas 2018-06-04 15:50:52 -02:30
Dan J Miller
5d58f0e9a0
Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflow 
Token name is not hidden in wallet if balance is exceptionally long.
 2018-06-04 14:59:03 -02:30
Alexander Tseung
5a2771dd47
Indicate the current selected account on the popup account view (#4445) 2018-06-04 09:33:25 -07:00
Dan
8f0a3b8311 Merge branch 'develop' into handle-import-account-failure-in-ui 2018-06-03 06:46:45 -02:30
Dan
ffd42c59da Default currency-display valueToRender to empty string when not readOnly ('0' if readOnly). 2018-06-02 01:58:01 -02:30
Dan
1b879f45bc Fix calculation of data property for gas estimation on token transfers. 2018-06-02 01:53:01 -02:30
Bobby Dresser
966583026a update helpscout links to zenhub 2018-05-31 15:26:04 -07:00
Alexander Tseung
fd98ed570e Fix ellipses 2018-05-31 11:16:41 -07:00
Dan
701611e317 Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-estimation 2018-05-31 15:39:24 -02:30
Dan
2ca084b055 Remove .only 2018-05-31 15:31:50 -02:30
Dan
d12bb8c14f Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask-extension into i3725-refactor-send-component- 2018-05-31 15:29:17 -02:30
Dan
5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
Dan J Miller
15f4ce352d
Merge pull request #4386 from MetaMask/i4077-replace-currency-input-with-numeric-input 
Replace currency-input.js with NumericInput
 2018-05-31 15:09:13 -02:30
Alexander Tseung
cc73d869fe Add new alert modals 2018-05-31 10:37:52 -07:00
Alexander Tseung
f4d833cb09 Change btn-secondary styles to btn-default. Make btn-secondary red warning style buttons 2018-05-31 10:37:52 -07:00
Dan
990b69c655 Improve input width calculation in currency-display.js 2018-05-31 13:47:18 -02:30
Dan
d454b5de2b Token name is not hidden in wallet if balance is exceptionally long. 2018-05-31 13:32:18 -02:30
Dan
67c74cd5b6 Fix currency display send integration tests. 2018-05-31 12:07:23 -02:30
Dan
1bde2892ec Improve efficiency of estimateGasPriceFromRecentBlocks 2018-05-30 22:43:49 -02:30
Dan
0f3480a97f Fix then-catch + error handling in import-account 2018-05-30 21:33:40 -02:30
kumavis
64aa56b5a6 test - send-utils.test - lint fix 2018-05-30 20:54:32 -02:30
Dan
5a842e440f Gas estimation uses block gas limit as fallback if query.estimateGas returns an expected error. 2018-05-30 20:54:32 -02:30
Dan
0f20fce9b7 Auto update gas estimate when to changes. 2018-05-30 20:54:31 -02:30
Dan
2eddb7b652 Support smaller decimals in currency-display 2018-05-30 20:54:31 -02:30
Dan
4f0b4eef50 Estimate gas using same algorithm as backend. 2018-05-30 20:54:31 -02:30
Dan
166fda5877 Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks method. 2018-05-30 20:54:31 -02:30
Dan
17909465f2 getParamsForGasEstimate extracts symbol from token instead of just accepting symbol. 2018-05-30 20:54:31 -02:30
Dan
6f633a97e1 Rename gas change actions. 2018-05-30 20:54:31 -02:30
Dan
8b6d08a15d Split out getGasEstimate logic from updateGasTotal 2018-05-30 20:54:31 -02:30
Dan
6d8344d0d0 Update amount error on update of send screen. 2018-05-30 20:51:46 -02:30
Dan
1c3d2aa18b Importing account by json and private key shows error and does not change account if no selectedAddress comes after import. 2018-05-30 17:00:50 -02:30
Alexander Tseung
389346913b
Prevent loading screen from overlaying the app bar (#4417) 2018-05-30 10:38:53 -07:00
Alexander Tseung
d40971e7f3
Fix error handling on incorrect password (#4401) 2018-05-30 09:23:31 -07:00
Dan
5347319dff Fix setting of token balance on account switch in send screen from field. 2018-05-30 13:35:01 -02:30
Dan
7f23e017b2 Delete currency-input.js 2018-05-29 22:21:55 -02:30
Dan
2e1d962b1a Remove currency input from input-number 2018-05-29 22:15:21 -02:30
Dan
f33bb3e2fd Stop using external NumericInput component. 2018-05-29 16:25:03 -02:30
Alexander Tseung
41e38fe553
Add notification for dropped retry transactions (#4363) 2018-05-29 10:23:06 -07:00
Alexander Tseung
e3c9629130
Fix add-token token list placeholder width (#4365) 2018-05-29 10:03:08 -07:00
Alexander Tseung
d1f5d8ccc6
Fix text field labels of first time flow. Add text fields to storybook (#4389) 2018-05-29 09:35:18 -05:00
Dan
ea28c8a437 Replaces currency-input.js with NumericInput 2018-05-29 09:21:54 -02:30
kumavis
a7b7c8f034 newui - unlock - dont catch errors unrelated to tryUnlockMetamask 2018-05-28 23:34:40 -07:00
Dan
e712336189 Send refactor: fix error handling and form disabling in send form. 2018-05-25 14:39:31 -02:30
Dan
0de765aa25 Clean up for send refactor PR. 2018-05-25 00:00:55 -02:30
Dan
dc2b5d0ef4 Move formShouldBeDisabled from send-footer util to component. 2018-05-24 22:23:54 -02:30
Dan
3a87d9221d Fix order of button text in page-container-footer. 2018-05-24 22:23:30 -02:30
Dan
5bb399e55a Display correct titles and subtitles on send token and editing send transaction screens. 2018-05-24 17:27:33 -02:30
Dan
1405237479 Fix display of primary currency symbol in send amount row 2018-05-24 13:31:14 -02:30
Alexander Tseung
df38b0f307
Fix scrolling in Deposit Ether modal (#4336) 2018-05-23 14:26:25 -07:00
Dan
c4e48d9263 Send refactor: fix amount max button for tokens. 2018-05-23 16:56:13 -02:30
Dan
440905125d Merge branch 'develop' into i3725-refactor-send-component- 2018-05-23 16:03:15 -02:30
kumavis
b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken 
Update designs for Add Token screen
 2018-05-22 12:53:59 -07:00
Alexander Tseung
8245bf010e Update input field border on focus 2018-05-21 15:24:38 -07:00
Frankie
5e67951c1a
Merge pull request #4295 from MetaMask/kumavis-patch-3 
ui - token-util - warn via loglevel on token lookup failure
 2018-05-21 15:06:18 -07:00
kumavis
9929f89c6e
Merge pull request #4316 from MetaMask/fix-signature-request 
Fix signature request header text
 2018-05-21 14:18:55 -07:00
kumavis
a1d2813f8f
Merge pull request #4273 from brunobar79/fix-new-ui-popup-header 
Remove fix modal header height
 2018-05-21 14:07:06 -07:00
Alexander Tseung
c4e75a7075 Fix tests 2018-05-20 14:08:45 -07:00
Alexander Tseung
646545551c Fix signature request header text 2018-05-20 13:01:31 -07:00
Alexander Tseung
4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
kumavis
666c1f1b30
token-util - warn via loglevel on token lookup failure 2018-05-18 10:51:49 -07:00
Whymarrh Whitby
924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
Bruno
b0dcdc30fa remove fix header height 2018-05-16 18:51:55 -04:00
kumavis
4be681f447
Merge pull request #4255 from MetaMask/i4233-dropdowns 
Fix account and network dropdowns in confirm screen
 2018-05-16 13:02:27 -07:00
kumavis
ff91ef96ef ui - unlock - remove setNetworkEndpoints calls from new unlock screen 2018-05-16 12:35:43 -07:00
kumavis
c6f822ad45 ui - remove files accidently added by bad merge 2018-05-16 12:29:57 -07:00
kumavis
c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
Dan
759bc17388 Merge branch 'develop' into i3725-refactor-send-component- 2018-05-15 11:21:15 -02:30
Dan
44679f6cda Import defaults in send_/ 2018-05-15 09:59:23 -02:30
Dan
8ff60267d8 Fix Button component path in page-container footer. 2018-05-15 09:13:39 -02:30
Dan
77ee23d493 Add index.js files to send_ subdirectories 2018-05-14 20:33:04 -02:30
Alexander Tseung
5561937773 Fix account and network dropdowns in confirm screen 2018-05-14 15:03:04 -07:00
Dan
6bc8cc819a Merge branch 'develop' into i3725-refactor-send-component- 2018-05-14 11:44:50 -02:30
Dan
0739618a61 Tests for send.duck.js 2018-05-14 10:27:36 -02:30
Dan
0076b732bd Rename ducks/send.js to ducks/send.duck.js 2018-05-14 09:49:09 -02:30
Dan
b3f08681fd Add missing unit tests in send_/: now 100% function test coverage in send_/ 2018-05-14 09:43:55 -02:30
Dan
c2ed2d4e50 Lint fixes 2018-05-14 07:01:41 -02:30
Dan
145e53b404 Unit tests for account-list-item, amount-max-button and send-amount-row components. 2018-05-14 06:55:03 -02:30
Alexander Tseung
0bcfbc1544 Add error message when passwords don't match in first time flow. Change input field styling in first time flow 2018-05-13 21:46:12 -07:00
Alexander Tseung
0301b33a48 Add TextField component to storybook 2018-05-11 12:49:17 -07:00
Alexander Tseung
2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
Dan
61d35e7abe Unit tests for from-dropdown; split out send-dropdown-list from from-dropdown 2018-05-11 13:50:43 -02:30
Dan
5d79d12648 SendRowErrorMessage component test. 2018-05-11 04:07:33 -02:30
Dan
22e2806ae2 Unit tests for send from, gas, to and wrapper row components. 2018-05-10 12:17:05 -04:00
Dan
f94ffa022c Fix test descriptions and remove unnecessary proptypes. 2018-05-10 09:24:43 -04:00
Thomas Huang
c3079ff160
Merge pull request #4196 from MetaMask/i3457-fontweight 
Change font weight from 300 to 400
 2018-05-08 12:46:27 -07:00
Dan
9ccc609e56 Adds test for send, send-content, send-footer and send-header components. 2018-05-07 08:03:20 -04:00
Alexander Tseung
fff7f52074 Change font weight from 300 to 400 2018-05-05 15:12:41 -07:00
Dan
7c49009854 Unit tests for containers, utils and selectors in send_/ 2018-05-05 11:58:14 -04:00
Alexander Tseung
d5759cf4a8 Add storybook integration 2018-05-03 10:51:15 -07:00
kumavis
a1d13d45cf lint - cleanup some unused variables 2018-05-02 18:23:55 -07:00
kumavis
096851d091
Merge pull request #4156 from MetaMask/i4010-spinner 
Fix styling of the app spinner
 2018-05-02 17:00:57 -07:00
kumavis
ad1f98f8f2
Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccount 
ui - actions - importNewAccount - rethrow err on failure
 2018-05-01 12:36:19 -06:00
kumavis
0e48ddfceb ui - actions - importNewAccount - rethrow err on failure 2018-05-01 11:16:35 -07:00
Dan
e869d09c79 Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask-extension into i3725-refactor-send-component- 2018-05-01 00:37:17 -02:30
Dan
e488c0eeea Delete dead send code. 2018-05-01 00:30:38 -02:30
Dan
2f78fffbdb Merge branch 'i3725-refactor-send-component-' into i3725-refactor-send-component-2 2018-05-01 00:12:57 -02:30
Alexander Tseung
ffda954add Fix styling of the app spinner 2018-04-30 18:58:37 -07:00
kumavis
6f316ca450 network - remove setNetworkEndpoints 2018-04-30 16:36:17 -07:00
Paul Bouchon
5ec631cad3
Handle Promise rejections when importing accounts (#4142) 
* Silently catch import failures since errors exist in Redux state
* Add comment about no-op catch statement
 2018-04-30 18:07:25 -04:00
kumavis
bce7adac85 ui - actions - importNewAccount - use async and pify for cleaner syntax 2018-04-30 14:46:53 -07:00
kumavis
5f3f8c85fc
Merge pull request #4059 from MetaMask/i-4033-seed-words 
Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
 2018-04-30 12:04:53 -06:00
Dan
954394f810 Remove 'goHome' from send_ 2018-04-30 14:08:03 -02:30
Dan
beb8d1cf5e Move getMaxModeOn selector to amount-max-button container. 2018-04-30 14:07:01 -02:30
Dan
4a8c3194c2 Use constants for send screen errors messages. 2018-04-30 14:00:01 -02:30
Dan
bc145dc6a6 Fix send-v2__form class in send-content.component 2018-04-30 13:39:05 -02:30
Dan
41b609ab5b Fix amount max button. 2018-04-30 13:33:49 -02:30
Dan
5529ec6efd Fix close button on send screen 2018-04-30 13:06:23 -02:30
Dan
26f965bcce Further refactors; includes refactor of send-v2.js and associated container 2018-04-30 13:05:48 -02:30
bitpshr
b4b33b57bc Fix ShapeShift purchases on new UI 2018-04-28 14:41:46 -04:00
kumavis
141884ee6a
Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-decimal-methods 
Wraps calls to symbol() and decimals() in try catch (Fixes #4107)
 2018-04-27 19:21:12 -06:00
Dan
9f9e8789cc Simplify return of existing token in getSymbolAndDecimals 2018-04-27 21:38:57 -02:30
Dan
b71dbf52d1 Convert decimals to string in getSymbolAndDecimals; return null for symbol or decimals. 2018-04-27 21:33:56 -02:30
Dan
6de450488b Wraps calls to symbol() and decimals() in try catch 2018-04-27 20:45:36 -02:30
Paul Bouchon
1bad3fa257
Allow transactions with 0-gwei gas price (#4073) 
* Allow transactions with 0-gwei gas price
* Add tests to verify tx with 0 gas fee
* Conditionally use CurrencyInput in CurrencyDisplay
 2018-04-27 10:42:02 -04:00
Dan
33c16d1bf6 Fixes to get tests passing. 2018-04-27 08:11:18 -02:30
Dan
91c201aa72 Lint fixes and alphabetization for i3725-refactor-send-component 2018-04-27 00:16:11 -02:30
Alexander Tseung
61b8c3efff Redirect to correct seed phrase screen 2018-04-26 19:27:33 -07:00
Dan
8ff7806f1b Core of the refactor complete 2018-04-26 14:08:38 -02:30
kumavis
ee8b91262d
i18n-helper - wrap fallback in brackets to help indicate something is wrong 2018-04-25 15:27:30 -07:00
Dan Finlay
b2fbc6399a Return key instead of empty string on i18n fail 2018-04-25 10:57:44 -07:00
kumavis
3500689ed0
i18n-helper - abort on i18n failure 2018-04-24 09:53:16 -07:00
Dan
02a6d2089e Merge branch 'master' into i3725-refactor-send-component 2018-04-24 13:31:39 -02:30
Dan Finlay
66ae4a948a
Merge pull request #3940 from nyatla/master 
Small layout and cursor problem fix.
 2018-04-23 17:07:40 -07:00
Dan Finlay
4289f813e9
Merge pull request #3968 from MetaMask/gh-3653 
Clean up network config
 2018-04-23 15:49:17 -07:00
Dan Finlay
f1c0d8ad6e
Merge pull request #4028 from MetaMask/i4016-customrpc 
Fix custom RPC not redirecting to Settings page
 2018-04-23 15:14:23 -07:00
Alexander Tseung
9e41f58af2 Clean up network config 2018-04-23 10:18:05 -07:00
Alexander Tseung
1d2d9798cb Merge branch 'master' of https://github.com/MetaMask/metamask-extension into i-4033-seed-words 2018-04-22 09:28:29 -07:00
Alexander Tseung
3082d2e4ef Use new design for reveal seed screen. Persist seed words only in first time flow 2018-04-22 09:24:21 -07:00
Alexander Tseung
477b74124d Revert "Fix UI getting stuck in Reveal Seed screen" 
This reverts commit 2c8156ebe9.
 2018-04-21 22:23:45 -07:00
Thomas Huang
00efcf9e8b
Merge pull request #4030 from MetaMask/i4014-metamask-version 
Show correct MetaMask version number in the Info page
 2018-04-19 09:56:12 -07:00
Alexander Tseung
2fdf45b418 Show correct MetaMask version number in the Info page 2018-04-18 18:44:51 -07:00
Alexander Tseung
ce74cd7774 Fix custom RPC not redirecting to Settings page 2018-04-18 17:34:28 -07:00
Alexander Tseung
1d80a4c452 Fix exception thrown when revealing seed words 2018-04-18 16:10:42 -07:00
Dan Finlay
061975cd4a
Merge pull request #3977 from MetaMask/i-3913-big-number 
Fix BigNumber exception in confirm-send-ether
 2018-04-18 11:45:20 -07:00
Dan Finlay
0a14cedaf1
Merge pull request #4004 from MetaMask/i3955-reveal-seed 
Fix UI getting stuck in Reveal Seed screen
 2018-04-18 11:44:14 -07:00
Dan Finlay
40f0a40edf
Merge pull request #3998 from MetaMask/i3988-checksummed-address 
Show checksum addresses on UI
 2018-04-18 11:43:38 -07:00
Alexander Tseung
2c8156ebe9 Fix UI getting stuck in Reveal Seed screen 2018-04-18 10:18:24 -07:00
bitpshr
cce123c30e Show checksummed addresses throughout the UI 2018-04-18 09:47:05 -04:00
Alexander Tseung
053044fb65 Fix spinner layout 2018-04-18 01:03:07 -07:00
Alexander Tseung
de7fc781a5 Fix BigNumber exception in confirm-send-ether 2018-04-18 00:58:40 -07:00
Dan Finlay
6ee57dcad7
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-17 13:36:21 -07:00
Alexander Tseung
b0a105ce80 Fix confirmation popup not always opening 2018-04-17 08:58:37 -07:00
Dan Finlay
0668976514
Merge branch 'master' into i3981-contract-rates 2018-04-16 16:32:56 -07:00
Dan Finlay
26d2f5cd0e
Merge pull request #3970 from MetaMask/i3651-removeGlobalLog 
Remove reliance on window.log
 2018-04-16 15:16:45 -07:00
bitpshr
d0447f9058 Maintain token prices using a background service 2018-04-16 11:47:06 -04:00
bitpshr
a350e80fee Fetch token prices based on contract address 2018-04-15 23:46:40 -04:00
Dan Finlay
34692acdf9 Fix action for setting locale 2018-04-13 16:14:23 -07:00
bitpshr
7129d7c0f3 Require loglevel singleton in each module that uses it 2018-04-13 17:56:28 -04:00
Dan
59c887301a second commit 2018-04-11 11:51:54 -02:30
Alexander Tseung
f96c13d616 Refactor page-container component structure 2018-04-10 15:28:52 -07:00
nyatla
c9a4077207 Reduced button padding. 
Title overflowed in Japanese.
 2018-04-10 18:51:44 +09:00
Dan
f4d8da9277 Merge branch 'master' into i3725-refactor-send-component 2018-04-10 07:19:01 -02:30
nyatla
5166e1a9fd Expanded dropdown menu width of title. 
Title overflowed in Japanese.
 2018-04-10 18:47:59 +09:00
nyatla
2ccd9ca29d Changed mouse cursor to "pointer" on the cancel text at the top left of the page. 2018-04-10 18:46:09 +09:00
Dan
d8adc527f1 Lint fix. 2018-04-09 16:54:52 -02:30
Dan
2c4426e4de Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-09 16:52:26 -02:30
Dan
9dbb9d12ad Internationalize converted value in confirm screens 2018-04-09 16:45:23 -02:30
Dan
1382de2cda Internationalize converted value in currency-input.js 2018-04-09 14:14:09 -02:30
Dan
4011dac6f6 Improve display of crypto currencies when selected as the 'Current Conversion' 2018-04-09 13:41:40 -02:30
Dan
284dd85a99 first commit 2018-04-06 19:59:51 -02:30
Alexander Tseung
1e6f062bb6 Fix integration tests 2018-04-06 11:25:05 -07:00
Alexander Tseung
4c15c0d3ba Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-05 23:17:22 -07:00
kumavis
24eef428ce
Merge pull request #3883 from danjm/i3685-define-event-privatekey-import 
event object actually passed to this.createKeyringOnEnter in private-key.js
 2018-04-05 15:07:44 -07:00
kumavis
17931698a8
Merge pull request #3892 from alextsg/gh-3891 
Fix populating txParams with undefined data
 2018-04-05 15:02:35 -07:00
Alexander Tseung
2db55cd0de Fix editing transaction 2018-04-05 10:29:16 -07:00
Alexander Tseung
82af778e62 Revert "commit" 
This reverts commit fa8500e09a.
 2018-04-05 10:11:09 -07:00
Alexander Tseung
9d7e49fc3b Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-05 10:07:14 -07:00
Alexander Tseung
418926ffdf Fix populating txParams with undefined data 2018-04-05 09:54:41 -07:00
Alexander Tseung
fa8500e09a commit 2018-04-05 09:53:24 -07:00
Thomas Huang
e774fbcece
Merge pull request #3865 from MetaMask/openlinkinnewwindow 
Make token helpscout link open in new tab.
 2018-04-05 09:34:47 -07:00
Kevin Serrano
36f85c4f84
Merge pull request #3882 from MetaMask/i#3791 
Fixes download file buttons
 2018-04-05 00:51:58 -07:00
Kevin Serrano
29bad56410
Merge branch 'master' of github.com:MetaMask/metamask-extension into openlinkinnewwindow 2018-04-05 00:45:17 -07:00
Alexander Tseung
5b2ace3b80 Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-04 18:21:35 -07:00
Dan
2199b3720c Allow from and to address to be the same in new-ui. 2018-04-04 21:52:12 -02:30
Dan
6ecf2c8092 event object actually passed to this.createKeyringOnEnter in private-key.js 2018-04-04 21:18:12 -02:30
Thomas
4ffa74cbe6 Change double-quotes to single-quotes 2018-04-04 16:42:54 -07:00
Thomas
18e0a7e4f9 Add target=_blank exportAsFile 2018-04-04 16:26:05 -07:00
frankiebee
3de1873126 hot-fix new-ui - default to an object if identities is undefined 2018-04-04 13:56:39 -07:00
Dan
40bbca5d0d Don't prevent user from setting an eth address in to field if there is no ens support. 2018-04-04 15:45:29 -02:30
Kevin Serrano
02fa5c9c32
Make token helpscout link open in new tab. 2018-04-04 00:09:11 -07:00
Alexander Tseung
7776af7cd0 Use new design for showing seed words 2018-04-03 18:20:51 -07:00
Alexander Tseung
007f91cc50 commit 2018-04-03 17:43:42 -07:00
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
kumavis
ca780075a8
Merge pull request #3834 from MetaMask/3734 
Address Add Token design feedback
 2018-04-03 17:00:12 -07:00
Alexander Tseung
bf38aa6f1d Fix transaction confirmations 2018-04-03 16:59:32 -07:00
Dan Finlay
99c22a0835 Linted 2018-04-03 14:00:04 -07:00
Dan Finlay
74049c19fc Internationalize currency 
Fixes #3580
 2018-04-03 13:58:26 -07:00
kumavis
ecbab14cae app - warn on fetch errors instead of spamming sentry 2018-04-03 10:33:10 -07:00
kumavis
00657e14a8 build - correctly set METAMASK_ENV via envify 2018-04-03 09:51:33 -07:00
David Yoo
4ddf5d2516 Address feedback 2018-04-03 09:38:27 -07:00
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
David Yoo
0ab227d8a2 Address Add Token design feedback 2018-04-02 17:04:27 -07:00
Alexander Tseung
516c1869b0 Fix lint errors 2018-04-02 16:24:37 -07:00
kumavis
15ba31897c Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 15:51:15 -07:00
Thomas Huang
8cd2022169
Merge pull request #3825 from danjm/i3668-warnusertxsimulationfails 
Add simulation failure errors while improve send error handling on confirm screen
 2018-04-02 15:26:46 -07:00
kumavis
98e0fc1ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 14:13:45 -07:00
Alexander Tseung
92f8157dfe Add withRouter to I18nProvider component 2018-04-02 13:15:31 -07:00
Dan
d166cb2b1b Ensure txParams are prefixed with 0x when sending. 2018-04-02 16:38:51 -02:30
Dan
7ccf6163fd Adds simulation failure error messages to confirm screen. 2018-04-02 16:29:35 -02:30
Dan
1dc3c51b54 UpdateSendErrors only called when balance defined, recalled if balance updates. 2018-04-02 16:26:19 -02:30
Alexander Tseung
6277a4c46a Refactor onboarding flow 2018-04-02 02:59:49 -07:00
kumavis
9f7b63bb6a
identicon - set blockies height and width to identicon diameter 2018-03-30 21:45:49 -07:00
kumavis
ee1acf0a7e
Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist 
Fix display of unapprovedMgs in txList; fix txParams undefined errors
 2018-03-30 18:36:39 -07:00
kumavis
2e57c36f36
Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreen 
Checking for sufficient balance in tx confirmation screen
 2018-03-30 18:36:08 -07:00
Alexander Tseung
2fa554a641 Fix conf-tx render 2018-03-30 17:37:24 -07:00
Alexander Tseung
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
Alexander Tseung
bdc4a6964a Fix merge conflicts. Refactor renderPrimary into Home component 2018-03-30 15:07:00 -07:00
kumavis
7dde948c45 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-03-30 13:57:50 -07:00
kumavis
b014133fdc development - screens - use localhost for network 2018-03-30 11:16:08 -07:00
kumavis
5f1f345a5d network - use providerType for localhost 2018-03-30 10:59:39 -07:00
kumavis
fcdfd48057 development - screenshotter - capture screens across all locales 2018-03-30 00:48:37 -07:00
Dan
2be6f8bae0 Fix lint and tests 2018-03-30 02:19:04 -02:30
Dan
717623e2e3 Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist 2018-03-30 00:00:31 -02:30
Dan
893f82491d Merge branch 'master' into i3471-checkbalanceonconfirmscreen 2018-03-29 23:58:45 -02:30
kumavis
b49ad750dd Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-29 16:54:00 -07:00
Dan
ad603da2e7 Stopping wrapping provider children in div; stop wrapping old-ui in provider. 2018-03-29 20:16:45 -02:30
Dan
a4594f6838 Show insufficient funds on confirm screen on first render. 2018-03-29 15:30:03 -02:30
Alexander Tseung
ef61ef2ce8 Fix i18n merge conflicts 2018-03-29 09:37:29 -07:00
Dan
0a711f0de0 Removes t from props via metamask-connect and instead places it on context via a provider. 2018-03-29 12:42:38 -02:30
Dan
01e3293b65 Ensure correct address used when rendering transfer transactions. 2018-03-29 10:32:30 -02:30
kumavis
085e7d7dec ui - fix typo in settings 2018-03-28 23:19:07 -07:00
kumavis
ac4cb3444d ui - add guard against unset locale 2018-03-28 23:11:41 -07:00
kumavis
f9b680b09f ui - identicon - use relative link for ether logo 2018-03-28 22:39:45 -07:00
kumavis
10609493c5 ui - use relative location for images 2018-03-28 22:30:35 -07:00
kumavis
cf82e766d4 ui - fix relative url for deposit-ether-modal 2018-03-28 22:21:49 -07:00
kumavis
8760dc6bda ui - use relative url for i18n-helper fetching locales 2018-03-28 21:53:08 -07:00
kumavis
f7b4c9621f ui - css - use relative path for fonts 2018-03-28 14:42:58 -07:00
Alexander Tseung
58f52b2b8d Fix merge conflicts. Refactor onboarding flow. 2018-03-28 13:23:50 -07:00
Dan
d6ebf5d94e Confirm send token detects if balance is sufficient for gas. 2018-03-28 12:30:03 -02:30
Dan
21b6a3442d Fix display of unapprovedMessages in txList (old and new ui); includes fix of undefined txParams. 2018-03-28 10:51:16 -02:30
kumavis
b324a9c295
Merge branch 'master' into i3471-checkbalanceonconfirmscreen 2018-03-27 19:42:42 -07:00
Dan
74ac3bb2a7 Confirm send token detects if balance is sufficient for gas. 2018-03-27 23:41:20 -02:30
kumavis
00952c899b
Merge pull request #3745 from danjm/i3723-fix-long-token-ammounts 
Long token amounts in wallet are truncated with ellipsis.
 2018-03-27 19:08:41 -07:00
kumavis
cdf5183f87
Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0x 
Prefixes to addresses with 0x before sending.
 2018-03-27 19:08:22 -07:00
kumavis
c84f0ac7bc
Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefined 
Prevent users from adding custom token if decimals is an empty string.
 2018-03-27 19:07:23 -07:00
kumavis
ff26042b0c ui - actions - fix log for background call 2018-03-27 18:21:46 -07:00
kumavis
1a5eccdfc0 ui - settings - fix for currentLocale 2018-03-27 18:21:22 -07:00
kumavis
e3881143cb ui - settings - derrive locales from index 2018-03-27 18:10:13 -07:00
Dan
8e6ab7df05 Checking for sufficient balance in confirm ether screen; includes error messages for user. 2018-03-27 22:38:04 -02:30
Dan
2053cac691 Don't query for undefined. 2018-03-27 21:35:12 -02:30
Dan
be2254b880 Remove comments and console.logs 2018-03-27 10:37:45 -02:30
Dan
d2bd5687e8 Merge branch 'master' into i18n-translator-redux 2018-03-27 10:17:48 -02:30
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Dan
252d692282 Prefixes to addresses with 0x before sending. 2018-03-27 04:41:23 -02:30
Dan
f2ab3a06b1 Long token amounts in wallet are truncated with ellipsis. 2018-03-27 04:40:46 -02:30
Dan
91f91d92fe Prevent users from adding custom token if decimals is an empty string. 2018-03-27 03:11:55 -02:30
Thomas Huang
e001c0900b
Merge pull request #3680 from danjm/i3517-popup-newui-onboarding 
Popup uses new ui onboarding when in beta.
 2018-03-26 14:55:50 -07:00
Thomas Huang
b0fae2ca39
Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate 
Updates Add token screen to latest design.
 2018-03-26 14:55:30 -07:00
Dan
1779cff65b Merge branch 'master' into i3326-addtokenscreendesignupdate 2018-03-26 16:51:02 -02:30
Thomas Huang
a6af5fad96
Merge pull request #3695 from danjm/i3379-signtypedata-overflow 
Signed type data notification handles long messages.
 2018-03-26 12:11:16 -07:00
Dan
4f0881e41b Merge branch 'master' into i18n-translator-redux 2018-03-26 16:13:49 -02:30
Dan Finlay
fe6f22ee69
Merge pull request #3721 from alextsg/cb-944 
Update button styles
 2018-03-26 11:29:04 -07:00
Dan
a109a774a5 Use ens-input component in send-v2 to allow sending to ens names. 2018-03-26 11:40:11 -02:30
Alexander Tseung
cfa2592d78 Update button styles 2018-03-25 22:58:04 -07:00
Dan
c710fb8f50 Use new header on add token confirmation screen. 2018-03-25 15:17:10 -02:30
Dan
fa022e0883 Updates Add token screen to latest design. 2018-03-24 01:13:43 -02:30
Dan
0d71dd7ca0 i18n helper fetchLocale handles 404 gracefully 2018-03-23 14:31:15 -02:30
Dan
08e67c4e4a Default current locale in metamask reducer to empty string. 2018-03-23 14:29:59 -02:30
Dan
11a30378d7 Memoize t function in metamask-connect 2018-03-23 14:21:32 -02:30
Dan
07f4839600 Signed type data notification handles long messages. 2018-03-22 16:49:07 -02:30
Dan
6393c38117 Pop uses new ui onboarding when in beta. 2018-03-22 14:29:18 -02:30
Dan
a0df4b6892 Correct proptypes for t in new-account/create-form.js 2018-03-22 12:36:13 -02:30
Dan
d613dfb434 Correct reprice title and subtitle key names. 2018-03-22 01:19:00 -02:30
Dan
ca5bce477e Fix sender-to-recipient export and non-existent translation key. 2018-03-22 00:54:44 -02:30
Dan
3d3bd0eaf0 Correct connect reference in confirm-send-ether, confirm-deploy-contract, network-display. 2018-03-22 00:08:01 -02:30
Dan
a82631791e Lint fixes 2018-03-21 23:48:10 -02:30
Dan
18f8583529 Fix references to undefined 'this.props' 2018-03-21 23:10:28 -02:30
Dan
3c144302d6 Remove console.logs 2018-03-21 22:57:09 -02:30
Dan
6cbadc0aa3 Missed modifications of t() in merge resolution. 2018-03-21 22:54:52 -02:30
Dan
be845fd190 Merge branch 'master' into i18n-translator-redux 2018-03-21 22:28:58 -02:30
Dan
d24a0590d3 i18n redux solution doesn't require importing t() and passing state to each t() call; t is just available on props. 2018-03-21 22:11:47 -02:30
kumavis
3e79941658 ui - tx conf - only show special token tx conf screen for token send 2018-03-21 13:12:59 -07:00
kumavis
3595d71c2d Merge branch 'i3554-fix-editing-dapp-token-txs' of https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs 2018-03-21 12:53:28 -07:00
kumavis
e005e9ac51
Merge pull request #3624 from alextsg/cb-941 
Update confirm transaction screen
 2018-03-20 17:15:59 -07:00
Dan J Miller
a69480d78d Gas inputs can be changed by up and down arrows (#3598) 
* Up and down arrows can control gas inputs.

* input-number.js just uses number type.
 2018-03-20 15:50:30 -07:00
kumavis
29cc2f8ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-20 13:01:08 -07:00
kumavis
fd3e240dd9
Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplates 
I3571 complete i18n templates
 2018-03-20 12:40:16 -07:00
kumavis
1ab165b6d7
Merge pull request #3632 from MetaMask/retry-tx-refractor 
Retry tx refractor
 2018-03-20 12:11:50 -07:00
Thomas
dd19a93447 Add i18n to tx status 2018-03-20 12:06:59 -07:00
Alexander Tseung
3c1248c816 Update confirm transaction screen 2018-03-20 11:56:12 -07:00
Thomas
d4eb883958 Merge branch 'master' into i3571-CompleteI18nTemplates 2018-03-20 11:35:59 -07:00
Dan
3830f49ac5 Take user home if an unapproved tx is dropped while they are viewing. 2018-03-20 15:52:45 -02:30
Thomas
4fc68ca208 Add i18n in settings/info 2018-03-20 10:56:35 -07:00
kumavis
5d316d9a4e
Merge pull request #3623 from MetaMask/i#3554 
new-ui - dont exclude `txParams.data` when editing and updating txParams
 2018-03-20 10:44:48 -07:00
Thomas
7a8e080245 Started on Tx list i18n 2018-03-20 10:29:22 -07:00
Thomas
cffaf44714 i18n Import flow 2018-03-20 09:49:12 -07:00
Dan
49e3ada382 Fix styling regression from master merge. 2018-03-20 13:28:59 -02:30
Dan
36b371283c Improve responsiveness of gas price row on confirm screen. 2018-03-20 12:41:03 -02:30
Dan
d9160ac6da Merge branch 'master' into retry-tx-refractor 2018-03-20 09:27:27 -02:30
Dan
dc92b56f18 Identify token transactions by method names token data, and not just whether they've been add via metamask. 2018-03-20 09:07:23 -02:30
Alexander Tseung
4af1003b0e Fix Account Names being cropped (#3626) 2018-03-20 09:02:20 -02:30
Thomas
85a612b34d I18n add-token.js 2018-03-20 02:34:12 -07:00
Dan J Miller
5cdaf270f7
Don't block user from setting gas if estimating gas returns errors. (#3627) 2018-03-20 06:47:45 -02:30
frankiebee
faa4ffe163 new-ui - dont exclude txParams.data when editing and updating txParams 2018-03-19 14:32:58 -07:00
Dan Finlay
f5b0d56b9d Add send screen template 2018-03-19 12:38:14 -07:00
Dan
2ddc2cc1fb Lint fixes. 2018-03-19 16:53:06 -02:30
Dan
4d1793b0ec Merge branch 'master' into i18n-translator-redux 2018-03-19 16:40:48 -02:30
Dan
09260f9c5e Fixed t() calls where localeMessages is missing; and fix incorrect connect reference. 2018-03-19 16:39:37 -02:30
Dan Finlay
293ca6c9a6 Add template for settings and info 2018-03-19 12:03:35 -07:00
Dan Finlay
2e7d4db2de Add recover and backup tempaltes 2018-03-19 11:43:22 -07:00
Dan Finlay
17371bb7ec Add login templates 2018-03-19 11:30:45 -07:00
Dan Finlay
e504bc6215 Add connecting indication templates 2018-03-19 11:28:02 -07:00
Dan
d8788af9b8 Merge branch 'master' into retry-tx-refractor 2018-03-19 15:30:47 -02:30
Dan
5733820024 Merge branch 'master' into i18n-translator-redux 2018-03-19 14:39:04 -02:30
Thomas Huang
424e98f6a8
Merge pull request #3594 from danjm/i3344-improve-currency-input 
Currency input defaults to empty string
 2018-03-19 09:20:04 -07:00
Dan
98f934fb53 Delete commented out code from i18n implementation that used globals. 2018-03-19 13:38:22 -02:30
Dan
3191f2aa5e Delete old i18n helper files. 2018-03-19 13:37:07 -02:30
Dan
a51e8f6a16 Fetch localeMessages in front end only. 2018-03-19 13:36:16 -02:30
anticlimactic
a1db40047c Remove unused files from ui folder. (#3577) 
* Removed unused UI files. Fixes #3434.

* Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
 2018-03-19 12:41:24 -02:30
Alexander Tseung
4512243290
Fix styling on confirm-send-ether and confirm-send-token (#3600) 2018-03-16 16:39:00 -07:00
Alexander Tseung
6f749e5576
Update Confirm Contract screen (#3597) 2018-03-16 13:09:49 -07:00
Dan
a348b60735 Currency input defaults to empty string 2018-03-16 15:38:29 -02:30
Alexander Tseung
7fb27cf0c7
Update margins for consistency in first time flow (#3588) 2018-03-16 08:50:21 -07:00
Dan
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
frankiebee
e51ba2e75c Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-extension into retry-tx-refractor 2018-03-15 10:41:55 -07:00
frankiebee
4c947d466c Merge branch 'master' into retry-tx-refractor 2018-03-15 09:47:25 -07:00
Alexander Tseung
66193c823c Update Deposit Eth icon (#3569) 2018-03-15 13:50:22 -02:30
frankiebee
cd721f52cb Merge branch 'master' into retry-tx-refractor 2018-03-15 08:07:16 -07:00
Dan
b0122be3c9 Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not edited. 2018-03-14 22:45:10 -02:30
Dan
66422cd083 Force gas min has correct precision and is set when editing gas if max. 2018-03-14 22:29:43 -02:30
kumavis
eb5a84975b ui - settings - add option to set current locale 2018-03-14 17:11:41 -07:00
kumavis
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -07:00
Thomas Huang
e2efc91aee
Merge pull request #3558 from MetaMask/fix-two-translations 
Fix translations whose substitutions params were not in arrays.
 2018-03-14 13:00:42 -07:00
Dan
a4c6a5e92e Ensure changes from customize gas modal opened from confirm screen are captured for non-tx transactions. 2018-03-14 17:10:59 -02:30
Dan
fb838da734 Revert 'Set txMeta.time to reflect time of tx approval.' 2018-03-14 17:07:09 -02:30
Dan Finlay
fae6a44bac
Grammar correction 2018-03-14 09:34:25 -07:00
Dan
edd5c38492 Fix translations whose substitutions params were not in arrays. 2018-03-14 12:34:13 -02:30
Dan
798988597b Merge branch 'master' into retry-tx-refractor 2018-03-14 00:02:27 -02:30
Dan
cc267d6c81 Fix more lint errors. 2018-03-13 23:56:45 -02:30
Dan
c37684d7bd Remove unnecessary addition of nonce to state. 2018-03-13 23:49:10 -02:30
Dan
e94a14ef8a Make token confirmations compatible. 2018-03-13 23:44:05 -02:30
Dan
0d33aed20e Fix tx-list-item submitted check. 2018-03-13 23:29:47 -02:30
Dan
c52253bb0e Use correct name for submittedTime field in tx-list.js 2018-03-13 21:57:23 -02:30
Dan
46ded45b81 Use correct var name in new-ui showRetryButton 2018-03-13 21:38:08 -02:30
Dan
8c7988978f Undefined check in showRetryButton 2018-03-13 21:32:22 -02:30
Dan
e293b6349c Styling for dropped. 2018-03-13 21:15:35 -02:30
Dan
d6e4d2e80d Use new submittedTime field to correctly show retry button in old and new ui. 2018-03-13 21:15:35 -02:30
kumavis
a52ef7a06a ui - lint fix 2018-03-13 14:41:54 -07:00
kumavis
34fe88af8f
Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters 
improved verification of restore from seed phrase
 2018-03-13 14:39:59 -07:00
Thomas
9bb7fa365d Remove windows.h from i18n.js 2018-03-13 11:15:10 -07:00
Thomas
b1871bf32d Add closing parens to appName 2018-03-13 11:04:41 -07:00
Thomas Huang
1d2cb46eff
Merge branch 'master' into i18n 2018-03-13 11:00:52 -07:00
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
kumavis
c1387cdc54
Merge pull request #3495 from alextsg/cb-290 
Increase tap areas for menu buttons on mobile
 2018-03-13 10:42:59 -07:00
Thomas
b45ea44aa5 Add missing opening parens to pag-container__subtitle 2018-03-13 10:28:33 -07:00
Thomas Huang
829b0a8926
Merge branch 'master' into i18n 2018-03-13 10:21:03 -07:00
Dan
179066fe6b Set txMeta.time to reflect time of tx approval. 2018-03-13 03:26:37 -02:30
Dan
e6d1ce56e7 Improve phrasing of copy. 2018-03-13 03:11:45 -02:30
Dan
f805a2eb73 Fix gas calculation and nonce / forceGasMin state setting errors; retry button shows on correct tx. 2018-03-13 03:09:38 -02:30
Dan
70f33d4747 Left align create password. 2018-03-12 20:17:44 -02:30
Thomas
23a8e24a1b Add loglevel and window.log to i18n.js 2018-03-12 11:40:03 -07:00
Alexander Tseung
08542c18e1
Update deposit ether styling (#3510) 2018-03-12 19:25:12 +01:00
Dan
0dad6db973 Styling fixes to welcome; hide network component on create password; shown welcoem in popup. 2018-03-12 14:33:45 -02:30
Thomas
208b3bc4c1 Add i18n back into JsonImportSubview 2018-03-12 08:07:12 -07:00
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
frankiebee
b24d949ca4 fix feature flags being undefined 2018-02-26 10:55:30 -08:00
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
Alexander Tseung
72ffa2c3f5 Fix react-router related exceptions 2018-02-09 12:05:27 -08:00
Alexander Tseung
ef0bbb291d Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 21:46:19 -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
Alexander Tseung
2240688fd4 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:44:02 -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 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