Whymarrh Whitby
51644962e9
Fix lint error in tx-list
2018-08-08 19:32:45 -02:30
Dan Miller
e98c3b4c01
Get nonce for showing retry button using ethQuery transaction count.
2018-08-08 17:04:42 -02:30
Alexander Tseung
35875863d2
Fix merge conflicts. Modify send workflow
2018-04-03 01:03:31 -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
Dan
717623e2e3
Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist
2018-03-30 00:00:31 -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
21b6a3442d
Fix display of unapprovedMessages in txList (old and new ui); includes fix of undefined txParams.
2018-03-28 10:51:16 -02:30
Alexander Tseung
6f367a5a6b
Fix merge conflicts
2018-03-27 00:20:35 -07:00
Dan
ca5bce477e
Fix sender-to-recipient export and non-existent translation key.
2018-03-22 00:54:44 -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
29cc2f8ab9
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
2018-03-20 13:01:08 -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
5fe0be722b
Handle i18n with redux.
2018-03-15 21:59:45 -02:30
Dan
798988597b
Merge branch 'master' into retry-tx-refractor
2018-03-14 00:02:27 -02:30
Dan
c52253bb0e
Use correct name for submittedTime field in tx-list.js
2018-03-13 21:57:23 -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
Dan
5433d2fe3a
Retry transaction logic added to tx-list-item, confirm-send-ether, customize-gas-modal, and dependents.
2018-03-09 00:19:26 -03:30
Dan
9d215bab0f
Merge branch 'master' into i18n
2018-03-06 20:45:45 -03:30
Alexander Tseung
2240688fd4
Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254
2018-02-08 16:44:02 -08:00
Dan J Miller
c8c2dfdc0f
Fixes shapeshift txs so that they render in tx list. ( #3208 )
2018-02-08 16:40:15 -08:00
Alexander Tseung
ecc39c5a7a
Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254
2018-01-29 18:22:52 -08:00
Nick Doiron
9c133aaab3
get t imported in all files currently using i18n
2018-01-24 19:41:29 -10:00
Nick Doiron
bad70eb1b3
first steps to i18n
2018-01-22 23:48:03 -10:00
Alexander Tseung
40e58d3132
Fix tx-list, confirmation screen styling
2018-01-17 13:50:16 -08:00
Dan J Miller
5c1dcf3e9b
[NewUI-flat] New deposit ether modal UI. ( #2642 )
...
* New deposit ether modal.
* New deposit modal full screen on mobile, and other style fixes.
* Hide shapeshift option from deposit modal for now.
* Add shapeshift form to new deposit modal.
* Store recipient address for shapeshift tx in background.
* Use Simpledropdown to achieve desired styling in coin selector.
* Lint fix
* Fix typos and remove dead code.
* Remove storage of shapeshift receiving address from background.
* Fix typos
2018-01-12 11:48:18 -08:00
Alexander Tseung
ec5e0a711c
Fix lint errors
2017-12-14 14:11:23 -08:00
Alexander Tseung
e226b10a89
Add react-router to allow use of the browser back button
2017-12-14 12:50:20 -08:00
Dan
56e9f98bd0
More lint fixes
2017-11-02 09:45:59 -02:30
Dan
5a94775b3f
Lint fixes for NewUI-flat.
2017-11-02 00:00:33 -02:30
Dan
c8c918d44e
Add utility for getting token data; get token data in tx-list even if token has been removed.
2017-10-27 17:29:12 -07:00
Alexander Tseung
3fd9c8b57f
Fix cursor on unclickable transactions ( #2356 )
2017-10-13 14:14:26 -07:00
Dan
45dbd017e6
Add needed iterator in tx-list and path to account in selectors.
2017-10-02 18:09:45 -07:00
Dan
ff64fe98dd
Shapeshift deposit tx modal.
2017-10-01 18:58:57 -07:00
Dan
7c4d8c4562
Enables the old shapeshift UI within new ui.
2017-10-01 18:58:57 -07:00
Chi Kei Chan
bdd1e58e55
Return null if transaction.key is shapeshift
2017-09-26 09:15:14 -07:00
Chi Kei Chan
3ec2f53463
Integrate Add Token
2017-09-21 18:44:52 -07:00
Chi Kei Chan
93a1089e08
Show token tx properly
2017-09-14 01:09:57 -07:00
Dan
55d62190e3
Fixes the saving of transactions in send and display in tx-list with conversion utility.
2017-09-13 14:22:58 -07:00
Chi Kei Chan
062e67bff8
Add buttons; handle back; add yarn.lock
2017-09-11 22:14:09 -07:00
Chi Kei Chan
ca69fa5d91
Re-enable Contract tx list item
2017-09-07 11:38:21 -07:00
Chi Kei Chan
687d2f755d
Fix css merge conflicts
2017-09-07 11:25:31 -07:00
Dan
7fb1c6836d
Modify status copy for status === 'unapproved'
2017-09-07 10:25:56 -07:00
Dan
eabbfb8319
Link user from transaction list to etherscan if they have a transaction hash.
2017-09-07 10:25:56 -07:00
Dan
17b5afb8de
Create tx-list-item component.
2017-09-07 10:25:56 -07:00
Dan
6d3b3d4203
Show confirm transaction screen when clicking a pending transaction in the list.
2017-09-07 10:25:56 -07:00
Chi Kei Chan
983fa2a117
Add Contract Tx List Item; Update Token Tx on select
2017-09-07 03:14:53 -07:00
Chi Kei Chan
14b2f3e391
Show token balance and identicon
2017-09-06 23:03:23 -07:00
