1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 12:56:01 +01:00
Commit Graph

2082 Commits

Author SHA1 Message Date
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
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 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
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
Alexander Tseung
7fb27cf0c7
Update margins for consistency in first time flow (#3588) 2018-03-16 08:50:21 -07:00
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
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