m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-23 11:46:13 +02:00
Code
7,683 Commits 2 Branches 0 Tags 265 MiB
c72ced79ae
Commit Graph

1524 Commits

Author SHA1 Message Date
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
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
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
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
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
Alexander Tseung
c4e75a7075 Fix tests 2018-05-20 14:08:45 -07:00
Alexander Tseung
4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
Whymarrh Whitby
924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
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
Dan
9ccc609e56 Adds test for send, send-content, send-footer and send-header components. 2018-05-07 08:03:20 -04: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
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
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
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
Dan
02a6d2089e Merge branch 'master' into i3725-refactor-send-component 2018-04-24 13:31:39 -02:30
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
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
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
40f0a40edf
Merge pull request #3998 from MetaMask/i3988-checksummed-address 
Show checksum addresses on UI
 2018-04-18 11:43:38 -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
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
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
Dan
f4d8da9277 Merge branch 'master' into i3725-refactor-send-component 2018-04-10 07:19:01 -02:30
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
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
fa8500e09a commit 2018-04-05 09:53:24 -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
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
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -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
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -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
kumavis
98e0fc1ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 14:13:45 -07:00
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
5f1f345a5d network - use providerType for localhost 2018-03-30 10:59:39 -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
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
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
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
Dan
8e6ab7df05 Checking for sufficient balance in confirm ether screen; includes error messages for user. 2018-03-27 22:38:04 -02:30
Dan
be2254b880 Remove comments and console.logs 2018-03-27 10:37:45 -02:30
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 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
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
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
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
Thomas
7a8e080245 Started on Tx list i18n 2018-03-20 10:29:22 -07:00
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
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
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
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
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
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
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -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
edd5c38492 Fix translations whose substitutions params were not in arrays. 2018-03-14 12:34:13 -02:30