m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Code
9,051 Commits 2 Branches 0 Tags 265 MiB
d961454949
Commit Graph

1871 Commits

Author SHA1 Message Date
Dan Miller
d55a2615a4 Split advanced-tab-content.component.js render() method into smaller pieces; add translations to the same file. 2018-12-04 00:06:04 -03:30
Dan Miller
342dc95410 Adds the content of the advanced tab - w/o chart or dynamic content - to gas customize modal. 2018-12-04 00:06:04 -03:30
Dan Miller
5e7409482b Use BEM for css in gas-modal-page-container 2018-12-04 00:06:04 -03:30
Dan Miller
88d8eb289e Use correct message key in gas-modal-page-container.component.js 2018-12-04 00:06:04 -03:30
Dan Miller
f9aa5a70de Adds new gas customization modal container (without content) 2018-12-04 00:06:04 -03:30
Dan J Miller
4c24555545 Save recent network balances in local storage (#5843) 
* Use selector for state.metamask.accounts in all cases.

* Default to cached balance when selecting metamask accounts

* Adds the cached-balances controller

* Documentation and small codes fixes for #5843

Co-Authored-By: danjm <danjm.com@gmail.com>
 2018-11-30 14:51:24 -08:00
Whymarrh Whitby
88defe3623
Hide app-header when provider request pending (#5831) 2018-11-26 16:51:07 -03:30
Thomas Huang
4054b1cb84 Increase Token Symbol length to twelve 2018-11-22 12:39:59 -06:00
Bruno Barbieri
ae8626eceb
Merge pull request #5797 from MetaMask/trezor-v6 
Add Firefox and Brave support for Trezor
 2018-11-21 14:45:55 -05:00
Whymarrh Whitby
7229f0f9fc
Fix usage of setState in ConfirmTransactionBase#handleSubmit (#5799) 2018-11-21 15:22:18 -03:30
Whymarrh Whitby
74c18ef0e8
Show byte count for hex data on confirm screen (#5798) 2018-11-21 15:21:34 -03:30
brunobar79
9b1df386de fix merge conflicts 2018-11-20 17:44:28 -05:00
Whymarrh Whitby
c5da84d7a2 Remove "Beta" from header logo 2018-11-20 14:04:50 -03:30
Alexander Tseung
a7b3750a3e Fix button styling for Create Account Connect (#5787) 2018-11-19 22:46:41 -08:00
Alexander Tseung
4c87c05a02
Fix rounding issue when sending max tokens (#5695) 
* Fix rounding issue when sending max tokens

* Ensure amount row shows exact amount of max tokens on send screen (#2)

* Fix tests

* Change stored redux value from BigNumber to hex string. Fix TokenInput default value
 2018-11-19 16:06:34 -08:00
Whymarrh Whitby
1988e1e96b ESLint fixes (#5775) 
* eslint . --fix

* Upgrade all ESLint warnings to errors
 2018-11-16 14:54:55 -10:00
brunobar79
c0557b43e2 clean up 2018-11-15 00:34:49 -05:00
brunobar79
18f39ef69e Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-11-14 15:42:45 -05:00
Alexander Tseung
46b29a50f0 Show APPROVED status for transactions that have been approved but not submitted 2018-11-13 17:37:01 -08:00
brunobar79
484aa6801e Merge branch 'develop' into trezor-v5 2018-11-13 17:21:15 -05:00
PaddyMc
7ce2cf4572 Fixes #3425: Better support for batch transactions (#5437) 2018-11-13 13:49:12 -03:30
Vimal
6bb92a8672 merging upstream branch 2018-11-12 17:50:37 +05:30
Alexander Tseung
83ffb9fafe
Increase number of ETH decimals displayed in the balance view from 3 to 4 (#5710) 2018-11-09 10:17:42 -08:00
brunobar79
c651212025 fix merge conflicts 2018-11-06 20:21:19 -05:00
Whymarrh Whitby
f692123f51 Update the colour of the default image used on Connect Request (#5678) 2018-11-05 15:07:09 -08:00
Whymarrh Whitby
5d928e67c3 Update "Learn more" link on 1102 connect screen (#5677) 2018-11-05 15:07:09 -08:00
Whymarrh Whitby
26ada8a828 Update Connect Request screen design (#5644) 
* Parameterize NetworkDisplay background colour

* Update design for login request screen

* Pass siteTitle, siteImage through for calls to ethereum.enable()

* Bring the site images closer together
 2018-11-05 15:07:09 -08:00
bitpshr
226601a956 EIP-1102: add user privacy option 2018-11-05 15:07:09 -08:00
bitpshr
89b4aa5d62 EIP-1102: Add option to force-enable provider 2018-11-05 15:07:09 -08:00
bitpshr
c76c9ca2c8 EIP-1102: updated implementation 2018-11-05 15:07:09 -08:00
HackyMiner
ac079365e6 fixed currency-display (#5619) 
* call getValueFromWeiHex() with fromCurrency=nativeCurrency
 2018-10-30 12:15:38 +01:00
kumavis
310229d22e
Merge pull request #5567 from MetaMask/HowardBraham-develop 
Feature: Warn when attempting to send tx with data to non-contract
 2018-10-29 21:47:07 -04:00
HackyMiner
54a8ade266 Add support for RPC endpoints with custom chain IDs (#5134) 2018-10-26 10:26:43 +02:00
kumavis
9b42416fc0 Merge branch 'develop' of github.com:MetaMask/metamask-extension into HowardBraham-develop 2018-10-25 22:24:30 -04:00
Alexander Tseung
554f79c0e2
Fix blockies icons overriding contract map icons. Refactor Identicon component (#5599) 2018-10-25 17:21:41 +08:00
Alexander Tseung
7852269ed1
Add Activity Log entry for onchain failures for a transaction. Change scrolling of the transaction list. Remove Transaction Details modal. (#5581) 2018-10-23 19:59:04 +08:00
Vimal
82b11b69a5 Adding CoinSwitch exchange 2018-10-22 16:44:21 +05:30
Alexander Tseung
614995c0e9 Fix account display width for large currency values 2018-10-21 22:01:20 +08:00
brunobar79
9c1b2108f6 fix merge conflicts 2018-10-21 01:59:53 -04:00
kumavis
fda101912b ui - use variable to clarify result of emptiness check 2018-10-21 00:52:41 -04:00
kumavis
3b46478024
Merge branch 'develop' into develop 2018-10-20 23:48:10 -04:00
Thomas
4d1d4a1159 Update Shapeshift logo url and adjust list item contents 2018-10-17 20:40:09 -07:00
Whymarrh Whitby
42fa54678f Extract Add Token button into its own component 2018-10-17 15:49:29 -02:30
Alexander Tseung
badebe017f
Adds toggle for primary currency (#5421) 
* Add UnitInput component

* Add CurrencyInput component

* Add UserPreferencedCurrencyInput component

* Add UserPreferencedCurrencyDisplay component

* Add updatePreferences action

* Add styles for CurrencyInput, CurrencyDisplay, and UnitInput

* Update SettingsTab page with Primary Currency toggle

* Refactor currency displays and inputs to use UserPreferenced displays and inputs

* Add TokenInput component

* Add UserPreferencedTokenInput component

* Use TokenInput in the send screen

* Fix unit tests

* Fix e2e and integration tests

* Remove send/CurrencyDisplay component

* Replace diamond unicode character with Eth logo. Fix typos
 2018-10-17 07:03:29 +08:00
brunobar79
13820b6cc1 fix conflicts 2018-10-16 14:01:54 -04:00
Whymarrh Whitby
bdb6e55354 Decrease click area for AmountMaxButton on send screen 2018-10-15 21:04:07 -02:30
Michael J. Cohen
8c33c018de add tooltip for view etherscan tx (#5518) 
* add tooltip for view etherscan tx

* run lint
 2018-10-15 20:32:57 -02:30
Alexander Tseung
c821a8354c
Add txReceipt data to transaction details (#5513) 2018-10-16 06:00:47 +08:00
Whymarrh Whitby
5cde74fe88 Update Zendesk links for new subdomain 2018-10-11 13:36:24 -02:30
bakaoh
63c61c52eb Make all addresses EIP-55 compliant (#5379) 
* Make all addresses EIP-55 compliant

* Checksum autocompleted address but not during input
 2018-10-10 10:50:37 -02:30
Bruno Barbieri
ccab4ee1a4 tests - integration - Add Drizzle tests (#5467) 
* added drizzle app for testing

* working

* clean up

* clean up script

* make build step required

* add drizzle-tests to .eslintignore

* clean up drizzle run script

* lint

* use truffle unbox

* undo eslintignore changes

* revert change

* dont use global

* dont need this steps

* use the new account flow

* restore package-lock.json
 2018-10-10 01:12:43 -04:00
Santiago Gonzalez Toral
fd14d3f090 Fixed lint errors 2018-10-09 19:43:41 -07:00
Santiago Gonzalez Toral
f88373237b Added account options on home screen 2018-10-09 19:43:41 -07:00
Howard Braham
4cc0b1ef01 ganache-core merged my PR, so I changed some comments to clarify that ganache-core v2.2.1 and below will return the non-standard '0x0' 2018-10-09 15:31:25 -07:00
Howard Braham
222e62d7f1 Bug Fix: #1789 and #4525 eth.getCode() with no contract 2018-10-09 15:31:25 -07:00
Alexander Tseung
37322f9f4e Fix token values being undefined 2018-10-08 17:05:57 -07:00
Whymarrh Whitby
888e5b4f16
Merge pull request #5442 from whymarrh/fix-page-container-footer 
Fix markup for inline instances of PageContainers
 2018-10-05 19:04:55 -02:30
Whymarrh Whitby
7dd1254424 Fix markup for inline instances of PageContainers 2018-10-05 18:13:29 -02:30
Alexander Tseung
c474f30929 Fix action translations edge cases 2018-10-05 13:21:10 -07:00
Alexander Tseung
50d91f998d Translate method names in the transaction list only when applicable 2018-10-04 19:26:41 -07:00
Whymarrh Whitby
2c5fb11b37 Remove "Copy Contract Address" from token options 2018-10-03 13:49:03 -02:30
Whymarrh Whitby
b11a8ca2f7
Merge pull request #5329 from whymarrh/confirm-features 
Add batch reject to confirm screen
 2018-10-01 22:02:47 -02:30
Whymarrh Whitby
65ba018aad Only use current network txs when calculating "Reject All" 2018-10-01 17:32:01 -02:30
Whymarrh Whitby
e351a7dd74 Switch page-container__footer-* for header and footer tags 2018-10-01 17:32:01 -02:30
Whymarrh Whitby
d28453234c Reword batch reject confirm as "Reject All" 2018-10-01 13:44:54 -02:30
Whymarrh Whitby
2e35c05f14 Confirm rejecting multiple transactions with modal 2018-10-01 13:44:54 -02:30
Whymarrh Whitby
7610248f8c s/Cancel/Reject/ on confirm screen for clarity 2018-10-01 13:44:54 -02:30
Whymarrh Whitby
0fa9299cd1 Add "Cancel All" button to confirm footer 2018-10-01 13:44:54 -02:30
Whymarrh Whitby
2e5a09e28c Have PageContainerFooter take children node 2018-10-01 13:44:54 -02:30
Whymarrh Whitby
ce2e068b43 Recipient not required on send screen when hex data present 2018-10-01 12:53:32 -02:30
Whymarrh Whitby
c9f22916dd Rework estimateGas logic 
The tests still pass!
 2018-10-01 12:53:32 -02:30
Whymarrh Whitby
918fb71df3 Update gas when hex data changes on send screen 2018-10-01 12:53:32 -02:30
Whymarrh Whitby
3741927d8d Update send.utils.test to with better mocks 2018-10-01 12:53:32 -02:30
Whymarrh Whitby
508a712479 Allow sending transactions with hex data and no recipient 2018-10-01 12:53:32 -02:30
HackyMiner
13a1d46720 support editable customRPC (#5267) 
* support editable customRPC #5246

* remove rpcList size restriction
 2018-09-28 17:23:58 -02:30
Alexander Tseung
cf6bead7ef Close transaction details modal when clicking speed up 2018-09-26 17:38:49 -07:00
Thomas Huang
db30bbce4c
Merge pull request #5332 from MetaMask/ui-unit-tests 
Some Ui tests
 2018-09-25 23:17:17 -05:00
Alexander Tseung
5d57c7c4fd
Merge pull request #5282 from MetaMask/tx-cancel-ui 
Add Cancel Transaction feature. Refactor modals. Add Transaction Details modal.
 2018-09-24 11:34:12 -07:00
tmashuang
a0a57c24fd Some Ui tests 2018-09-24 11:28:04 -05:00
Alexander Tseung
04988eca5e
Merge pull request #5241 from MetaMask/refactor-settings 
Refactor settings page to use JSX and follow component file folder st…
 2018-09-20 23:33:04 -07:00
Alexander Tseung
431beb9436 Fix multiplyCurrencies. Add onClose prop for Modal component. Remove hideModal from modal components. 2018-09-20 19:44:23 -07:00
Alexander Tseung
01166b26ed Fix translation casing 2018-09-20 15:53:53 -07:00
Alexander Tseung
9088fd1de4 Add Current Conversion Updated string to translations 2018-09-19 16:55:58 -07:00
Alexander Tseung
b579ee9619 Refactor settings page to use JSX and follow component file folder structure 2018-09-19 16:37:23 -07:00
Alexander Tseung
2cfdc95eeb Add unit tests 2018-09-19 14:31:10 -07:00
Alexander Tseung
6b3a4e8259 Fix unit tests 2018-09-19 14:31:10 -07:00
Alexander Tseung
2779936317 Add transition effect to TransactionListItemDetails expander 2018-09-19 14:31:10 -07:00
Alexander Tseung
95e1eff4ca Add TransactionDetails modal 2018-09-19 14:31:10 -07:00
Alexander Tseung
5a6c333506 Switch existing modals from using Notification to Modal. Remove Notification component. Add CancelTransaction modal 2018-09-19 14:31:10 -07:00
Alexander Tseung
04ec3f0b6b Fix Transaction view styles 2018-09-19 14:31:10 -07:00
Alexander Tseung
d0d0103bb5 Add Modal component 2018-09-19 14:31:10 -07:00
Alexander Tseung
44d4b5b5db Refactor ConfirmPageContainerError to ErrorMessage 2018-09-19 14:31:10 -07:00
Whymarrh Whitby
3987f9860f Move main-container wrapper div into its own class 2018-09-19 16:43:58 -02:30
Whymarrh Whitby
fbf14cd130 Prevent loading screen from overlaying the app bar 
Refs #4417

This change is functional copy of 3893469 that solves the problem in a way
that doesn't depend on the height of the app bar since the app bar isn't a
fixed height in the smaller views.
 2018-09-19 16:03:16 -02:30
Paul Bouchon
daca7f9b41
Merge branch 'develop' into eip-712 2018-09-17 12:11:10 -04:00
Chad Grimaldi
2f14f978e3 compute and display checksummed hash in selected-account component (#5255) 2018-09-15 13:31:21 -07:00
Sean
cd28dbb1d5 Improvement: Increase click area for arrows (#5264) 2018-09-15 12:22:10 -07:00
Alexander Tseung
b062fe2e99 Fix speed up functionality 2018-09-14 20:29:15 -07:00
Sean Rabaut
c5b9409701 Bug Fix: #5183 history not defined 2018-09-13 20:18:58 -04:00
bitpshr
42fdcf6239 Update new method namespace from v2 to v3 2018-09-13 15:42:27 -04:00
bitpshr
36dd0354e7 Implement latest EIP-712 protocol 2018-09-13 15:40:57 -04:00
Alexander Tseung
f1a309e0cc Fix identicon address. Fix styling of New Contract recipient. Fix Activity Log initial ETH value. Add timestamps to Activity Log events 2018-09-12 19:48:52 -07:00
Alexander Tseung
c18c0e1c30 Fix tests. Add className to Identicon ethLogos. 2018-09-12 19:48:52 -07:00
Alexander Tseung
01e9f03701 Add transaction details to TransactionListItem component 2018-09-12 19:48:52 -07:00
Alexander Tseung
5beb34aa52 Add TransactionListItemDetails component 2018-09-12 19:48:52 -07:00
Alexander Tseung
fd51ab1229 Add TransactionBreakdown component 2018-09-12 19:48:52 -07:00
Alexander Tseung
084158f1a2 Add tests for TransactionActivityLog. Make changes to rendering events 2018-09-12 19:48:52 -07:00
Alexander Tseung
8143f7725a Edit styling of cards variant of SenderToRecipient component 2018-09-12 19:48:51 -07:00
Alexander Tseung
63ba6d1df4 Add HexToDecimal component 2018-09-12 19:48:51 -07:00
Alexander Tseung
18c94c4ac9 Add tests for Card component 2018-09-12 19:48:51 -07:00
Alexander Tseung
702b756882 Allow denominations in CurrencyDisplay component 2018-09-12 19:48:51 -07:00
Alexander Tseung
31089778ba Add raised type buttons to Button component. Refactor all buttons within app to Button components 2018-09-12 19:48:51 -07:00
Alexander Tseung
930dac110a Add ActivityLog component 2018-09-12 19:48:51 -07:00
Whymarrh Whitby
e39050f4fe Show failed tx txMeta.err in tooltips 2018-09-08 20:56:02 -02:30
Whymarrh Whitby
9662f9b8b5 Show failed tx RPC error messages in tooltips 
This changeset displays the error messages attached to txMeta for a failed tx
in a tooltip on hover in the tx list view. This will only display for txs with
the `txMeta.err.rpc.value` property, not all failed txs.
 2018-09-08 20:50:31 -02:30
Whymarrh Whitby
47b32682f3 Don't render tooltips without titles 2018-09-08 20:50:31 -02:30
Whymarrh Whitby
db241e6b91 Rewrite Tooltip component as ES6 2018-09-08 20:50:31 -02:30
brunobar79
8ee01f4e99 Merge branch 'develop' of github.com:MetaMask/metamask-extension into trezor-v5 2018-09-05 16:26:09 -04:00
Whymarrh Whitby
05c72070bb Fix assertion of missing child component 2018-09-05 16:35:37 -02:30
Dan J Miller
bd49098039
Merge pull request #5188 from taobun/develop 
edit decimal check in old-ui/
 2018-09-04 21:39:01 -02:30
Dan Finlay
5043451356
Merge pull request #5167 from MetaMask/fix-watcAsset-images 
Fix images for watched tokens
 2018-09-04 12:56:56 -07:00
Dan J Miller
86bb96aaaf
Merge pull request #5129 from MetaMask/add-sidebar-component 
Add sidebar component
 2018-09-04 16:19:09 -02:30
bunoi
f412b19244 fix check valid decimals code in new ui 2018-09-04 23:40:02 +07:00
Dan J Miller
b9e4feac48
Merge pull request #5091 from MetaMask/i4945-feature-flag-hex-data 
Adds feature flag toggle for the hex data row on the send screen.
 2018-09-04 11:57:40 -02:30
Esteban MIno
165a966a2a balance components using selectors 2018-08-30 17:19:10 -03:00
Esteban MIno
c8e5068537 fix watched tokens images showing in tx list 2018-08-30 13:51:57 -03:00
Esteban MIno
208312b239 fix watched asset image rendering on confirm transaction header 2018-08-30 12:59:44 -03:00
Esteban MIno
07cb6adc31 fix images for watched tokens 2018-08-29 23:13:25 -03:00
Dan Miller
40e0d92f57 Adds sidebar component and refactors slide in wallet view sidebar to use it. 2018-08-28 22:08:15 -02:30
Alexander Tseung
9ab0354e36
Merge pull request #5155 from MetaMask/i5154-confirm-spinner 
Fix infinite spinner on failed transactions
 2018-08-28 17:37:13 -07:00
Alexander Tseung
f78dc96a2c Fix infinite spinner on failed transactions 2018-08-28 12:18:57 -07:00
Esteban MIno
e743f44150 fix conflicts 2018-08-28 15:20:30 -03:00
Dan Miller
65873e33e4 Adds feature flag toggle for the hex data row on the send screen. 2018-08-27 11:44:16 -02:30
Alexander Tseung
c0e97d1739 Fix tests 2018-08-23 19:19:48 -07:00
Alexander Tseung
342522c6cf Fix naming, add eth.getCode check for actions, fix translations for statuses 2018-08-23 16:45:28 -07:00
Alexander Tseung
eb17151ff4 Change "Outgoing" to "Sent Ether" or "Sent Token" 2018-08-23 16:45:28 -07:00
Alexander Tseung
da0df79047 Add CurrencyDisplay and TokenCurrencyDisplay components 2018-08-23 16:45:27 -07:00
Alexander Tseung
b48a293af0 Update retry transaction logic to use network nonce 2018-08-23 16:45:27 -07:00
Alexander Tseung
5dcd8ceb7b Fix e2e tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
9adf0c4b60 Fix integration tests 2018-08-23 16:45:27 -07:00
Alexander Tseung
e104744d3b Fix shapeshift transactions. Delete unused files 2018-08-23 16:45:27 -07:00
Alexander Tseung
33a94332e4 Show token amounts in TransactionListItem for token transfers 2018-08-23 16:45:27 -07:00
Alexander Tseung
5ddd9b55be Add retry button to TransactionListItem 2018-08-23 16:44:44 -07:00
Alexander Tseung
fa8313f903 Code cleanup 2018-08-23 16:44:44 -07:00
Alexander Tseung
5de48c67a0 Use css grid for TransactionListItem for responsive layout 2018-08-23 16:44:44 -07:00
Alexander Tseung
5ee40675b9 Refactor transactions list views. Add redesign components 2018-08-23 16:44:44 -07:00
Alexander Tseung
d733bd34fb Delete unused files 2018-08-23 16:44:44 -07:00
Alexander Tseung
4e0693eaff Add withMethodData HOC, add higher-order-component folder 2018-08-23 16:44:43 -07:00
Alexander Tseung
40d4ac9ae1 Add TransactionStatus component 2018-08-23 16:44:43 -07:00
Alexander Tseung
8a7547b9cd Add MenuBar component 2018-08-23 16:44:43 -07:00
Alexander Tseung
d1de5ae94f Add react-media package to prevent rendering wallet-view twice in the popup view 2018-08-23 16:44:43 -07:00
Alexander Tseung
3b408715c7 Refactor home screen and remove unused files 2018-08-23 16:44:43 -07:00
Esteban MIno
b59a1e91b8 typo watchAsset imageUrl to image 2018-08-23 15:54:40 -03:00
Evgeniy Filatov
9a80d6e859 updated docs, small improvement of recent RPC rendering 2018-08-23 01:26:30 +03:00
Evgeniy Filatov
c0b5e8a088 backported RPC improvements to oldui 2018-08-23 01:18:13 +03:00
Evgeniy Filatov
b23cca1469 implemented improvements to RPC history 2018-08-23 01:18:13 +03:00
Alexander Tseung
25eac2334b
Merge pull request #5089 from MetaMask/i5085-ethcode 
Use eth_getCode to sort transaction action type
 2018-08-22 14:48:37 -07:00
Alexander Tseung
865a0d8173 Use eth_getCode to sort transaction action type 2018-08-22 14:19:07 -07:00
Alexander Tseung
d7d141cea5 Fix code readability, use PureComponent over Component 2018-08-22 14:12:01 -07:00
Alexander Tseung
01c0c98501 Add tabs support for PageContainer 2018-08-22 14:12:01 -07:00
Whymarrh Whitby
f495c0e9e0
Merge pull request #5102 from whymarrh/fix-account-export-pw-bug 
Fix export privkey modal password bugs
 2018-08-22 16:28:33 -02:30
Whymarrh Whitby
171f6711d9
Merge pull request #5066 from whymarrh/fix-key-export 
Don't re-render the export modal when the selected identity changes
 2018-08-22 16:28:17 -02:30
Whymarrh Whitby
1e8e8bdfc8 Don't re-render the export modal when the selected identity changes 2018-08-22 15:38:34 -02:30
Whymarrh Whitby
a90c152485 Update AccountModalContainer to accept a selectedIdentity prop 2018-08-22 15:38:34 -02:30
Whymarrh Whitby
743c6e7ca4 Clear warnings when exportAccount succeeds 2018-08-22 15:38:09 -02:30
Whymarrh Whitby
456f2faf4f Handle case where keyring is missing in AccountDetailsModal 2018-08-22 15:38:09 -02:30
Alexander Tseung
7294aede4f Add new variant for SenderToRecipient component 2018-08-22 10:53:20 -07:00
Esteban MIno
153731e462 fix integration tests on balance component with new watchAsset 2018-08-22 12:06:11 -03:00
Esteban MIno
6ccf2811e7 unit tests for watchAsset 2018-08-21 19:17:57 -03:00
Esteban MIno
6fa889abcb refactor watchToken related functions 2018-08-21 12:59:42 -03:00
brunobar79
0e1605b082 fix comment 2018-08-20 22:17:22 -04:00
brunobar79
ab7eb73ecc fix merge conflicts 2018-08-20 21:51:35 -04:00
Esteban MIno
81cd29df43 Merge branch 'develop' into WatchTokenFeature 2018-08-20 19:35:38 -03:00
Alexander Tseung
cec87a5b2c Update logo wordmark 2018-08-18 20:46:56 -07:00
brunobar79
51e4a6d335 fix ledger affiliate link 2018-08-16 21:15:50 -04:00
brunobar79
285814646f ui ready 2018-08-16 20:41:23 -04:00
Esteban MIno
dbab9a007f delete according image when token added with watchToken deleted 2018-08-16 21:17:02 -03:00
brunobar79
2ea05e303d connect screen ready 2018-08-16 19:39:52 -04:00
Esteban MIno
bb868f5834 correct behavior when notification is closed when popup 2018-08-16 20:19:19 -03:00
Esteban MIno
2ace30bcd1 WIP 2018-08-16 18:28:07 -03:00
Esteban MIno
a36ea0e232 show watch asset image from hide token modal 2018-08-16 12:04:43 -03:00
Esteban MIno
b766104c8d add suggested tokens objects in metamask state 2018-08-15 18:34:57 -03:00
brunobar79
53dcad5a3b more ui 2018-08-14 19:38:23 -04:00
brunobar79
19d1988715 fix 2018-08-14 19:24:15 -04:00
brunobar79
c72ced79ae ui fixes 2018-08-14 19:22:00 -04:00
Esteban MIno
a4c3f6b65c add support for images base64 and urls on new ui 2018-08-14 20:08:12 -03:00
brunobar79
b77cc3d969 fix tx tests 2018-08-14 03:42:23 -04:00
brunobar79
61a279204a legacy and new hd path working 2018-08-14 01:26:18 -04:00
brunobar79
4e1d8ba19d good progress adding paths 2018-08-13 19:29:43 -04:00
brunobar79
aa6a42e3de rename keyring 2018-08-11 05:11:21 -04:00
brunobar79
8e842a8947 able to add accounts 2018-08-11 05:02:02 -04:00
brunobar79
78a1cd3314 iframe communication working 2018-08-11 02:35:20 -04:00
brunobar79
5ef80495cf refactor to support multiple hw wallets 2018-08-10 21:54:34 -04:00
Bruno Barbieri
e2be22a4b7
Merge pull request #4897 from MetaMask/qr-code-scan 
QR Code Scanner
 2018-08-10 13:40:06 -04:00
brunobar79
eb2f491458 add error messages 2018-08-10 12:09:54 -04:00
brunobar79
e905c9f055 hide export private key for trezor accounts 2018-08-10 11:56:56 -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
Dan Miller
e98c3b4c01 Get nonce for showing retry button using ethQuery transaction count. 2018-08-08 17:04:42 -02:30