Commit Graph

2632 Commits

Author SHA1 Message Date
Bruno Barbieri e2be22a4b7
Merge pull request #4897 from MetaMask/qr-code-scan
QR Code Scanner
2018-08-10 13:40:06 -04:00
Dan J Miller d4af5b7bec
Merge pull request #5000 from MetaMask/contract-method-conf-sim-failure
Show error while allowing confirmation of tx where simulation fails
2018-08-08 22:13:41 -02:30
Dan Miller 973325a6c4 Show error while allowing confirmation of transaction where simulation fails 2018-08-08 21:26:25 -02:30
Whymarrh Whitby 51644962e9
Fix lint error in tx-list 2018-08-08 19:32:45 -02:30
brunobar79 d0ccc59e45 add comment 2018-08-08 15:42:25 -04:00
brunobar79 656afeefad fix merge conflicts 2018-08-08 15:40:04 -04:00
Dan Miller e98c3b4c01 Get nonce for showing retry button using ethQuery transaction count. 2018-08-08 17:04:42 -02:30
brunobar79 f269021dc3 add submit button type 2018-08-08 12:22:48 -04:00
Dan Miller c4f1dfb82e Use token decimals when calculating confirm screen amount for token approvals. 2018-08-08 12:36:59 -02:30
brunobar79 cbbd0d3c75 lint 2018-08-08 03:21:37 -04:00
brunobar79 c6b7e460b5 code review changes 2018-08-08 03:00:39 -04:00
brunobar79 2e0916d8ff fix merge conflicts 2018-08-08 02:32:35 -04:00
Justin Kat aab6e366c5 Fixing translations in first-time init menu (#4969) 2018-08-07 23:27:52 -02:30
Esteban MIno c0cdda8321 Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:17:40 -04:00
brunobar79 ef9435e3d0 restore qr 2018-08-03 20:26:50 -04:00
Alexander Tseung f2194e8482
Merge pull request #4948 from MetaMask/i4638-update-font
Update Font in Account Selector
2018-08-03 17:24:42 -07:00
brunobar79 b1ddaafba2 lint 2018-08-03 20:12:30 -04:00
brunobar79 e9a0feb9e9 fixed issue with input 2018-08-03 20:11:46 -04:00
Alexander Tseung 8e3f0b4202 Update Font in Account Selector 2018-08-03 16:47:50 -07:00
brunobar79 af97ba103c clear qr code data before scanning 2018-08-03 19:36:01 -04:00
brunobar79 71ef4d85da design complete 2018-08-03 18:57:23 -04:00
Alexander Tseung 6d76d4e228 Disable Confirm button on subsequent clicks to prevent confirming multiple times 2018-08-03 14:44:57 -07:00
brunobar79 94a89790dc fix 2018-07-31 18:58:54 -04:00
brunobar79 7a40072f1a lint 2018-07-31 18:34:18 -04:00
brunobar79 caa9e202cf lint 2018-07-31 18:32:14 -04:00
brunobar79 710b4e294f added crossbrowser support and error handling 2018-07-31 18:30:56 -04:00
Dan Miller 0ff0a9c197 Show the retry button on latest tx of earliest nonce. 2018-07-31 16:37:14 -02:30
brunobar79 edb154749d send to fullscreen if no permission from popup 2018-07-30 22:57:05 -04:00
brunobar79 b673a7a7fc kill camera stream when unmouting 2018-07-30 18:40:00 -04:00
brunobar79 34617a21c3 copy 2018-07-30 18:36:37 -04:00
brunobar79 d2368d6fe0 clean up css 2018-07-30 18:34:00 -04:00
brunobar79 4339f04e80 use existing modals 2018-07-30 17:50:05 -04:00
brunobar79 b6592ba95f Merge branch 'develop' of github.com:MetaMask/metamask-extension into qr-code-scan 2018-07-30 15:57:10 -04:00
Esteban Miño 228f48c6e5
Merge branch 'develop' into TokensPerAccountBasis 2018-07-27 16:07:08 -04:00
Alexander Tseung d0c901d081 Round large exponential numbers 2018-07-27 12:22:10 -07:00
brunobar79 acfcdf52b4 fix unit tests 2018-07-26 21:52:01 -04:00
brunobar79 4de8f5b0d4 fix dependencies 2018-07-26 21:37:43 -04:00
brunobar79 6886429f0b fix linting errors 2018-07-26 21:22:39 -04:00
brunobar79 bea1cf3f3c clean up 2018-07-26 21:15:16 -04:00
brunobar79 69f4c8c336 fix merge conflicts 2018-07-26 21:04:03 -04:00
brunobar79 d4a15f22c2 added webrtc-adapter for browser compat 2018-07-26 21:00:48 -04:00
brunobar79 ea028e7506 fully working without tweaking ext. permission 2018-07-26 20:56:58 -04:00
brunobar79 6cd4bc9f4e working without permission issues 2018-07-26 20:24:39 -04:00
Esteban MIno 2827e13caa add & delete tokens per network 2018-07-26 19:28:12 -04:00
Alexander Tseung cd2b67cdd9 Fix overflow for long total strings in confirm string 2018-07-25 22:12:13 -07:00
Dan J Miller 53b440a287
Merge pull request #4885 from MetaMask/RetryOnEarliestPendingTx
Only show retry button on the earliest pending tx
2018-07-25 23:42:49 -02:30
Esteban MIno b580f60d74 earliest tx by submittedTime 2018-07-25 20:58:20 -04:00
Esteban MIno c8d45cb4a8 only show retry button on earliest pending tx 2018-07-25 20:02:12 -04:00
Sara Reynolds 9934690bd9 lint fix 2018-07-25 16:31:33 -07:00
Sara Reynolds 6eadf5b22b Update prop names 2018-07-25 16:26:30 -07:00