m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-12 12:47:14 +01:00
Code
7,634 Commits 2 Branches 0 Tags 265 MiB
728aeb9344
Commit Graph

1486 Commits

Author SHA1 Message Date
Dan J Miller
6595f84d07
Merge pull request #4648 from MetaMask/update-import-from-seed-screen 
Update import from seed screen on new ui.
 2018-07-05 16:26:21 -02:30
Dan J Miller
d3920007fa
Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-ui 
Improve send token error ux.
 2018-07-05 16:25:59 -02:30
Dan
f006cbf2ce Delete old restore vault file. 2018-07-05 14:44:08 -02:30
Whymarrh Whitby
60857f94ad
Merge pull request #4733 from whymarrh/fix-setstate-warnings 
Fix setState warnings in components using TokenTracker
 2018-07-05 13:59:46 -02:30
Whymarrh Whitby
2298daa53e Prevent calling setState in TxListItem after unmount 2018-07-05 13:17:53 -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
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
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
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
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
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
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
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
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
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
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