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
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
Thomas Huang
1d2cb46eff
Merge branch 'master' into i18n
2018-03-13 11:00:52 -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
