Alexander Tseung
6f367a5a6b
Fix merge conflicts
2018-03-27 00:20:35 -07:00
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
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
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
d8788af9b8
Merge branch 'master' into retry-tx-refractor
2018-03-19 15:30:47 -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
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
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
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
Alexander Tseung
08542c18e1
Update deposit ether styling ( #3510 )
2018-03-12 19:25:12 +01: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
