Alexander Tseung
|
279bdfc2e7
|
Merge develop
|
2018-07-17 13:38:15 -07:00 |
|
Alexander Tseung
|
e16f5ab54d
|
Fix tests
|
2018-07-17 13:38:15 -07:00 |
|
Alexander Tseung
|
d19c42fcae
|
Add fallback when no function found, fix network colors, add fiat values for tokens with contract exchange rates
|
2018-07-17 13:38:14 -07:00 |
|
Alexander Tseung
|
e9a8c24cc4
|
Remove unused confirm transaction files
|
2018-07-17 13:38:14 -07:00 |
|
Alexander Tseung
|
89911dda17
|
Merge pull request #4815 from MetaMask/i4783-retry
Increase clickable area and padding of Retry Transaction bar
|
2018-07-17 10:41:32 -07:00 |
|
Whymarrh Whitby
|
9a098a28e0
|
Merge pull request #4777 from MetaMask/i4661-currencyConversionBug
Fixes conversion status for tokens without conversion rates (#4661)
|
2018-07-17 14:16:13 -02:30 |
|
Alexander Tseung
|
4737ea49c7
|
Increase clickable area and padding of Retry Transaction bar
|
2018-07-16 21:45:24 -07:00 |
|
Sara Reynolds
|
dcf8e0ed12
|
lint fix
|
2018-07-16 16:50:08 -07:00 |
|
Sara Reynolds
|
684fc710ee
|
Fix edge cases and add translation compatibility
|
2018-07-16 13:03:24 -07:00 |
|
Sara Reynolds
|
4014b279d7
|
Update onlyRenderConversions function to method and account for edge cases
|
2018-07-16 13:03:23 -07:00 |
|
Sara Reynolds
|
8d8de0508a
|
Fixes conversion status for tokens without conversion rates
|
2018-07-16 13:03:23 -07:00 |
|
Whymarrh Whitby
|
db4469794e
|
Merge pull request #4621 from MetaMask/one-send-directory
Remove 'send_/' directory; revert to just having send
|
2018-07-16 13:35:05 -02:30 |
|
Whymarrh Whitby
|
117d43be1f
|
Merge pull request #4636 from MetaMask/bmd/tos-link
fix tos link
|
2018-07-16 13:24:23 -02:30 |
|
Whymarrh Whitby
|
5c3efe8bc4
|
Fix send import paths in confirm tx components
|
2018-07-16 13:18:21 -02:30 |
|
Whymarrh Whitby
|
d38405fb0e
|
Fix send import path in customize gas modal
|
2018-07-16 13:07:42 -02:30 |
|
Whymarrh Whitby
|
040b8c59c4
|
Fix send import path in ToAutoComplete
|
2018-07-16 13:07:42 -02:30 |
|
Dan
|
2e0cbf210e
|
Fix lint warnings in the send/ directory.
|
2018-07-16 12:58:32 -02:30 |
|
Dan
|
b3d78ed8a1
|
Remove send_ directory, revert to just having send
Revert accidentally changed constants.
Require defaults in ens-input, gas-fee-display and confirm screens.
|
2018-07-16 12:58:32 -02:30 |
|
Dan J Miller
|
f31e87dcd5
|
Merge pull request #4715 from BitGuildPlatform/to-autocomplete
fixes #4664
|
2018-07-14 09:46:28 -02:30 |
|
Dan J Miller
|
4d105d9cca
|
Merge pull request #4702 from BitGuildPlatform/contextTypes
convert contextType to static prop for refactored components
|
2018-07-14 09:23:48 -02:30 |
|
Thomas Huang
|
2f4698c130
|
Merge pull request #4787 from MetaMask/stop-inject-harbourair
Add harbourair.com to injection block list
|
2018-07-12 15:28:33 -07:00 |
|
Dan Finlay
|
c4ae399577
|
Add harbourair.com to injection block list
This site was getting unexpected results when MetaMask was installed.
https://consensys.zendesk.com/agent/tickets/2312
|
2018-07-12 14:21:32 -07:00 |
|
Bobby Dresser
|
eb2b36b3cb
|
fix tos link;
|
2018-07-12 16:24:13 -04:00 |
|
Thomas Huang
|
5a45df72c6
|
Merge pull request #4669 from MetaMask/removeNonceTrackerFunction
Remove unsued nonce tracker function
|
2018-07-12 11:48:05 -07:00 |
|
Whymarrh Whitby
|
47d596c090
|
Merge pull request #4766 from whymarrh/null-translations
Rework i18n-helper getMessage function
|
2018-07-12 15:46:09 -02:30 |
|
Whymarrh Whitby
|
55232d80d8
|
Merge pull request #4779 from whymarrh/tx-view-tooltips
Add Tooltips to Balance View in Extension
|
2018-07-12 15:43:53 -02:30 |
|
Whymarrh Whitby
|
d9f98a704e
|
Add tooltip to new tab icon in tx-view
|
2018-07-12 12:32:45 -02:30 |
|
Whymarrh Whitby
|
7581a4906f
|
Add tooltip to menu icon in tx-view
|
2018-07-12 12:32:45 -02:30 |
|
Alexander Tseung
|
0d4dbbec2a
|
Merge pull request #4691 from MetaMask/i4404-confirm-refactor
Refactor and redesign confirm transaction views
|
2018-07-11 15:31:50 -10:00 |
|
Alexander Tseung
|
67017711df
|
Fix font sizes, colors. Include data tab for send-eth transaction confirmations that have data
|
2018-07-11 17:34:51 -07:00 |
|
Whymarrh Whitby
|
9bfcb9c505
|
Remove unneeded MetaMaskConnect connect wrapper
|
2018-07-11 17:17:48 -02:30 |
|
Whymarrh Whitby
|
94489b544a
|
Fallback to English and then the key for I18nProvider#t
|
2018-07-11 16:50:37 -02:30 |
|
Whymarrh Whitby
|
2526f8a1d8
|
Inline locale variable in fetchLocale fn
|
2018-07-11 16:50:37 -02:30 |
|
Alexander Tseung
|
4521de19e6
|
Merge pull request #4769 from MetaMask/i4517-submit-password
Prevent users from submitting password multiple times on the unlock s…
|
2018-07-11 08:36:27 -10:00 |
|
Dan J Miller
|
92fc87a231
|
Merge pull request #4764 from MetaMask/i4404-confirm-refactor-with-e2e-upgrades
e2e beta test upgrades for confirm refactor
|
2018-07-11 16:01:12 -02:30 |
|
Dan
|
07322bc404
|
Wait for an element with a .tx-list-pending-item-container to be rendered before attempting to select the tx-list-item. (e2e beta tests)
|
2018-07-11 15:47:17 -02:30 |
|
Dan
|
05ee2b7401
|
Reattempt to find network selector; wait for network selector dropdown to contain localhost before attempting to click. (e2e beta tests)
|
2018-07-11 15:13:32 -02:30 |
|
Dan
|
8912955765
|
Wait for submitted tx list item amounts to match the expected before clicking through. (e2e beta tests)
|
2018-07-11 14:51:58 -02:30 |
|
Dan
|
e91d87efd9
|
Fix bug in test mock signature request methods.
|
2018-07-11 13:37:26 -02:30 |
|
Dan
|
91eca558f0
|
Fix send integration tests for compatability with confirm refactor.
|
2018-07-11 08:35:15 -02:30 |
|
Dan
|
a7a66171c2
|
Fix signature request tests for compatability with confirm refactor.
|
2018-07-11 08:35:15 -02:30 |
|
Dan
|
f81676fda1
|
Update e2e beta tests to cover confirm refactor changes.
|
2018-07-11 08:35:06 -02:30 |
|
Alexander Tseung
|
2175d03cca
|
Prevent users from submitting password multiple times on the unlock screen
|
2018-07-10 20:00:06 -07:00 |
|
Frankie
|
33e6b9483c
|
Merge pull request #4667 from MetaMask/i#3896
transactions - remove rejected transactions from history
|
2018-07-10 12:56:02 -10:00 |
|
frankiebee
|
b30499886f
|
test - check that #setTxStatusRejected removes transaction from history
|
2018-07-10 15:35:27 -07:00 |
|
Dan
|
228b807221
|
Fix existing e2e tests
|
2018-07-10 17:18:16 -02:30 |
|
Dan
|
1a0a701de0
|
Handles window indeterminancy issues for external dapps in e2e beta tests.
|
2018-07-10 17:18:16 -02:30 |
|
Alexander Tseung
|
76e80f631e
|
Fix multiple signature requests showing an infinite spinner
|
2018-07-10 12:21:09 -07:00 |
|
frankiebee
|
8a678001a9
|
test - fix for lint
|
2018-07-10 11:43:00 -07:00 |
|
Thomas
|
5188b727d4
|
Merge branch 'develop' into removeNonceTrackerFunction
|
2018-07-10 11:34:00 -07:00 |
|