kumavis
b49ad750dd
Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts
2018-03-29 16:54:00 -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
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
Dan
be2254b880
Remove comments and console.logs
2018-03-27 10:37:45 -02:30
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
