m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-11 20:27:12 +01:00
Code
6,320 Commits 2 Branches 0 Tags 265 MiB
9d7e49fc3b
Commit Graph

92 Commits

Author SHA1 Message Date
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
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -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
ba23843f91 Fix merge conflicts 2018-03-30 16:18:48 -07:00
Dan
2be6f8bae0 Fix lint and tests 2018-03-30 02:19:04 -02:30
Dan
893f82491d Merge branch 'master' into i3471-checkbalanceonconfirmscreen 2018-03-29 23:58:45 -02:30
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
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
d613dfb434 Correct reprice title and subtitle key names. 2018-03-22 01:19:00 -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
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
29cc2f8ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux 2018-03-20 13:01:08 -07:00
Alexander Tseung
3c1248c816 Update confirm transaction screen 2018-03-20 11:56:12 -07:00
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
2ddc2cc1fb Lint fixes. 2018-03-19 16:53:06 -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
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
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
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
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
d6e4d2e80d Use new submittedTime field to correctly show retry button in old and new ui. 2018-03-13 21:15:35 -02:30
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
Thomas Huang
b7c7083a11
Merge branch 'master' into i18n 2018-03-12 10:50:55 -04:00
Alexander Tseung
d84341f323
Add empty object default value for tokenData (#3493) 2018-03-09 16:31:17 +01:00