1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-19 16:03:21 +01:00
Commit Graph

4187 Commits

Author SHA1 Message Date
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
Thomas Huang
0ab5c1c6e2
Merge pull request #5481 from MetaMask/reducers
tests/Reducers
2018-11-06 20:56:15 -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
Thomas
de297cd74d nextUnreadNotice undefined rather than null 2018-10-31 14:30:51 -07:00
Thomas
7607794851 Readable tests, and set nextUnreadNotice to null when CLEAR_NOTICES is dispatched 2018-10-31 07:07:25 -07:00
Thomas
7531de14f9 Merge branch 'develop' into reducers 2018-10-31 05:55:25 -07:00
HackyMiner
ac079365e6 fixed currency-display (#5619)
* call getValueFromWeiHex() with fromCurrency=nativeCurrency
2018-10-30 12:15:38 +01:00
kumavis
73eeeda215
Merge pull request #5560 from MetaMask/sentry-enhancements2
Sentry - various enhancements to help debugging (alternate)
2018-10-29 21:57:51 -04: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
kumavis
ccbc233282 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-29 20:25:05 -04:00
HackyMiner
54a8ade266 Add support for RPC endpoints with custom chain IDs (#5134) 2018-10-26 10:26:43 +02:00
Alexander Tseung
eaca9a0e8a Fix raised button min-height (#5613) 2018-10-26 10:04:21 +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
55c66b0d98
Fix button styling for overflowing text (#5602) 2018-10-25 22:00:14 +08: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
315028ec53
Fix UnknownFunction showing as Confirm (#5590) 2018-10-24 23:27:16 +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
Alexander Tseung
688ef2ed01
Fix signature request styling issues (#5574) 2018-10-23 07:15:38 +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
f0602ca354 Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2 2018-10-20 23:51:00 -04:00
kumavis
3b46478024
Merge branch 'develop' into develop 2018-10-20 23:48:10 -04:00
kumavis
73ec4e66cb sentry - include app state in ui errors 2018-10-20 03:14:59 -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
Thomas Huang
b45479934d test - add actions unit tests (#5369)
* Actions.spec.js

* Error handling tests

* Lint
2018-10-10 10:32:26 -04:00
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
Thomas
093ca07201 Set maxMode and toNickname defaults for clear_send 2018-10-10 01:12:25 -07:00
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
Dan Finlay
c8521e49ad
Merge pull request #5428 from alextsg/i5372-queue-order
Reverse pending transactions order
2018-10-05 11:07:44 -07:00
Alexander Tseung
0527d02216 Reverse pending transactions order 2018-10-04 21:37:41 -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
Sean
b5169340ab Improvement: Reposition customize gas error (#5265) 2018-10-01 11:37:23 -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
3e470fee8a Add withModalProps HOC 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
Whymarrh Whitby
4c37669557 Make the LoadingScreen component 100% as tall as its container 2018-09-19 15:33:53 -02:30
Whymarrh Whitby
b1b5968e5e Remove unused loading-overlay--full-screen CSS styles
Refs #4417
2018-09-19 15:32:20 -02:30
Alexander Tseung
91ee373dbe Fix exception thrown on getTokenData 2018-09-18 17:20:28 -07:00
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
Whymarrh Whitby
d34edaada1
Merge pull request #5261 from lastblocklabs/style-fix-5242
lower input z-index to prevent overlap - follow up style fix to #5242
2018-09-14 09:17:43 -07:00
Sean Rabaut
c5b9409701 Bug Fix: #5183 history not defined 2018-09-13 20:18:58 -04:00
chadmg
055ddd5f1e follow up style fix to #5242 2018-09-13 19:23:04 -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
16d6cd5eb9
Merge pull request #5182 from MetaMask/tx-activity
Add Transaction Details to the Transaction List view
2018-09-12 20:07:59 -07:00
Chad Grimaldi
014240b066 increase z-index of send-to input to allow for right-click (#5242) 2018-09-12 19:57:35 -07: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
c04d9095dd Add WEI to getEthConversionFromWeiHex 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
Frankie
1552fe1c3e
Merge pull request #5216 from MetaMask/tx-cancel
Add createCancelTransaction method
2018-09-10 13:29:29 -10:00
Frankie
a43e71693f
Merge pull request #5223 from whymarrh/tx-error-tooltips
Show transaction error message tooltips for statuses
2018-09-10 13:25:59 -10:00
Whymarrh Whitby
8541442b8d Clear old seed words when importing new seed words 2018-09-10 14:04:58 -07:00
Alexander Tseung
43de189d06 Add createCancelTransaction method 2018-09-10 12:48:01 -07:00
brunobar79
26333ee830 fix merge conflicts 2018-09-10 13:16:37 -04: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
Eugene Marinelli
d27332955c Use correct loading message when connecting to Kovan (#5189)
* Use correct loading message when connecting to Kovan

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md
2018-09-06 12:20:55 -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
63397047cf fix integration test for asset images selectors 2018-08-30 15:09:59 -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
Alexander Tseung
0259eb0214
Merge pull request #5121 from MetaMask/i5099-approve
Prevent token symbol from showing as null in the confirm screen
2018-08-27 15:28:29 -07: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
c9ec5ed38d Fix e2e 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
01f00a9ca6 Add tOrKey function to I18nProvider 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
Alexander Tseung
7924dbc0c9 Use eth-contract-metadata data if the token symbol or decimals fail on retrieval 2018-08-22 16:54:18 -07: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
Bruno Barbieri
80fe3ce888
Merge branch 'develop' into ledger-support 2018-08-14 22:55:47 -04:00
brunobar79
82a5ed1e03 remove console logs 2018-08-14 22:40:29 -04: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
Dan Finlay
d7aa1bf5c0
Merge pull request #5060 from MetaMask/bignumber-string
Cast arguments for new Bignumbers() to string.
2018-08-14 14:36:27 -07:00
Dan Miller
ebb23721ed Cast arguments for new Bignumbers() to string. 2018-08-14 15:46:58 -02:30
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
Whymarrh Whitby
b83a746e4f Add exportAsFile optional type argument 2018-08-13 18:38:13 -02:30
brunobar79
e6d64cecf8 message signing works 2018-08-11 20:26:34 -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
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
33357e3538 refactor unused code 2018-08-07 19:12:16 -04:00
Esteban Miño
3f57d5f66b
Merge branch 'develop' into WatchTokenFeature 2018-08-07 17:50:58 -04:00
Esteban MIno
00d1f6fec5 watch token on old ui 2018-08-07 17:40:45 -04:00
Esteban MIno
c0cdda8321 Merge branch 'develop' into TokensPerAccountBasis 2018-08-07 14:17:40 -04:00
Esteban MIno
a57f56fdca clean confirm add token component 2018-08-06 20:06:13 -04:00
Esteban MIno
af35b415ab new confirm add suggested token component 2018-08-06 20:03:49 -04:00
Esteban MIno
88933f3a66 fix duplicated action 2018-08-06 18:48:18 -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
Esteban MIno
9ac9f53a73 eth_watchToken working 2018-08-03 19:24:12 -04:00
brunobar79
71ef4d85da design complete 2018-08-03 18:57:23 -04:00
Esteban MIno
12dd7a7232 popup initializing with suggested tokens 2018-08-03 18:01:40 -04:00
Alexander Tseung
6d76d4e228 Disable Confirm button on subsequent clicks to prevent confirming multiple times 2018-08-03 14:44:57 -07:00
Esteban MIno
081884bd80 rpc-engine not crashing when eth_watchToken 2018-08-03 16:42:13 -04:00
Esteban MIno
21a61f2987 merge develop 2018-08-03 14:56:02 -04:00
brunobar79
94a89790dc fix 2018-07-31 18:58:54 -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
Sara Reynolds
9ca4b66c82 Add tests for Confirm Detail Row 2018-07-25 11:58:51 -07:00
brunobar79
4759915856 fix spinner and qr icon 2018-07-24 22:34:15 -04:00
brunobar79
eeb902dbf0 decent UI 2018-07-24 21:13:17 -04:00
brunobar79
74fd6d1d12 working without injection 2018-07-24 20:32:20 -04:00
Dan J Miller
1f9c52fbf0
Merge pull request #4845 from MetaMask/button-group
Add ButtonGroup component
2018-07-24 21:47:44 -02:30
Alexander Tseung
152246f3b0 Add close window support to signature requests. Move logic to actions 2018-07-23 20:25:04 -07:00
brunobar79
d5929e5c42 added qr code scanner icon in send transaction 2018-07-23 22:10:57 -04:00
brunobar79
f7ad978474 camera working back and forth 2018-07-23 21:27:51 -04:00
Dan Miller
2359062b62 UI confirm screen closes confirmation window on submit or cancel of a tx 2018-07-23 22:20:06 -02:30
Dan Miller
a146e5ebbc Adds tests for button group component. 2018-07-23 16:49:28 -02:30
Dan Finlay
b208d33b3b
Merge pull request #4851 from MetaMask/fix-trezor-alert
Fix trezor "Hardware wallet connected" alert
2018-07-23 11:58:29 -07:00
Dan Finlay
239f5110e9
Merge pull request #4848 from MetaMask/fix-alert-flash
Fix Banner flash on load
2018-07-23 11:32:56 -07:00
Alexander Tseung
cdda52d799 Add ButtonGroup component 2018-07-23 09:23:43 -07:00
板橋 清信
3554292c02 fix type 2018-07-23 17:23:34 +09:00
板橋 清信
79976b7026 fix token amount 2018-07-23 16:28:45 +09:00
brunobar79
bcbe7fef2e show alert ONLY when device is connected 2018-07-23 01:18:39 -04:00
brunobar79
e2fa3ba415 refactor Alert component to work properly 2018-07-21 16:02:23 -04:00
Alexander Tseung
469a79f97f Add fallback options for displaying recipient name in the Confirm screen 2018-07-20 14:23:53 -07:00
Bruno Barbieri
9be2248d7a
Merge pull request #4625 from MetaMask/initial-trezor-support
Initial trezor support
2018-07-19 15:00:59 -04:00
brunobar79
df19163bf9 last css fixes 2018-07-19 02:31:13 -04:00
brunobar79
76981c2ad9 added new global alert 2018-07-19 02:31:02 -04:00
brunobar79
514148ffa1 fix support link 2018-07-19 00:16:10 -04:00
brunobar79
a6e0eef8f4 fix unsupported browser view 2018-07-19 00:14:13 -04:00
brunobar79
086ab6e1e1 lint 2018-07-18 23:57:09 -04:00
brunobar79
2bfddc288e scroll smooth 2018-07-18 23:12:49 -04:00
brunobar79
49d1bdea8a design done 2018-07-18 22:57:47 -04:00
Whymarrh Whitby
13804d61b4
Merge pull request #4822 from whymarrh/show-more-address
Show first four characters of account after 0x
2018-07-18 15:44:00 -02:30
Whymarrh Whitby
71d64e74a5 Show first four characters of account after 0x in wallet 2018-07-18 10:30:31 -02:30
Whymarrh Whitby
45faf3d558 Show first four characters of account after 0x in tx list 2018-07-18 10:30:21 -02:30
Whymarrh Whitby
da1f6e061d Don't set txData to an empty string 2018-07-18 10:13:50 -02:30
Whymarrh Whitby
346505cab0 Inline single-use vars in send-footer.utils 2018-07-18 09:58:12 -02:30
Whymarrh Whitby
fb672e00df Send data along with other tx params 2018-07-18 09:58:12 -02:30
Whymarrh Whitby
9ea7411c06 Hook up send component w/ UPDATE_SEND_HEX_DATA action 2018-07-18 09:52:36 -02:30
Whymarrh Whitby
25417fad26 Add updateSendHexData action 2018-07-18 09:52:13 -02:30
Whymarrh Whitby
3f9c3d76b6 Add hex data row to send screen 2018-07-18 09:52:13 -02:30
brunobar79
cbb14f1d5e fix browser not supported screen 2018-07-17 21:57:19 -04:00
brunobar79
cb53d5122c Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-17 20:43:32 -04:00
brunobar79
cb97517b26 updated account list based on new designs 2018-07-17 18:53:37 -04:00
Alexander Tseung
301ae305b8 Use Number constructor for number conversion. Use existing noConversionRateAvailable message 2018-07-17 14:06:30 -07:00
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
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
brunobar79
d05814a5ad Merge branch 'develop' into initial-trezor-support 2018-07-16 12:55:13 -04:00
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
brunobar79
d21d408d64 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-13 20:53:22 -04:00
brunobar79
55382e9842 fix account selection 2018-07-13 15:19:21 -04:00
brunobar79
5399546388 added affiliate link to trezor 2018-07-13 13:49:20 -04:00
brunobar79
82a93bb287 detect ability to open popup instead of browser 2018-07-13 02:03:54 -04:00
brunobar79
289795fb12 fix account balance bug 2018-07-13 00:09:42 -04:00
brunobar79
5710e648bd remove account modal updated 2018-07-12 18:19:33 -04: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
brunobar79
4b528405ea catching up with develop 2018-07-12 13:19:51 -04:00
brunobar79
07d8bfaec5 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-12 12:54:08 -04:00
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
brunobar79
2a0a785324 added tooltip 2018-07-12 00:23:08 -04:00
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
brunobar79
80e875308b forget device and autiload account features added 2018-07-11 21:21:36 -04: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
brunobar79
5a2a34591f clean up 2018-07-11 01:35:37 -04:00
brunobar79
523cf9ad33 account removal is working 2018-07-11 00:20:40 -04:00
Alexander Tseung
2175d03cca Prevent users from submitting password multiple times on the unlock screen 2018-07-10 20:00:06 -07:00
brunobar79
b9c2994d24 finish warning modal UI 2018-07-10 19:19:29 -04:00
Alexander Tseung
76e80f631e Fix multiple signature requests showing an infinite spinner 2018-07-10 12:21:09 -07:00
Alexander Tseung
f6e90bb3db Add unit tests for confirmTransaction duck and util 2018-07-10 00:18:37 -07:00
brunobar79
9b81180ab1 added ui to remove accounts 2018-07-10 00:20:00 -04:00
brunobar79
2de3039b6b fix account duplication 2018-07-09 17:55:37 -04:00
brunobar79
7cca7ace2e fix all the account related bugs 2018-07-09 17:24:52 -04:00
Alexander Tseung
7d691c7398 Fix existing unit tests 2018-07-07 18:53:00 -07:00
brunobar79
5127601545 copy updated 2018-07-06 20:37:08 -04:00
brunobar79
dddbb4250b update connect harwdware screen 2018-07-06 20:04:20 -04:00
Alexander Tseung
a2d9c43fba Various fixes from PR comments 2018-07-06 16:27:08 -07:00
Alexander Tseung
9cde5ab11b Use eth-method-registry to get method data 2018-07-06 16:27:08 -07:00
Alexander Tseung
7732cd4100 Display newest transaction 2018-07-06 16:27:08 -07:00
Alexander Tseung
e89549846f Refactor data flow, signature request routing 2018-07-06 16:27:08 -07:00
Alexander Tseung
ea9d51e427 Refactor and redesign confirm transaction views 2018-07-06 16:27:08 -07:00
brunobar79
7c9d942ba1 Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support 2018-07-06 19:21:18 -04:00
brunobar79
6b2511f94f UI refactor 2018-07-05 20:59:31 -04:00
brunobar79
6c2730f243 Refactor UI 2018-07-05 17:45:28 -04:00
brunobar79
ba5cde0995 move strings to localization file 2018-07-05 17:04:36 -04:00
brunobar79
313090efcc added message for non-chrome browsers 2018-07-05 16:11:41 -04:00
Dan J Miller
6595f84d07
Merge pull request #4648 from MetaMask/update-import-from-seed-screen
Update import from seed screen on new ui.
2018-07-05 16:26:21 -02:30
Dan J Miller
d3920007fa
Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-ui
Improve send token error ux.
2018-07-05 16:25:59 -02:30
Dan
f006cbf2ce Delete old restore vault file. 2018-07-05 14:44:08 -02:30
Whymarrh Whitby
60857f94ad
Merge pull request #4733 from whymarrh/fix-setstate-warnings
Fix setState warnings in components using TokenTracker
2018-07-05 13:59:46 -02:30
Whymarrh Whitby
e59e92e028
Merge pull request #4734 from whymarrh/txlistitem-setstate-warning
Prevent calling setState in TxListItem after unmount
2018-07-05 13:59:25 -02:30
Dan J Miller
3c75be04a0
Merge pull request #4617 from TrejGun/fix-new-line
fix white spaces in signature
2018-07-05 13:55:18 -02:30
Whymarrh Whitby
2298daa53e Prevent calling setState in TxListItem after unmount 2018-07-05 13:17:53 -02:30
Dan J Miller
d4bc943b01
Merge pull request #4686 from MetaMask/tweak-token-list-amount-style
Ensures token list amount is in its own row.
2018-07-05 12:39:26 -02:30
Whymarrh Whitby
783559f94e Don't update token balances after tracker is stopped 2018-07-05 10:54:51 -02:30
Whymarrh Whitby
0116ea9b95 Remove TokenTracker listeners when unmounting component 2018-07-05 10:54:51 -02:30
Dan
5d721665d3 Ensures token list amount is in its own row. 2018-07-05 08:07:41 -02:30
Dan J Miller
46cda26f3b
Merge pull request #4685 from MetaMask/estimate-gasprice-background-newui
Use background gas price estimation method in new ui.
2018-07-05 08:01:03 -02:30
TrejGun
94d1d846fb Merge branch 'develop' into contextTypes
# Conflicts:
#	ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
2018-07-05 11:34:13 +08:00
trejgun
c94f639de5 convert contextType to static prop for refactored components 2018-07-05 11:33:34 +08:00
TrejGun
b427743ab8 fix classname 2018-07-05 11:21:27 +08:00
Анна
90934bca46 Merge branch 'develop' into to-autocomplete 2018-07-05 11:15:28 +08:00
Dan
7d7662191a Improve error and promise resolution handling in action.js updateGasData(). 2018-07-04 21:47:19 -02:30
Dan
f262f0ea64 Update import from seed screen on new ui. 2018-07-04 21:21:12 -02:30
Dan
0796fc58e4 Improve send token error ux. 2018-07-04 16:09:29 -02:30
Sara Reynolds
6bc7647c05 fixes 4666 2018-07-03 16:05:20 -07:00
Sara Reynolds
d3c64358c5 :qw
:wq
q
2018-07-03 16:05:20 -07:00
Dan
7babacf062 Remove unnecessary anonymous function call in actions.js gas estimation. 2018-07-03 17:24:21 -02:30
brunobar79
9d3f2435e5 lint fix 2018-07-03 15:46:15 -04:00
brunobar79
3837c2ddd7 fix merge conflicts 2018-07-03 15:41:18 -04:00
Dan J Miller
a049627752
Merge pull request #4716 from MetaMask/i4663-clearErrorMessages
fixes #4663 - Clear Error Messages when Importing Accounts are Successful
2018-07-03 16:03:55 -02:30
Dan J Miller
8def5281b4
Merge pull request #4654 from TrejGun/bignumber
fixes #4307 BigNumber casting issue
2018-07-03 15:18:04 -02:30
Alexander Tseung
3fd5af636f
Merge pull request #4633 from MetaMask/i4580-import-account-errors
Show all errors on account creation screen.
2018-07-03 07:43:40 -10:00
Dan J Miller
4bdd59b055
Merge pull request #4699 from TrejGun/removeLeadingZeroes
move removeLeadingZeroes to utils, add test
2018-07-03 15:01:48 -02:30
brunobar79
3290421e2f fix merge conflicts 2018-07-03 13:31:30 -04:00
Sara Reynolds
d126887bc3 fixes 4663 2018-07-03 09:50:59 -07:00
trejgun
1f6bf0a80d fixes #4664 2018-07-03 10:34:39 +08:00
brunobar79
a8f745f9fe eslint --fix . 2018-07-02 18:49:33 -04:00
brunobar79
f19ffaf08d move hardcoded strings to localization file 2018-07-02 15:16:05 -04:00
brunobar79
86a8c98148 always open connect hardware in full screen mode 2018-07-02 15:14:57 -04:00
trejgun
491f2d03cf move removeLeadingZeroes to utils, add test 2018-07-02 09:36:57 +08:00
brunobar79
1494cc5e6c fix merge conflicts 2018-07-01 11:41:34 -10:00
Dan J Miller
b2e64f24ec
Merge pull request #4687 from snreynolds/i4623-getConvertedCurrency
fixes #4623
2018-06-29 17:03:09 -02:30
Dan J Miller
22debbfec8
Merge pull request #4640 from weijiekoh/develop
Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt
2018-06-29 17:00:51 -02:30
Sara Reynolds
ad6c454fd5 fixes #4623 2018-06-29 11:54:49 -07:00
Dan J Miller
f6238b2d39
Merge pull request #4647 from MetaMask/fix-overflow-currency-display
Fix issues with scrollbar in currency display.
2018-06-29 16:06:29 -02:30
Dan J Miller
464b97890d
Improve attribute syntax in send-amount-row.component.js 2018-06-29 15:44:30 -02:30
trejgun
a6f1734edd lint 2018-06-29 16:19:45 +08:00
Dan Finlay
a1fb1b8d3e
Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-ux
Set base estimate for token sends to be updated once recipient address specified
2018-06-28 17:48:05 -10:00
Dan
03f17d910a Check that error is defined in import-account error catch. 2018-06-28 21:45:46 -02:30
Dan
75581ceebe Show all errors on account creation screen. 2018-06-28 21:45:46 -02:30
Dan
d2845afd89 Remove input arrows for send screen amount row on firefox. 2018-06-28 21:45:04 -02:30
Dan
d5133fb429 Fix issues with scrollbar in currency display. 2018-06-28 21:45:04 -02:30
Dan
de01a6f112 Use background gas price estimation method in new ui. 2018-06-28 21:28:59 -02:30
Thomas Huang
218f2e84db
Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-style
Fix style of shapeshift screen in deposit modal.
2018-06-28 16:57:32 -07:00
Dan
696d626133 Set based estimate for token sends to be updated once recipient address specified. 2018-06-28 21:03:09 -02:30
Dan J Miller
9f5ee94b69
Merge pull request #4678 from MetaMask/e2e-beta-tests-upgrade
E2e beta tests upgrade
2018-06-28 20:17:44 -02:30
Thomas Huang
db548adca7
Merge pull request #4674 from MetaMask/removeOnlyTests
Remove .only on test
2018-06-28 13:26:29 -07:00
Dan J Miller
08b69a0cb0
Merge pull request #4677 from MetaMask/customize-gas-loading-wait
Only show the customize gas modal if the estimateGas call is not currently in flight.
2018-06-27 17:27:51 -02:30
Dan J Miller
1839ab5346
Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancements
[new-ui] Improve ENS input errors and update ens validation on network change
2018-06-27 17:09:44 -02:30
Dan
f5d43404dc Fix send token tests in beta ui e2e tests. 2018-06-27 11:01:26 -02:30
Dan
a242668872 Only show the customize gas modal if the estimateGas call is not currently in flight. 2018-06-27 11:01:26 -02:30
tmashuang
fb02e71e22 Remove .only on test 2018-06-26 18:14:21 -07:00
Dan J Miller
60feeb393b
Merge pull request #4627 from TrejGun/gas-fee-display
refactor gas-fee-display component
2018-06-26 16:25:26 -02:30
trejgun
74080e41f1 change numbers 2018-06-24 17:56:07 +08:00
trejgun
0d0120746d remove .only 2018-06-24 17:51:31 +08:00
trejgun
5d034006e8 fixes #4307 BigNumber casting issue 2018-06-24 17:48:02 +08:00
trejgun
e05eeb56da fix default import 2018-06-23 07:41:11 +08:00
Koh Wei Jie
cd90e8a869 removed stray console.log 2018-06-22 16:46:00 +08:00
Koh Wei Jie
1ff29c5b4a fixed blank boolean field for typed signing for new UI 2018-06-22 16:38:54 +08:00
Dan
e8fa18779d Fix style of shapeshift screen in deposit modal. 2018-06-21 15:50:51 -02:30
Dan
97a7bc4894 Remove commented out code in ens-input. 2018-06-21 15:01:13 -02:30
trejgun
778aec8c75 lint 2018-06-21 15:03:19 +08:00
trejgun
c27dfb01bb refactor gas-fee-display component
#4622
2018-06-21 14:43:48 +08:00
Whymarrh Whitby
3123073659 Scroll large amounts in the send component 2018-06-20 16:15:22 -02:30
Whymarrh Whitby
1f6f4977de Handle large token balances in tx list hero 2018-06-20 16:15:17 -02:30
trejgun
bbd1b8360a fix white spaces in signature 2018-06-20 12:51:21 +08:00
Dan
06307ef8ae Merge branch 'develop' into i4409-i4410-ens-input-enhancements 2018-06-19 21:39:52 -02:30
Dan
957d729c17 Only show the customize gas modal if the estimateGas call is not currently in flight. 2018-06-19 13:23:33 -02:30
Dan Finlay
d26ce807fb Linted 2018-06-18 15:44:43 -07:00
Dan Finlay
f14ed32980 Begin letting UI show suggested tokens 2018-06-18 15:33:50 -07:00
kumavis
62df446385
Merge pull request #4584 from MetaMask/fix-send-token
Add hex-prefix to gas estimate result
2018-06-18 11:54:26 -07:00
Csaba S
8aab4dd1fa View address of an added token (#4591)
* adding menu actions for tokens

* apply common style
2018-06-18 10:29:09 -07:00
Dan
ac7c0277b5 On send screen amount change, updateGas call now includes current to address. 2018-06-18 14:07:01 -02:30
Dan
70abe54c94 Send screen returns simple gas cost if no to address specified when not sending token. 2018-06-18 13:55:20 -02:30
Dan
6c9302f985 Remove leading zeroes from send screen amount row input. 2018-06-18 13:50:21 -02:30
Dan
36de213c6c Fix currency-display.js rendering of token amounts. 2018-06-18 13:49:21 -02:30
Dan
347d1984cf Revert to updating amount on blur of input change; update gas on blur of amount input change; validate onchange. 2018-06-18 13:47:14 -02:30
Alexander Tseung
adb71073c8 Fix unit tests 2018-06-15 15:31:16 -07:00
Alexander Tseung
5685c4bafe Estimate gas limit when the token amount changes. Fix amount input 2018-06-15 14:36:52 -07:00
Dan
e4d3bdba12 Update send.utils.js estimateGas tests. 2018-06-14 21:20:10 -07:00
Dan
b9b6cbf561 Add a buffer to new ui gas estimates 2018-06-14 22:32:03 -02:30
Alexander Tseung
1b9ed23752 Add hex-prefix to gas estimate result 2018-06-14 14:58:42 -07:00
Dan
bb855707ef ENS input in send form shows distinct errors for invalid addresses and non-existent addresses. 2018-06-14 15:43:14 -02:30
Dan Finlay
3a5089da6f
Merge pull request #4566 from MetaMask/notice-phishing
Push new notice on recent phishing incidents
2018-06-14 09:49:38 -07:00
kumavis
44a8e48a04 notices - replace getLatestNotice with getNextNotice 2018-06-13 23:30:31 -07:00
Dan
5995b6d68d ENS name revalidates on network change. 2018-06-13 09:26:21 -02:30
Bruno
bb4cc72646 fix merge conflicts 2018-06-13 02:01:47 -04:00
Bruno
8763ea898e move TrezorKeyring to its own package 2018-06-13 01:32:13 -04:00
Bobby Dresser
4196b16f06 add help link to eth_sign warning 2018-06-11 14:28:57 -07:00
Bruno
d1880073f6 balances working 2018-06-10 21:10:22 -04:00
Bruno
8c4d58aa45 initial trezor support 2018-06-10 03:52:32 -04:00
Dan
049071a743 Access correct property from state in confirm screen components gatherTxMeta() 2018-06-08 12:52:38 -02:30
Dan
ae55e8a3c1 Merge branch 'develop' into i3725-refactor-send-component- 2018-06-06 16:40:43 -02:30
kumavis
72f7a4e1d0
Merge pull request #4418 from MetaMask/handle-import-account-failure-in-ui
Handle errors for null selected address after Importing account (json or private key)
2018-06-06 11:47:45 -07:00
03-26
ccd4884db1 i18n - ja improvements 2018-06-06 11:38:57 -07:00
Whymarrh Whitby
d9d09f953b Render the accounts in keyring order 2018-06-05 17:17:27 -07:00
Whymarrh Whitby
8b449b325d Remove unused identities reducer from UI 2018-06-05 17:17:27 -07:00
Whymarrh Whitby
665ac860e5 Remove selectedIdentity prop from wallet view
The selectedIdentity property is computed based on the selectedAddress
which means that using both the selectedAddress and the selectedIdentity
is redundant. In the case of the Array#find call on the set of keyrings,
we wouldn't have a situation where one is included and the other isn't.

This changeset removes the selectedIdentity from the wallet view because
it isn't needed.
2018-06-05 12:25:06 -07:00
Whymarrh Whitby
762695bfd9 Ensure selectedAddress exists when render wallet 2018-06-05 12:04:03 -07:00
Dan
49f0df3174 Merge branch 'develop' into handle-import-account-failure-in-ui 2018-06-05 09:56:36 -02:30
Dan
aee9247faa Merge branch 'develop' into i3725-refactor-send-component- 2018-06-04 22:32:30 -02:30
Dan J Miller
3b6e96bac9 Update hide-token-confirmation-modal.js to use new modalState schema (#4482)
* Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55).

* Fix modalState props
2018-06-04 16:13:32 -07:00
Dan
ada59054c9 Simplify recipient code check in send.utils estimateGas 2018-06-04 15:50:52 -02:30
Dan J Miller
5d58f0e9a0
Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflow
Token name is not hidden in wallet if balance is exceptionally long.
2018-06-04 14:59:03 -02:30
Alexander Tseung
5a2771dd47
Indicate the current selected account on the popup account view (#4445) 2018-06-04 09:33:25 -07:00
Dan
8f0a3b8311 Merge branch 'develop' into handle-import-account-failure-in-ui 2018-06-03 06:46:45 -02:30
Dan
ffd42c59da Default currency-display valueToRender to empty string when not readOnly ('0' if readOnly). 2018-06-02 01:58:01 -02:30
Dan
1b879f45bc Fix calculation of data property for gas estimation on token transfers. 2018-06-02 01:53:01 -02:30
Bobby Dresser
966583026a update helpscout links to zenhub 2018-05-31 15:26:04 -07:00
Alexander Tseung
fd98ed570e Fix ellipses 2018-05-31 11:16:41 -07:00
Dan
701611e317 Merge branch 'i3725-refactor-send-component-' into i3914-fix-newui-send-gas-estimation 2018-05-31 15:39:24 -02:30
Dan
2ca084b055 Remove .only 2018-05-31 15:31:50 -02:30
Dan
d12bb8c14f Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask-extension into i3725-refactor-send-component- 2018-05-31 15:29:17 -02:30
Dan
5091b03e4b Merge branch 'develop' into i3725-refactor-send-component- 2018-05-31 15:28:03 -02:30
Dan J Miller
15f4ce352d
Merge pull request #4386 from MetaMask/i4077-replace-currency-input-with-numeric-input
Replace currency-input.js with NumericInput
2018-05-31 15:09:13 -02:30
Alexander Tseung
cc73d869fe Add new alert modals 2018-05-31 10:37:52 -07:00
Alexander Tseung
f4d833cb09 Change btn-secondary styles to btn-default. Make btn-secondary red warning style buttons 2018-05-31 10:37:52 -07:00
Dan
990b69c655 Improve input width calculation in currency-display.js 2018-05-31 13:47:18 -02:30
Dan
d454b5de2b Token name is not hidden in wallet if balance is exceptionally long. 2018-05-31 13:32:18 -02:30
Dan
67c74cd5b6 Fix currency display send integration tests. 2018-05-31 12:07:23 -02:30
Dan
1bde2892ec Improve efficiency of estimateGasPriceFromRecentBlocks 2018-05-30 22:43:49 -02:30
Dan
0f3480a97f Fix then-catch + error handling in import-account 2018-05-30 21:33:40 -02:30
kumavis
64aa56b5a6 test - send-utils.test - lint fix 2018-05-30 20:54:32 -02:30
Dan
5a842e440f Gas estimation uses block gas limit as fallback if query.estimateGas returns an expected error. 2018-05-30 20:54:32 -02:30
Dan
0f20fce9b7 Auto update gas estimate when to changes. 2018-05-30 20:54:31 -02:30
Dan
2eddb7b652 Support smaller decimals in currency-display 2018-05-30 20:54:31 -02:30
Dan
4f0b4eef50 Estimate gas using same algorithm as backend. 2018-05-30 20:54:31 -02:30
Dan
166fda5877 Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks method. 2018-05-30 20:54:31 -02:30
Dan
17909465f2 getParamsForGasEstimate extracts symbol from token instead of just accepting symbol. 2018-05-30 20:54:31 -02:30
Dan
6f633a97e1 Rename gas change actions. 2018-05-30 20:54:31 -02:30
Dan
8b6d08a15d Split out getGasEstimate logic from updateGasTotal 2018-05-30 20:54:31 -02:30
Dan
6d8344d0d0 Update amount error on update of send screen. 2018-05-30 20:51:46 -02:30
Dan
1c3d2aa18b Importing account by json and private key shows error and does not change account if no selectedAddress comes after import. 2018-05-30 17:00:50 -02:30
Alexander Tseung
389346913b
Prevent loading screen from overlaying the app bar (#4417) 2018-05-30 10:38:53 -07:00
Alexander Tseung
d40971e7f3
Fix error handling on incorrect password (#4401) 2018-05-30 09:23:31 -07:00
Dan
5347319dff Fix setting of token balance on account switch in send screen from field. 2018-05-30 13:35:01 -02:30
Dan
7f23e017b2 Delete currency-input.js 2018-05-29 22:21:55 -02:30
Dan
2e1d962b1a Remove currency input from input-number 2018-05-29 22:15:21 -02:30
Dan
f33bb3e2fd Stop using external NumericInput component. 2018-05-29 16:25:03 -02:30
Alexander Tseung
41e38fe553
Add notification for dropped retry transactions (#4363) 2018-05-29 10:23:06 -07:00
Alexander Tseung
e3c9629130
Fix add-token token list placeholder width (#4365) 2018-05-29 10:03:08 -07:00
Alexander Tseung
d1f5d8ccc6
Fix text field labels of first time flow. Add text fields to storybook (#4389) 2018-05-29 09:35:18 -05:00
Dan
ea28c8a437 Replaces currency-input.js with NumericInput 2018-05-29 09:21:54 -02:30
kumavis
a7b7c8f034 newui - unlock - dont catch errors unrelated to tryUnlockMetamask 2018-05-28 23:34:40 -07:00
Dan
e712336189 Send refactor: fix error handling and form disabling in send form. 2018-05-25 14:39:31 -02:30
Dan
0de765aa25 Clean up for send refactor PR. 2018-05-25 00:00:55 -02:30
Dan
dc2b5d0ef4 Move formShouldBeDisabled from send-footer util to component. 2018-05-24 22:23:54 -02:30
Dan
3a87d9221d Fix order of button text in page-container-footer. 2018-05-24 22:23:30 -02:30
Dan
5bb399e55a Display correct titles and subtitles on send token and editing send transaction screens. 2018-05-24 17:27:33 -02:30
Dan
1405237479 Fix display of primary currency symbol in send amount row 2018-05-24 13:31:14 -02:30
Alexander Tseung
df38b0f307
Fix scrolling in Deposit Ether modal (#4336) 2018-05-23 14:26:25 -07:00
Dan
c4e48d9263 Send refactor: fix amount max button for tokens. 2018-05-23 16:56:13 -02:30
Dan
440905125d Merge branch 'develop' into i3725-refactor-send-component- 2018-05-23 16:03:15 -02:30
kumavis
b5bbfd3264
Merge pull request #4308 from MetaMask/i4232-addtoken
Update designs for Add Token screen
2018-05-22 12:53:59 -07:00
Alexander Tseung
8245bf010e Update input field border on focus 2018-05-21 15:24:38 -07:00
Frankie
5e67951c1a
Merge pull request #4295 from MetaMask/kumavis-patch-3
ui - token-util - warn via loglevel on token lookup failure
2018-05-21 15:06:18 -07:00
kumavis
9929f89c6e
Merge pull request #4316 from MetaMask/fix-signature-request
Fix signature request header text
2018-05-21 14:18:55 -07:00
kumavis
a1d2813f8f
Merge pull request #4273 from brunobar79/fix-new-ui-popup-header
Remove fix modal header height
2018-05-21 14:07:06 -07:00
Alexander Tseung
c4e75a7075 Fix tests 2018-05-20 14:08:45 -07:00
Alexander Tseung
646545551c Fix signature request header text 2018-05-20 13:01:31 -07:00
Alexander Tseung
4f6b53c1aa Update designs for Add Token screen 2018-05-19 23:04:19 -07:00
kumavis
666c1f1b30
token-util - warn via loglevel on token lookup failure 2018-05-18 10:51:49 -07:00
Whymarrh Whitby
924cc1fcf7 Move setAccountLabel into PreferencesController 2018-05-17 12:57:39 -02:30
Bruno
b0dcdc30fa remove fix header height 2018-05-16 18:51:55 -04:00
kumavis
4be681f447
Merge pull request #4255 from MetaMask/i4233-dropdowns
Fix account and network dropdowns in confirm screen
2018-05-16 13:02:27 -07:00
kumavis
ff91ef96ef ui - unlock - remove setNetworkEndpoints calls from new unlock screen 2018-05-16 12:35:43 -07:00
kumavis
c6f822ad45 ui - remove files accidently added by bad merge 2018-05-16 12:29:57 -07:00
kumavis
c27d9162d7 Merge branch 'develop' of github.com:MetaMask/metamask-extension into network-controller-remove-setNetworkEndpoints 2018-05-16 11:57:07 -07:00
Dan
759bc17388 Merge branch 'develop' into i3725-refactor-send-component- 2018-05-15 11:21:15 -02:30
Dan
44679f6cda Import defaults in send_/ 2018-05-15 09:59:23 -02:30
Dan
8ff60267d8 Fix Button component path in page-container footer. 2018-05-15 09:13:39 -02:30
Dan
77ee23d493 Add index.js files to send_ subdirectories 2018-05-14 20:33:04 -02:30
Alexander Tseung
5561937773 Fix account and network dropdowns in confirm screen 2018-05-14 15:03:04 -07:00
Dan
6bc8cc819a Merge branch 'develop' into i3725-refactor-send-component- 2018-05-14 11:44:50 -02:30
Dan
0739618a61 Tests for send.duck.js 2018-05-14 10:27:36 -02:30
Dan
0076b732bd Rename ducks/send.js to ducks/send.duck.js 2018-05-14 09:49:09 -02:30
Dan
b3f08681fd Add missing unit tests in send_/: now 100% function test coverage in send_/ 2018-05-14 09:43:55 -02:30
Dan
c2ed2d4e50 Lint fixes 2018-05-14 07:01:41 -02:30
Dan
145e53b404 Unit tests for account-list-item, amount-max-button and send-amount-row components. 2018-05-14 06:55:03 -02:30
Alexander Tseung
0bcfbc1544 Add error message when passwords don't match in first time flow. Change input field styling in first time flow 2018-05-13 21:46:12 -07:00
Alexander Tseung
0301b33a48 Add TextField component to storybook 2018-05-11 12:49:17 -07:00
Alexander Tseung
2381c0e0f4 Add new unlock screen design 2018-05-11 12:49:17 -07:00
Dan
61d35e7abe Unit tests for from-dropdown; split out send-dropdown-list from from-dropdown 2018-05-11 13:50:43 -02:30
Dan
5d79d12648 SendRowErrorMessage component test. 2018-05-11 04:07:33 -02:30
Dan
22e2806ae2 Unit tests for send from, gas, to and wrapper row components. 2018-05-10 12:17:05 -04:00
Dan
f94ffa022c Fix test descriptions and remove unnecessary proptypes. 2018-05-10 09:24:43 -04:00
Thomas Huang
c3079ff160
Merge pull request #4196 from MetaMask/i3457-fontweight
Change font weight from 300 to 400
2018-05-08 12:46:27 -07:00
Dan
9ccc609e56 Adds test for send, send-content, send-footer and send-header components. 2018-05-07 08:03:20 -04:00
Alexander Tseung
fff7f52074 Change font weight from 300 to 400 2018-05-05 15:12:41 -07:00
Dan
7c49009854 Unit tests for containers, utils and selectors in send_/ 2018-05-05 11:58:14 -04:00
Alexander Tseung
d5759cf4a8 Add storybook integration 2018-05-03 10:51:15 -07:00
kumavis
a1d13d45cf lint - cleanup some unused variables 2018-05-02 18:23:55 -07:00
kumavis
096851d091
Merge pull request #4156 from MetaMask/i4010-spinner
Fix styling of the app spinner
2018-05-02 17:00:57 -07:00
kumavis
ad1f98f8f2
Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccount
ui - actions - importNewAccount - rethrow err on failure
2018-05-01 12:36:19 -06:00
kumavis
0e48ddfceb ui - actions - importNewAccount - rethrow err on failure 2018-05-01 11:16:35 -07:00
Dan
e869d09c79 Merge branch 'i3725-refactor-send-component-' of github.com:MetaMask/metamask-extension into i3725-refactor-send-component- 2018-05-01 00:37:17 -02:30
Dan
e488c0eeea Delete dead send code. 2018-05-01 00:30:38 -02:30
Dan
2f78fffbdb Merge branch 'i3725-refactor-send-component-' into i3725-refactor-send-component-2 2018-05-01 00:12:57 -02:30
Alexander Tseung
ffda954add Fix styling of the app spinner 2018-04-30 18:58:37 -07:00
kumavis
6f316ca450 network - remove setNetworkEndpoints 2018-04-30 16:36:17 -07:00
Paul Bouchon
5ec631cad3
Handle Promise rejections when importing accounts (#4142)
* Silently catch import failures since errors exist in Redux state
* Add comment about no-op catch statement
2018-04-30 18:07:25 -04:00
kumavis
bce7adac85 ui - actions - importNewAccount - use async and pify for cleaner syntax 2018-04-30 14:46:53 -07:00
kumavis
5f3f8c85fc
Merge pull request #4059 from MetaMask/i-4033-seed-words
Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
2018-04-30 12:04:53 -06:00
Dan
954394f810 Remove 'goHome' from send_ 2018-04-30 14:08:03 -02:30
Dan
beb8d1cf5e Move getMaxModeOn selector to amount-max-button container. 2018-04-30 14:07:01 -02:30
Dan
4a8c3194c2 Use constants for send screen errors messages. 2018-04-30 14:00:01 -02:30
Dan
bc145dc6a6 Fix send-v2__form class in send-content.component 2018-04-30 13:39:05 -02:30
Dan
41b609ab5b Fix amount max button. 2018-04-30 13:33:49 -02:30
Dan
5529ec6efd Fix close button on send screen 2018-04-30 13:06:23 -02:30
Dan
26f965bcce Further refactors; includes refactor of send-v2.js and associated container 2018-04-30 13:05:48 -02:30
bitpshr
b4b33b57bc Fix ShapeShift purchases on new UI 2018-04-28 14:41:46 -04:00
kumavis
141884ee6a
Merge pull request #4113 from MetaMask/i4107-send-tokens-without-symbols-decimal-methods
Wraps calls to symbol() and decimals() in try catch (Fixes #4107)
2018-04-27 19:21:12 -06:00
Dan
9f9e8789cc Simplify return of existing token in getSymbolAndDecimals 2018-04-27 21:38:57 -02:30
Dan
b71dbf52d1 Convert decimals to string in getSymbolAndDecimals; return null for symbol or decimals. 2018-04-27 21:33:56 -02:30
Dan
6de450488b Wraps calls to symbol() and decimals() in try catch 2018-04-27 20:45:36 -02:30
Paul Bouchon
1bad3fa257
Allow transactions with 0-gwei gas price (#4073)
* Allow transactions with 0-gwei gas price
* Add tests to verify tx with 0 gas fee
* Conditionally use CurrencyInput in CurrencyDisplay
2018-04-27 10:42:02 -04:00
Dan
33c16d1bf6 Fixes to get tests passing. 2018-04-27 08:11:18 -02:30
Dan
91c201aa72 Lint fixes and alphabetization for i3725-refactor-send-component 2018-04-27 00:16:11 -02:30
Alexander Tseung
61b8c3efff Redirect to correct seed phrase screen 2018-04-26 19:27:33 -07:00
Dan
8ff7806f1b Core of the refactor complete 2018-04-26 14:08:38 -02:30
Dan
02a6d2089e Merge branch 'master' into i3725-refactor-send-component 2018-04-24 13:31:39 -02:30
Dan Finlay
66ae4a948a
Merge pull request #3940 from nyatla/master
Small layout and cursor problem fix.
2018-04-23 17:07:40 -07:00
Dan Finlay
4289f813e9
Merge pull request #3968 from MetaMask/gh-3653
Clean up network config
2018-04-23 15:49:17 -07:00
Dan Finlay
f1c0d8ad6e
Merge pull request #4028 from MetaMask/i4016-customrpc
Fix custom RPC not redirecting to Settings page
2018-04-23 15:14:23 -07:00
Alexander Tseung
9e41f58af2 Clean up network config 2018-04-23 10:18:05 -07:00
Alexander Tseung
1d2d9798cb Merge branch 'master' of https://github.com/MetaMask/metamask-extension into i-4033-seed-words 2018-04-22 09:28:29 -07:00
Alexander Tseung
3082d2e4ef Use new design for reveal seed screen. Persist seed words only in first time flow 2018-04-22 09:24:21 -07:00
Alexander Tseung
477b74124d Revert "Fix UI getting stuck in Reveal Seed screen"
This reverts commit 2c8156ebe9.
2018-04-21 22:23:45 -07:00
Thomas Huang
00efcf9e8b
Merge pull request #4030 from MetaMask/i4014-metamask-version
Show correct MetaMask version number in the Info page
2018-04-19 09:56:12 -07:00
Alexander Tseung
2fdf45b418 Show correct MetaMask version number in the Info page 2018-04-18 18:44:51 -07:00
Alexander Tseung
ce74cd7774 Fix custom RPC not redirecting to Settings page 2018-04-18 17:34:28 -07:00
Alexander Tseung
1d80a4c452 Fix exception thrown when revealing seed words 2018-04-18 16:10:42 -07:00
Dan Finlay
061975cd4a
Merge pull request #3977 from MetaMask/i-3913-big-number
Fix BigNumber exception in confirm-send-ether
2018-04-18 11:45:20 -07:00
Dan Finlay
0a14cedaf1
Merge pull request #4004 from MetaMask/i3955-reveal-seed
Fix UI getting stuck in Reveal Seed screen
2018-04-18 11:44:14 -07:00
Dan Finlay
40f0a40edf
Merge pull request #3998 from MetaMask/i3988-checksummed-address
Show checksum addresses on UI
2018-04-18 11:43:38 -07:00
Alexander Tseung
2c8156ebe9 Fix UI getting stuck in Reveal Seed screen 2018-04-18 10:18:24 -07:00
bitpshr
cce123c30e Show checksummed addresses throughout the UI 2018-04-18 09:47:05 -04:00
Alexander Tseung
053044fb65 Fix spinner layout 2018-04-18 01:03:07 -07:00
Alexander Tseung
de7fc781a5 Fix BigNumber exception in confirm-send-ether 2018-04-18 00:58:40 -07:00
Dan Finlay
6ee57dcad7
Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-17 13:36:21 -07:00
Alexander Tseung
b0a105ce80 Fix confirmation popup not always opening 2018-04-17 08:58:37 -07:00
Dan Finlay
0668976514
Merge branch 'master' into i3981-contract-rates 2018-04-16 16:32:56 -07:00
Dan Finlay
26d2f5cd0e
Merge pull request #3970 from MetaMask/i3651-removeGlobalLog
Remove reliance on window.log
2018-04-16 15:16:45 -07:00
bitpshr
d0447f9058 Maintain token prices using a background service 2018-04-16 11:47:06 -04:00
bitpshr
a350e80fee Fetch token prices based on contract address 2018-04-15 23:46:40 -04:00
Dan Finlay
34692acdf9 Fix action for setting locale 2018-04-13 16:14:23 -07:00
bitpshr
7129d7c0f3 Require loglevel singleton in each module that uses it 2018-04-13 17:56:28 -04:00
Dan
59c887301a second commit 2018-04-11 11:51:54 -02:30
Alexander Tseung
f96c13d616 Refactor page-container component structure 2018-04-10 15:28:52 -07:00
nyatla
c9a4077207 Reduced button padding.
Title overflowed in Japanese.
2018-04-10 18:51:44 +09:00
Dan
f4d8da9277 Merge branch 'master' into i3725-refactor-send-component 2018-04-10 07:19:01 -02:30
nyatla
5166e1a9fd Expanded dropdown menu width of title.
Title overflowed in Japanese.
2018-04-10 18:47:59 +09:00
nyatla
2ccd9ca29d Changed mouse cursor to "pointer" on the cancel text at the top left of the page. 2018-04-10 18:46:09 +09:00
Dan
d8adc527f1 Lint fix. 2018-04-09 16:54:52 -02:30
Dan
2c4426e4de Merge branch 'master' into i3580-InternationalizeCurrency 2018-04-09 16:52:26 -02:30
Dan
9dbb9d12ad Internationalize converted value in confirm screens 2018-04-09 16:45:23 -02:30
Dan
1382de2cda Internationalize converted value in currency-input.js 2018-04-09 14:14:09 -02:30
Dan
4011dac6f6 Improve display of crypto currencies when selected as the 'Current Conversion' 2018-04-09 13:41:40 -02:30
Dan
284dd85a99 first commit 2018-04-06 19:59:51 -02:30
Alexander Tseung
1e6f062bb6 Fix integration tests 2018-04-06 11:25:05 -07:00
Alexander Tseung
4c15c0d3ba Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-05 23:17:22 -07:00
kumavis
24eef428ce
Merge pull request #3883 from danjm/i3685-define-event-privatekey-import
event object actually passed to this.createKeyringOnEnter in private-key.js
2018-04-05 15:07:44 -07:00
kumavis
17931698a8
Merge pull request #3892 from alextsg/gh-3891
Fix populating txParams with undefined data
2018-04-05 15:02:35 -07:00
Alexander Tseung
2db55cd0de Fix editing transaction 2018-04-05 10:29:16 -07:00
Alexander Tseung
82af778e62 Revert "commit"
This reverts commit fa8500e09a.
2018-04-05 10:11:09 -07:00
Alexander Tseung
9d7e49fc3b Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-05 10:07:14 -07:00
Alexander Tseung
418926ffdf Fix populating txParams with undefined data 2018-04-05 09:54:41 -07:00
Alexander Tseung
fa8500e09a commit 2018-04-05 09:53:24 -07:00
Thomas Huang
e774fbcece
Merge pull request #3865 from MetaMask/openlinkinnewwindow
Make token helpscout link open in new tab.
2018-04-05 09:34:47 -07:00
Kevin Serrano
36f85c4f84
Merge pull request #3882 from MetaMask/i#3791
Fixes download file buttons
2018-04-05 00:51:58 -07:00
Kevin Serrano
29bad56410
Merge branch 'master' of github.com:MetaMask/metamask-extension into openlinkinnewwindow 2018-04-05 00:45:17 -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
Dan
2199b3720c Allow from and to address to be the same in new-ui. 2018-04-04 21:52:12 -02:30
Dan
6ecf2c8092 event object actually passed to this.createKeyringOnEnter in private-key.js 2018-04-04 21:18:12 -02:30
Thomas
4ffa74cbe6 Change double-quotes to single-quotes 2018-04-04 16:42:54 -07:00
Thomas
18e0a7e4f9 Add target=_blank exportAsFile 2018-04-04 16:26:05 -07:00
frankiebee
3de1873126 hot-fix new-ui - default to an object if identities is undefined 2018-04-04 13:56:39 -07:00
Dan
40bbca5d0d Don't prevent user from setting an eth address in to field if there is no ens support. 2018-04-04 15:45:29 -02:30
Kevin Serrano
02fa5c9c32
Make token helpscout link open in new tab. 2018-04-04 00:09:11 -07:00
Alexander Tseung
7776af7cd0 Use new design for showing seed words 2018-04-03 18:20:51 -07:00
Alexander Tseung
007f91cc50 commit 2018-04-03 17:43:42 -07:00
Alexander Tseung
34e608e9dc Merge branch 'master' of https://github.com/MetaMask/metamask-extension into cb-254 2018-04-03 17:06:00 -07:00
kumavis
ca780075a8
Merge pull request #3834 from MetaMask/3734
Address Add Token design feedback
2018-04-03 17:00:12 -07:00
Alexander Tseung
bf38aa6f1d Fix transaction confirmations 2018-04-03 16:59:32 -07:00
Dan Finlay
99c22a0835 Linted 2018-04-03 14:00:04 -07:00
Dan Finlay
74049c19fc Internationalize currency
Fixes #3580
2018-04-03 13:58:26 -07:00
kumavis
00657e14a8 build - correctly set METAMASK_ENV via envify 2018-04-03 09:51:33 -07:00
David Yoo
4ddf5d2516 Address feedback 2018-04-03 09:38:27 -07:00
Alexander Tseung
35875863d2 Fix merge conflicts. Modify send workflow 2018-04-03 01:03:31 -07:00
David Yoo
0ab227d8a2 Address Add Token design feedback 2018-04-02 17:04:27 -07:00
Alexander Tseung
516c1869b0 Fix lint errors 2018-04-02 16:24:37 -07:00
kumavis
15ba31897c Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 15:51:15 -07:00
Thomas Huang
8cd2022169
Merge pull request #3825 from danjm/i3668-warnusertxsimulationfails
Add simulation failure errors while improve send error handling on confirm screen
2018-04-02 15:26:46 -07:00
kumavis
98e0fc1ab9 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-04-02 14:13:45 -07:00
Alexander Tseung
92f8157dfe Add withRouter to I18nProvider component 2018-04-02 13:15:31 -07:00
Dan
d166cb2b1b Ensure txParams are prefixed with 0x when sending. 2018-04-02 16:38:51 -02:30
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
6277a4c46a Refactor onboarding flow 2018-04-02 02:59:49 -07:00
kumavis
9f7b63bb6a
identicon - set blockies height and width to identicon diameter 2018-03-30 21:45:49 -07:00
kumavis
ee1acf0a7e
Merge pull request #3774 from danjm/i3686-txparamundefined-sigrequestsintxlist
Fix display of unapprovedMgs in txList; fix txParams undefined errors
2018-03-30 18:36:39 -07:00
kumavis
2e57c36f36
Merge pull request #3762 from danjm/i3471-checkbalanceonconfirmscreen
Checking for sufficient balance in tx confirmation screen
2018-03-30 18:36:08 -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
Alexander Tseung
bdc4a6964a Fix merge conflicts. Refactor renderPrimary into Home component 2018-03-30 15:07:00 -07:00
kumavis
7dde948c45 Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-screens 2018-03-30 13:57:50 -07:00
kumavis
5f1f345a5d network - use providerType for localhost 2018-03-30 10:59:39 -07:00
Dan
2be6f8bae0 Fix lint and tests 2018-03-30 02:19:04 -02:30
Dan
717623e2e3 Merge branch 'master' into i3686-txparamundefined-sigrequestsintxlist 2018-03-30 00:00:31 -02:30
Dan
893f82491d Merge branch 'master' into i3471-checkbalanceonconfirmscreen 2018-03-29 23:58:45 -02:30
kumavis
b49ad750dd Merge branch 'master' of github.com:MetaMask/metamask-extension into ci-artifacts 2018-03-29 16:54:00 -07:00
Dan
ad603da2e7 Stopping wrapping provider children in div; stop wrapping old-ui in provider. 2018-03-29 20:16: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
Dan
01e3293b65 Ensure correct address used when rendering transfer transactions. 2018-03-29 10:32:30 -02:30
kumavis
085e7d7dec ui - fix typo in settings 2018-03-28 23:19:07 -07:00
kumavis
ac4cb3444d ui - add guard against unset locale 2018-03-28 23:11:41 -07:00
kumavis
f9b680b09f ui - identicon - use relative link for ether logo 2018-03-28 22:39:45 -07:00
kumavis
10609493c5 ui - use relative location for images 2018-03-28 22:30:35 -07:00
kumavis
cf82e766d4 ui - fix relative url for deposit-ether-modal 2018-03-28 22:21:49 -07:00
kumavis
f7b4c9621f ui - css - use relative path for fonts 2018-03-28 14:42:58 -07:00
Alexander Tseung
58f52b2b8d Fix merge conflicts. Refactor onboarding flow. 2018-03-28 13:23:50 -07:00
Dan
d6ebf5d94e Confirm send token detects if balance is sufficient for gas. 2018-03-28 12:30:03 -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
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
kumavis
00952c899b
Merge pull request #3745 from danjm/i3723-fix-long-token-ammounts
Long token amounts in wallet are truncated with ellipsis.
2018-03-27 19:08:41 -07:00
kumavis
cdf5183f87
Merge pull request #3742 from danjm/i3705-prefix-to-address-with-0x
Prefixes to addresses with 0x before sending.
2018-03-27 19:08:22 -07:00
kumavis
c84f0ac7bc
Merge pull request #3741 from MetaMask/i3692-addtoken-address-undefined
Prevent users from adding custom token if decimals is an empty string.
2018-03-27 19:07:23 -07:00
kumavis
ff26042b0c ui - actions - fix log for background call 2018-03-27 18:21:46 -07:00
kumavis
1a5eccdfc0 ui - settings - fix for currentLocale 2018-03-27 18:21:22 -07:00
kumavis
e3881143cb ui - settings - derrive locales from index 2018-03-27 18:10:13 -07:00
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
Dan
d2bd5687e8 Merge branch 'master' into i18n-translator-redux 2018-03-27 10:17:48 -02:30
Alexander Tseung
6f367a5a6b Fix merge conflicts 2018-03-27 00:20:35 -07:00
Dan
252d692282 Prefixes to addresses with 0x before sending. 2018-03-27 04:41:23 -02:30
Dan
f2ab3a06b1 Long token amounts in wallet are truncated with ellipsis. 2018-03-27 04:40:46 -02:30
Dan
91f91d92fe Prevent users from adding custom token if decimals is an empty string. 2018-03-27 03:11:55 -02:30
Thomas Huang
e001c0900b
Merge pull request #3680 from danjm/i3517-popup-newui-onboarding
Popup uses new ui onboarding when in beta.
2018-03-26 14:55:50 -07:00
Thomas Huang
b0fae2ca39
Merge pull request #3710 from danjm/i3326-addtokenscreendesignupdate
Updates Add token screen to latest design.
2018-03-26 14:55:30 -07:00
Dan
1779cff65b Merge branch 'master' into i3326-addtokenscreendesignupdate 2018-03-26 16:51:02 -02:30
Thomas Huang
a6af5fad96
Merge pull request #3695 from danjm/i3379-signtypedata-overflow
Signed type data notification handles long messages.
2018-03-26 12:11:16 -07:00
Dan
4f0881e41b Merge branch 'master' into i18n-translator-redux 2018-03-26 16:13:49 -02:30
Dan Finlay
fe6f22ee69
Merge pull request #3721 from alextsg/cb-944
Update button styles
2018-03-26 11:29:04 -07:00
Dan
a109a774a5 Use ens-input component in send-v2 to allow sending to ens names. 2018-03-26 11:40:11 -02:30
Alexander Tseung
cfa2592d78 Update button styles 2018-03-25 22:58:04 -07:00
Dan
c710fb8f50 Use new header on add token confirmation screen. 2018-03-25 15:17:10 -02:30
Dan
fa022e0883 Updates Add token screen to latest design. 2018-03-24 01:13:43 -02:30
Dan
08e67c4e4a Default current locale in metamask reducer to empty string. 2018-03-23 14:29:59 -02:30
Dan
11a30378d7 Memoize t function in metamask-connect 2018-03-23 14:21:32 -02:30
Dan
07f4839600 Signed type data notification handles long messages. 2018-03-22 16:49:07 -02:30
Dan
6393c38117 Pop uses new ui onboarding when in beta. 2018-03-22 14:29:18 -02:30
Dan
a0df4b6892 Correct proptypes for t in new-account/create-form.js 2018-03-22 12:36:13 -02:30
Dan
d613dfb434 Correct reprice title and subtitle key names. 2018-03-22 01:19:00 -02:30
Dan
ca5bce477e Fix sender-to-recipient export and non-existent translation key. 2018-03-22 00:54:44 -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
18f8583529 Fix references to undefined 'this.props' 2018-03-21 23:10:28 -02:30
Dan
3c144302d6 Remove console.logs 2018-03-21 22:57:09 -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
e005e9ac51
Merge pull request #3624 from alextsg/cb-941
Update confirm transaction screen
2018-03-20 17:15:59 -07:00
Dan J Miller
a69480d78d Gas inputs can be changed by up and down arrows (#3598)
* Up and down arrows can control gas inputs.

* input-number.js just uses number type.
2018-03-20 15:50:30 -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
kumavis
fd3e240dd9
Merge pull request #3635 from MetaMask/i3571-CompleteI18nTemplates
I3571 complete i18n templates
2018-03-20 12:40:16 -07:00
kumavis
1ab165b6d7
Merge pull request #3632 from MetaMask/retry-tx-refractor
Retry tx refractor
2018-03-20 12:11:50 -07:00
Thomas
dd19a93447 Add i18n to tx status 2018-03-20 12:06:59 -07:00
Alexander Tseung
3c1248c816 Update confirm transaction screen 2018-03-20 11:56:12 -07:00
Thomas
d4eb883958 Merge branch 'master' into i3571-CompleteI18nTemplates 2018-03-20 11:35:59 -07:00
Dan
3830f49ac5 Take user home if an unapproved tx is dropped while they are viewing. 2018-03-20 15:52:45 -02:30
Thomas
4fc68ca208 Add i18n in settings/info 2018-03-20 10:56:35 -07:00
kumavis
5d316d9a4e
Merge pull request #3623 from MetaMask/i#3554
new-ui - dont exclude `txParams.data` when editing and updating txParams
2018-03-20 10:44:48 -07:00
Thomas
7a8e080245 Started on Tx list i18n 2018-03-20 10:29:22 -07:00
Thomas
cffaf44714 i18n Import flow 2018-03-20 09:49:12 -07:00
Dan
49e3ada382 Fix styling regression from master merge. 2018-03-20 13:28:59 -02:30
Dan
36b371283c Improve responsiveness of gas price row on confirm screen. 2018-03-20 12:41:03 -02:30
Dan
d9160ac6da Merge branch 'master' into retry-tx-refractor 2018-03-20 09:27:27 -02:30
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
Alexander Tseung
4af1003b0e Fix Account Names being cropped (#3626) 2018-03-20 09:02:20 -02:30
Thomas
85a612b34d I18n add-token.js 2018-03-20 02:34:12 -07:00
Dan J Miller
5cdaf270f7
Don't block user from setting gas if estimating gas returns errors. (#3627) 2018-03-20 06:47:45 -02:30
frankiebee
faa4ffe163 new-ui - dont exclude txParams.data when editing and updating txParams 2018-03-19 14:32:58 -07:00
Dan Finlay
f5b0d56b9d Add send screen template 2018-03-19 12:38:14 -07:00
Dan
2ddc2cc1fb Lint fixes. 2018-03-19 16:53:06 -02:30
Dan
4d1793b0ec Merge branch 'master' into i18n-translator-redux 2018-03-19 16:40:48 -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 Finlay
293ca6c9a6 Add template for settings and info 2018-03-19 12:03:35 -07:00
Dan Finlay
2e7d4db2de Add recover and backup tempaltes 2018-03-19 11:43:22 -07:00
Dan Finlay
17371bb7ec Add login templates 2018-03-19 11:30:45 -07:00
Dan Finlay
e504bc6215 Add connecting indication templates 2018-03-19 11:28:02 -07:00
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
Thomas Huang
424e98f6a8
Merge pull request #3594 from danjm/i3344-improve-currency-input
Currency input defaults to empty string
2018-03-19 09:20:04 -07:00
Dan
98f934fb53 Delete commented out code from i18n implementation that used globals. 2018-03-19 13:38:22 -02:30
anticlimactic
a1db40047c Remove unused files from ui folder. (#3577)
* Removed unused UI files. Fixes #3434.

* Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
2018-03-19 12:41:24 -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
a348b60735 Currency input defaults to empty string 2018-03-16 15:38:29 -02:30
Alexander Tseung
7fb27cf0c7
Update margins for consistency in first time flow (#3588) 2018-03-16 08:50:21 -07:00
Dan
5fe0be722b Handle i18n with redux. 2018-03-15 21:59:45 -02:30
frankiebee
e51ba2e75c Merge branch 'retry-tx-refractor' of https://github.com/MetaMask/metamask-extension into retry-tx-refractor 2018-03-15 10:41:55 -07:00
frankiebee
4c947d466c Merge branch 'master' into retry-tx-refractor 2018-03-15 09:47:25 -07:00
Alexander Tseung
66193c823c Update Deposit Eth icon (#3569) 2018-03-15 13:50:22 -02:30
frankiebee
cd721f52cb Merge branch 'master' into retry-tx-refractor 2018-03-15 08:07:16 -07:00
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
eb5a84975b ui - settings - add option to set current locale 2018-03-14 17:11:41 -07:00
kumavis
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -07:00
Thomas Huang
e2efc91aee
Merge pull request #3558 from MetaMask/fix-two-translations
Fix translations whose substitutions params were not in arrays.
2018-03-14 13:00:42 -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 Finlay
fae6a44bac
Grammar correction 2018-03-14 09:34:25 -07:00
Dan
edd5c38492 Fix translations whose substitutions params were not in arrays. 2018-03-14 12:34:13 -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
0d33aed20e Fix tx-list-item submitted check. 2018-03-13 23:29:47 -02:30
Dan
c52253bb0e Use correct name for submittedTime field in tx-list.js 2018-03-13 21:57:23 -02:30
Dan
46ded45b81 Use correct var name in new-ui showRetryButton 2018-03-13 21:38:08 -02:30
Dan
8c7988978f Undefined check in showRetryButton 2018-03-13 21:32:22 -02:30
Dan
e293b6349c Styling for dropped. 2018-03-13 21:15:35 -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
kumavis
a52ef7a06a ui - lint fix 2018-03-13 14:41:54 -07:00
kumavis
34fe88af8f
Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters
improved verification of restore from seed phrase
2018-03-13 14:39:59 -07:00
Thomas
b1871bf32d Add closing parens to appName 2018-03-13 11:04:41 -07:00
Thomas Huang
1d2cb46eff
Merge branch 'master' into i18n 2018-03-13 11:00:52 -07:00
kumavis
572234e383
Merge branch 'master' into i3033-responsive-newui-onboarding 2018-03-13 10:46:14 -07:00
kumavis
1fa5cec2ec
Merge pull request #3470 from danjm/newui-onboarding-fonts
Change fonts in new-ui onboarding to Roboto, with weight 400.
2018-03-13 10:44:08 -07:00
kumavis
c1387cdc54
Merge pull request #3495 from alextsg/cb-290
Increase tap areas for menu buttons on mobile
2018-03-13 10:42:59 -07:00
Thomas
b45ea44aa5 Add missing opening parens to pag-container__subtitle 2018-03-13 10:28:33 -07:00
Thomas Huang
829b0a8926
Merge branch 'master' into i18n 2018-03-13 10:21:03 -07:00
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
Dan
70f33d4747 Left align create password. 2018-03-12 20:17:44 -02:30
Alexander Tseung
08542c18e1
Update deposit ether styling (#3510) 2018-03-12 19:25:12 +01:00
Dan
0dad6db973 Styling fixes to welcome; hide network component on create password; shown welcoem in popup. 2018-03-12 14:33:45 -02:30
Thomas
208b3bc4c1 Add i18n back into JsonImportSubview 2018-03-12 08:07:12 -07:00
Thomas Huang
b7c7083a11
Merge branch 'master' into i18n 2018-03-12 10:50:55 -04:00
Alexander Tseung
a07550d2ab Increase tap areas for menu buttons on mobile 2018-03-09 18:50:00 +01:00
Alexander Tseung
ab1b39f554
Remove de-selected token from selectedTokens hash instead of setting to null (#3494) 2018-03-09 16:31:53 +01:00
Alexander Tseung
d84341f323
Add empty object default value for tokenData (#3493) 2018-03-09 16:31:17 +01:00
Alexander Tseung
4b2e52795d
Explicitly define state in import account from json component (#3491) 2018-03-09 16:30:31 +01:00
Dan
c1ff927fa0 Lint fixes. 2018-03-09 10:00:37 -03:30
Dan
81e72147ef Merge branch 'master' into retry-tx-refractor 2018-03-09 02:07:27 -03:30
Dan
2d6b378bf8 Adds inline opening of gas customization to confirm-send-ether screen. 2018-03-09 02:03:36 -03: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
6cee76b3e7 Add html and css for responsive retry button. 2018-03-08 16:12:25 -03:30
Dan
91c890041c Add welcome screen to new-ui browser first time flow. 2018-03-08 14:21:54 -03:30
Alexander Tseung
cbb65cc493
Fix flashing to Log in screen after logging in or restoring from seed phrase (#3466) 2018-03-08 16:29:29 +01:00
Dan
09dae760bc Correct caps of Send button on main screen. 2018-03-07 22:47:29 -03:30
Dan
6c400c2e92 Update first time flow button fonts, and first-time-flow default font, to Roboto. 2018-03-07 22:37:53 -03:30
Dan Finlay
f4e5dd37b1
Merge pull request #3409 from scsaba/seed-phrase-verification
Add seed phrase verification script into background process
2018-03-07 16:47:13 -08:00
Dan J Miller
ca047b1ea0
Update network colours for better accessibility. (#3469) 2018-03-07 15:22:10 -03:30
Dan
b8dec68271 Make new-ui create password screen responsive. 2018-03-07 12:47:33 -03:30
Dan Finlay
abe8bc19a8
Merge branch 'master' into i18n 2018-03-06 20:13:53 -08:00
Dan
2420ad2477 Correct merge conflict resolution errors. 2018-03-06 22:26:13 -03:30
kumavis
6a9ca29244
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 17:13:57 -08:00
kumavis
8e0131cbb5
Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording
Replace Lock wording with Log Out / Log In
2018-03-06 17:12:32 -08:00
Dan
9d215bab0f Merge branch 'master' into i18n 2018-03-06 20:45:45 -03:30
Dan Finlay
f06bca1151 Implemented feedback to make i18n work on mac 2018-03-06 15:32:35 -08:00
Dan Finlay
9762a73041
Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined
Shapeshift form handles 'market info unavailable' errors.
2018-03-06 15:07:51 -08:00
Dan Finlay
52b4876cf9
Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit
Gracefully handle null token balance in new ui send.
2018-03-06 15:05:43 -08:00
Dan Finlay
31e7d9263f
Merge pull request #3444 from danjm/i3348-minus-not-a-number
Prevent user from selecting max amount until gas is estimated.
2018-03-06 15:05:25 -08:00
Dan Finlay
cb4ad60800 Merge branch 'master' into i2475-UnifyLogInWording 2018-03-06 14:57:01 -08:00
Dan Finlay
b87687110d Replace Lock wording with Log Out / Log In
Fixes #2475
2018-03-06 14:51:26 -08:00
Dan J Miller
5ac330a89e
Default add-token decimal value to string (#3451) 2018-03-06 15:15:26 -03:30
Dan Finlay
a4bd7992cd
Merge branch 'master' into ImportAccountMessageV2 2018-03-06 10:32:47 -08:00
Dan
376ffb758f Shapeshift form handles market info unavailable errors. 2018-03-06 13:49:41 -03:30
Alexander Tseung
5f8a632fec
Fix seed phrase validation clearing form (#3417)
* Fix seed phrase validation clearing form

* Make new ui import seed error feedback live, and allow newlines with and without carriage returns.
2018-03-06 09:14:57 -08:00
Dan
462d57cb6a Gracefully handle null token balance in new ui send. 2018-03-06 00:23:29 -03:30
criw
b393b54e35 FIX #3440 improved verification of restore from seed phrase 2018-03-06 04:43:12 +01:00
Dan
68604b53dd Prevent user from selecting max amount until there is an estimated gas total. 2018-03-05 23:12:06 -03:30
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. (#3416) 2018-03-05 13:33:46 -03:30
Csaba Solya
2b86d65d0c verify seedwords on log in 2018-03-03 22:08:10 +01:00
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -08:00
Thomas
ee254b4f6f Import Account disclaimer 2018-03-02 18:24:09 -08:00
Thomas
6f8077f587 Swap color scheme for import account label 2018-03-02 18:23:27 -08:00
Dan J Miller
0d97ff2210
Fix NewUI reveal seed flow. (#3410) 2018-03-02 22:44:05 -03:30
Dan J Miller
0c163dcb32
Allow adding 0 balance tokens in old ui and editing custom token info in new (#3395)
* Shows tokens with 0 balance in old ui; goHome after adding tokens.

* Allow users to edit custom token info when not autofilled. (New UI add token screen).
2018-03-02 19:07:25 -03:30
Alexander Tseung
f22dfd4ae8 Fix network menu for custom URLs (#3366) 2018-03-01 17:42:10 -03:30
Alexander Tseung
ace4f0d998 Fix exception thrown when styleOverride is not present (#3364) 2018-03-01 17:41:35 -03:30
Kevin Serrano
923c702164
Merge pull request #3356 from MetaMask/cdn-minimization
Check in all font files locally.
2018-03-01 12:30:03 -08:00
Dan
94a60fe4a9 Correct ttf format name to 'truetype' 2018-03-01 16:36:27 -03:30
kumavis
46d94a241c
Merge pull request #3359 from MetaMask/token-check-url
[new-ui] add token - check for logo url before trying to use
2018-02-28 14:55:42 -08:00
kumavis
40537f9290 add token - check for logo url before trying to use 2018-02-28 14:04:32 -08:00
Kevin Serrano
d45116824c
Check in all font files locally. 2018-02-28 13:03:46 -08:00
kumavis
6c472b73eb
Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvements
[NewUI] Onboarding flow style improvements
2018-02-28 12:40:14 -08:00
kumavis
28c6347cdd
Merge pull request #3340 from danjm/i3338-contract-published-terminology
[NewUI] Replace 'Contract Published' label with 'Contract Deployment'
2018-02-28 11:16:55 -08:00
Dan
78f6a48664 Define event locally in onClickOutside method in account-dropdowns.js 2018-02-28 13:18:37 -03:30
Dan
2b9af0734b Replace 'Contract Published' with 'Contract Deployment' for clearer indication of contract tx state. 2018-02-27 20:09:02 -03:30
Thomas
7aa324bdf6 Remove committed out merge code 2018-02-27 12:06:24 -08:00
Thomas
ac2e92fa54 Change Loose label to Imported 2018-02-27 12:02:48 -08:00
Thomas
50f20358c1 Add import account disclaimer 2018-02-27 12:01:09 -08:00
Dan
0739d3507b Adds beta label to Metamask name in full screen app bar. 2018-02-27 14:13:05 -03:30
Dan
def369ba07 Move beta warning to app header. 2018-02-27 14:13:05 -03:30
Dan
746c3e5f18 Body width container in first time flow is consistent with app bar. 2018-02-27 14:12:45 -03:30
Thomas Huang
84c023ba40 Use same logic for downloading state logs in the old/uat 2018-02-20 19:52:32 -08:00
Dan
66f55f954e Render loading inside notice screen, and don't set isLoading from unMarkPasswordForgotten. 2018-02-20 20:52:41 -03:30
Dan Finlay
a1b72e5252 Try fixing notice screen synchronous state call 2018-02-20 13:51:06 -08:00
Dan
c26e0d555b Fix Import Existing DEN in popup New UI first time flow. 2018-02-19 22:46:18 -03:30
Dan J Miller
81eb5c8796
Ensures that mascara initialize screen is not shown in popup. (#3279) 2018-02-16 19:21:16 -03:30
kumavis
4e8d9fef84
Merge pull request #3200 from alextsg/cb-703
[NewUI] Remove accessing PropTypes from main React package
2018-02-16 16:11:36 +00:00
Dan J Miller
170c7602b7
[NewUI] Adds the mascara first time flow to betaUI extension (#3257)
* Adds the mascara first time flow to the extension when opened in browser.

* Fix tests after addition of mascara first time flow to new ui.
2018-02-16 06:15:09 -03:30
Dan J Miller
eb61f69f92
Merge pull request #3231 from danjm/MM-744-restore-from-seed-fix
[NewUI] Only open a new window on restore from seed if in extension view.
2018-02-13 15:32:29 -03:30
Dan
5e9dc74a59 Remove isInBrowser method and use environment-type.js 2018-02-13 15:20:24 -03:30
Dan Finlay
ee1197192f
Merge pull request #3209 from danjm/MM-634-newui-reset-account
[NewUI] Add reset account button to new UI.
2018-02-13 19:50:19 +01:00
Dan
b5b16e4ce0 Only open a new window on restore from seed if in extension view. 2018-02-13 15:19:53 -03:30
Dan Finlay
96d40ee618
Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screens
[NewUI] Try beta link on unlock and privacy screens.
2018-02-13 19:28:49 +01:00
Dan J Miller
35c762da47 Updates the styling of confirm send ether and token screens. (#3235) 2018-02-12 22:51:05 -08:00
Dan J Miller
e4c83466be Send screen style updates. (#3234) 2018-02-12 22:39:15 -08:00
Dan J Miller
fe2ed68f11 Remove chrome focus outline for mouse users. (#3230) 2018-02-12 09:45:53 -08:00
Alexander Tseung
72ffa2c3f5 Fix react-router related exceptions 2018-02-09 12:05:27 -08:00
Alexander Tseung
ef0bbb291d Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 21:46:19 -08:00
Dan
bb79fb354b Try beta link on unlock and privacy screens. 2018-02-08 22:47:32 -03:30
Alexander Tseung
7f70943fa2
Fix exception thrown in selected token tx list with shapeshift txs (#3215) 2018-02-08 17:37:22 -08:00
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
Alexander Tseung
eb919f4710 Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254 2018-02-08 16:43:31 -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
Dan
cd976a2765 Add reset account button to new UI. 2018-02-08 20:23:16 -03:30
Dan J Miller
f39222c9af
Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019
[NewUI] Merge uat to uatnext feb072019
2018-02-08 12:20:04 -03:30
Alexander Tseung
e9c2c0eec1
Make blockies icon round to match identicons (#3205) 2018-02-07 18:46:27 -08:00
Dan
b0db68a281 Merge branch 'uat' into uat-next 2018-02-07 21:19:14 -03:30
Dan J Miller
7f151b861c
[NewUI] Opens to full screen when restoring from seed. (#3201)
* Opens to full screen when restoring from seed.

* Remove redundant parameter in actions.markPasswordForgotten call.
2018-02-07 21:08:55 -03:30
Dan
d8896a8c31 Merge branch 'master' into uat 2018-02-07 16:32:47 -03:30
Alexander Tseung
8b90b1d1b1 Remove accessing PropTypes from main React package 2018-02-06 22:03:37 -08:00
Alexander Tseung
9db0a32dac
Update modal header design on send screen (#3196) 2018-02-06 21:07:00 -08:00
Dan J Miller
9ed3a5512e Fix alignment of ellipsis and address in wallet view. (#3198) 2018-02-06 16:51:32 -08:00
Dan J Miller
d84dc5da42 Remove duplicate token balance on uat next. (#3195) 2018-02-06 10:21:21 -08:00
Alexander Tseung
d452403322
Add functional integration testing to Add Token flow (#3189) 2018-02-05 18:47:46 -08:00
Dan J Miller
d4da419c5b Wallet view supports screen sizes between 576px and 667px (#3193) 2018-02-05 18:31:21 -08:00
Thomas
10e75dc4dd Scrollable Settings screen for Firefox 2018-02-01 14:53:43 -08:00
Alexander Tseung
2fd9e58e61 Fix lint errors 2018-02-01 14:13:08 -08:00
Dan
f38675c9ac Checks if there is currently a send in progress before redirecting to default in conf-tx 2018-01-31 18:26:26 -08:00
Alexander Tseung
4f1fe1da62 Fix merge conflicts from uat-next 2018-01-31 18:24:20 -08:00
Alexander Tseung
0c6fef3dec Add create new account routes, fix conflicts from uat updates 2018-01-31 18:08:49 -08:00
Dan J Miller
78bce55858 [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)
* Use tooltip for display of helper text in wallet views copy to clipboard feature.

* Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change.

* Remove unnecessary tabIndex attribute from wallet view address element.
2018-01-31 16:27:35 -08:00
Frankie
0b4e3c5d6a
Merge pull request #3161 from MetaMask/AddResetExplanation
Add reset explanation
2018-01-31 14:49:29 -08:00
Dan Finlay
86d56419f4 Add explanation of account resetting 2018-01-31 14:31:56 -08:00
Dan Finlay
4f61029177 Remove unused file 2018-01-31 14:20:59 -08:00
Frankie
1a93b1ade2
Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs
Set address to default with empty string, add test validation.
2018-01-31 14:18:47 -08:00
Dan J Miller
971112d413 [NewUI] Updates capitalization and alignment for the import account screen. (#3122)
* Updates capitalization and alignment for the import account screen.

* Align elements in import form.
2018-01-31 13:41:13 -08:00
Dan J Miller
8378445112 [NewUI] Set default new account name as placeholder, but not value (#3121)
* Set default new account name as placehold, and not value, in new account create screen.

* Set new account number in create-form.js in constructor.
2018-01-31 13:40:14 -08:00
Bruno Barbieri
e6fda855a5 added reset account feature 2018-01-31 03:33:15 -05:00
Dan Finlay
11a944719f Add warning when importing no valid file
Fixes #3089
2018-01-30 15:11:05 -08:00
Thomas
c2cef0f815 Set address to default with empty string, add test validation. 2018-01-30 13:26:37 -08:00
Dan J Miller
100642c0ea Fix bug stemming from erroneously persistant unlock failure error message. (#3123) 2018-01-29 18:44:43 -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
abfa74f09a complete i18n across new UI 2018-01-29 15:29:01 -05:00
Nick Doiron
9c133aaab3 get t imported in all files currently using i18n 2018-01-24 19:41:29 -10:00
Nick Doiron
7da52c5997 separate out cross-browser i18n for extensions 2018-01-24 10:10:28 -10:00
Nick Doiron
99898ac775 better organization of locale file; i18n in more view files 2018-01-23 22:14:47 -10:00
Thomas Huang
a9ecf9c6fc
Merge branch 'master' into uat 2018-01-23 10:55:21 -08:00
Nick Doiron
bad70eb1b3 first steps to i18n 2018-01-22 23:48:03 -10:00
Thomas
ce0de5feed String interpolate version in settings 2018-01-22 16:09:23 -08:00
Chi Kei Chan
338ebe5f40
Merge pull request #3049 from chikeichan/newmaster
Merge master to uat
2018-01-19 15:58:26 -08:00
Dan
c554e52e82 Get version from manifest instead of hard coding in New UI info page. 2018-01-19 15:31:11 -08:00
Chi Kei Chan
77c545336b Merge branch 'uat' into newmaster 2018-01-19 15:29:36 -08:00
Alexander Tseung
b05d21b1ba Fix transaction list font sizes, padding 2018-01-18 13:34:57 -08:00
Kevin Serrano
5fff2e19d8
Merge pull request #3024 from alextsg/cb-529
[NewUI] Update popout to fullscreen icon
2018-01-18 12:39:09 -08:00
Dan J Miller
4fae461a67 [NewUI] Send screen gas loading fixes (#3027)
* Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send.

* Fix variable name.
2018-01-17 20:47:01 -08:00
Alexander Tseung
853e7f8420 Fix lint errors 2018-01-17 18:50:18 -08:00
frankiebee
8bb57f33b1 add a x close button to gas calc loding screen on conf-tx 2018-01-17 18:47:56 -08:00
Alexander Tseung
f8bf8cb527 Update popout to fullscreen icon 2018-01-17 17:56:18 -08:00
Dan
fdaf6eacb2 Show now tokens by default and improve search on add token screen. 2018-01-17 13:52:59 -08:00
Alexander Tseung
40e58d3132 Fix tx-list, confirmation screen styling 2018-01-17 13:50:16 -08:00
Chi Kei Chan
ba0762c582
Merge pull request #3005 from alextsg/cb-385
[NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
2018-01-17 13:49:48 -08:00
Chi Kei Chan
b80ed2c451
Merge pull request #3007 from alextsg/uat-master-011618
[NewUI] Merge master into uat branch
2018-01-17 13:48:16 -08:00
Thomas
8c792ba3ee Add network-indicator classname to network loading spinner 2018-01-17 10:51:23 -08:00
Alexander Tseung
81f86cfab6 Merge branch 'uat' into uat-master-011618 2018-01-16 18:17:28 -08:00
Alexander Tseung
65e9d9efc5 Fix rendering QR code in old UI, hide unnecessary back button 2018-01-16 17:41:42 -08:00
Alexander Tseung
ccb80594be Readjust gas fees when switching networks on the send screen 2018-01-16 17:26:34 -08:00
Dan J Miller
668aab11d1 Vertically centers the text of the new ui modal header. (#2987) 2018-01-16 12:15:18 -08:00
Dan J Miller
d7a1019a2c Adding one or more tokens sets the selected token before returning the user to the main screen. (#2995) 2018-01-16 12:14:03 -08:00
Dan Finlay
003b4a721c
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight 2018-01-16 10:15:11 -08:00
Thomas Huang
27ca48b369
Merge pull request #2984 from MetaMask/RenameLockToLogout
Rename lock to log out
2018-01-16 09:48:23 -08:00
Dan
a4fd4f013f Restore display of all unconfirmed transactions. 2018-01-15 18:32:25 -08:00
Alexander Tseung
baebf64afd Fix send screen value input 2018-01-15 18:28:21 -08:00
Alexander Tseung
644adeccf6 Fix Hide Token modal styling, popup positioning 2018-01-15 18:26:16 -08:00
Dan Finlay
0121892141
Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight 2018-01-15 16:15:50 -08:00
Dan Finlay
58be1742e1 Rename lock to log out
Fixes #2475
2018-01-15 16:04:49 -08:00
Frankie
f18ed8bfd4
Merge branch 'master' into open-popup 2018-01-15 15:25:14 -08:00
Dan Finlay
85b2012106
Merge pull request #2964 from alextsg/cb-505c
[NewUI] Move blockies option to the bottom of Settings
2018-01-15 13:55:43 -08:00
Dan J Miller
aa833a0928 [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)
* Place all users of extension into old UI (disable auto adding).

* Fix lint errors.
2018-01-15 13:23:44 -08:00
Alexander Tseung
27cbfa44c3 Move blockies option to the bottom of Settings 2018-01-14 21:39:40 -08:00
frankiebee
d5c311b13e add a loading spinner to conf-tx view 2018-01-14 13:56:54 -08:00
Alexander Tseung
b42baacdf4 Fix confirm Add Token button order 2018-01-12 17:07:10 -08:00
Alexander Tseung
dce6dcf437 Fix Add Token button order, styling 2018-01-12 17:07:10 -08:00
Dan
2bc85ea72f Fix input box padding and select highlight in new account create and import page. 2018-01-12 13:42:51 -08:00
Dan
980e1bfcf8 New add account page with create and import options. 2018-01-12 13:42:51 -08:00
Chi Kei Chan
71a308d98b
Merge branch 'uat' into cb-388 2018-01-12 13:41:03 -08:00
Alexander Tseung
bdcee058dc Fix styling in initialization 2018-01-12 13:39:26 -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
Dan Finlay
429db74508 Use https 2018-01-12 11:03:03 -08:00
Alexander Tseung
0f4bfcb02e Fix token balance color 2018-01-11 17:12:58 -08:00
Alexander Tseung
b35e4e0264 Fix lint errors 2018-01-11 17:06:30 -08:00
Alexander Tseung
b0a6bfdeec Change styling for network dropdown 2018-01-11 16:59:00 -08:00
Alexander Tseung
376e136572 Update styling for buttons, font weights 2018-01-11 16:30:07 -08:00
Alexander Tseung
b8310ac62e Fix logging out of old UI causing infinite spinner (#2914) 2018-01-11 15:49:10 -08:00
Dan J Miller
7c97b2f37c Fix padding of a hovered tx-list-item (#2859) 2018-01-11 09:21:41 -08:00
tmashuang
be604391d0 Add max height for Firefox addon overflow and hide horizontal scroll 2018-01-10 21:56:07 -08:00
tmashuang
60a52b2608 Add one px to address for Firefox clipping 2018-01-10 21:54:43 -08:00
Alexander Tseung
208e94d3bf Update main view styling 2018-01-10 21:09:09 -08:00
Dan Finlay
e5b34b3d04
Update support links for helpscout 2018-01-09 14:09:29 -08:00
kumavis
096fb226a6
Merge pull request #2855 from abitrolly/patch-2
info.js  Remove width element to fix email layout
2018-01-09 07:25:24 -08:00
Kevin Serrano
0cf5c22178
Merge pull request #2851 from MetaMask/i2812-seedworderrorfix
Fix condition where failing seed word checks would infinite-spin future attempts.
2018-01-08 11:43:43 -08:00
kumavis
ade1c404bd ui - fix font path name 2018-01-08 09:44:11 -08:00
Anatoli Babenia
5312ed9a20
info.js Remove width element to fix email layout 2018-01-04 17:10:40 +03:00
Kevin Serrano
20aa135ad8
Add fix for infinite spinner for incorrect seed phrase. 2018-01-03 16:06:46 -08:00
Alexander Tseung
be398500de
Merge pull request #2848 from MetaMask/NewUI-flat
[NewUI] Merge NewUI-flat into uat
2018-01-03 13:24:17 -08:00
Alexander Tseung
a6f062a686 Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c 2018-01-03 11:06:08 -08:00
oosthuizenr
1da385f78b
fix comment 2018-01-02 21:29:26 +02:00
Renier Oosthuizen
4a598fc7ac Fixes #2834 2018-01-02 21:07:48 +02:00
Kevin Serrano
e682fb05fc
Add frontend validation to ensure that ether inputs are valid. 2017-12-27 18:22:10 -08:00
Kevin Serrano
92eb16fc11
Add frontend validation to check if send ether input is a valid number. 2017-12-27 17:36:56 -08:00
Kevin Serrano
3e562f1a1e
Add backend fix for util in normalizeethstringtowei. 2017-12-27 17:31:38 -08:00
Alexander Tseung
409d1d30e9
Merge pull request #2799 from MetaMask/NewUI-flat
Update UAT to version 4.0.5
2017-12-22 11:40:20 -08:00
Alexander Tseung
a218008adf
Track usage of old and new UI (#2794)
[NewUI] Track usage of old and new UI
2017-12-22 10:43:02 -08:00
Dan J Miller
4acd48966e [NewUI] Fixes tests and sends user to NewUI after registering. (#2788)
* Fixes tests and sends user to NewUI after registering.

* Karma config?

* Empty commit

* Remove unneeded json state mock file.
2017-12-21 19:03:01 -08:00
Chi Kei Chan
9959aea598
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 2017-12-20 17:38:28 -08:00
Dan
e7e1b7a951 Clone transaction while editing instead of mutating object from state. 2017-12-20 17:37:18 -08:00
Dan
9ced63584b Add constanst for token transfer function signature. 2017-12-20 17:37:18 -08:00
Dan
5fe3c5aae6 Lint fixes. 2017-12-20 17:37:18 -08:00
Dan
bf4043c59b Adds updateTransaction to background and used it to update after editing in send-v2. 2017-12-20 17:37:18 -08:00
Dan
1f1fc2c49e Canceled, edited transactions show edited amount. 2017-12-20 17:37:18 -08:00
Dan
7915e62d65 Merge branch 'master' into NewUI-flat 2017-12-20 19:16:12 -03:30
Dan J Miller
bccbf14b39 [NewUI] Hide UI toggle in mascara (#2772)
* Hides old-UI on mascara.

* Improve code clarity in select-app.js
2017-12-20 10:22:50 -08:00
Dan
109e4e5d96 Hide fiat values on account details screen when eth/token value is 0. 2017-12-20 10:21:36 -08:00
Dan
0feb5b210b Hides the sidebar after the an account menu actions changes the screen behind the sidebar. 2017-12-20 10:17:29 -08:00
Alexander Tseung
5d1187c37b Add route for signature request 2017-12-14 14:11:23 -08:00
Alexander Tseung
706a6b0ad6 Add initialized checks for first time flow routes 2017-12-14 14:11:23 -08:00
Alexander Tseung
d9ea2df6c2 Add route for Mascara confirm seed 2017-12-14 14:11:23 -08:00
Alexander Tseung
ec5e0a711c Fix lint errors 2017-12-14 14:11:23 -08:00
Alexander Tseung
dde39e82b5 Add routes for mascara 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
Thomas Huang
453bfd34e3
Merge pull request #2706 from danjm/MM-fix-buy-cancel-button
Fixes the cancel button in the buy screen to take the user home.
2017-12-14 15:06:53 -05:00
Dan J Miller
339eb7d1a6 Fix edit to field bug. (#2738) 2017-12-12 22:24:41 -08:00
Dan
4e0485938a Fix height of login screen 2017-12-12 12:31:52 -08:00
Chi Kei Chan
515437a4c9 Fix isMascara and update yarn.lock 2017-12-12 12:22:22 -08:00
Dan
57c91435a7 Substitute isMascara check for explicit check if user is on mobile browser. 2017-12-12 12:14:40 -08:00
Dan
4b654669e6 Hide open in browser button on mobile (but still show on extension); adds a function to detect if viewing with mobile browser. 2017-12-12 12:14:40 -08:00
Dan
05c6789030 Adds button for opening app in main browser window in extension. 2017-12-12 12:14:40 -08:00
Dan Finlay
d110c916a4 Show watched tokens with no balance 2017-12-12 09:47:51 -08:00
Dan
bfec077d79 Fixes the cancel button in the buy screen to take the user home. 2017-12-08 16:18:50 -03:30
Chi Kei Chan
41d281a527
Merge branch 'NewUI-flat' into cb-372 2017-12-07 09:54:37 -08:00
Chi Kei Chan
845aec82b9
Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI 2017-12-07 09:46:28 -08:00
Kevin Serrano
6553ba132d
Merge pull request #2654 from abitrolly/patch-2
Download State Logs with .json extension
2017-12-07 07:41:12 -08:00
Dan Finlay
c82fd990aa Add 10% price bump to retry attempts.
Turns out geth requires at least a 10% price bump to replace txs:
9619a61024/core/tx_pool.go (L133)
2017-12-07 04:02:11 -05:00
Dan
2e9137dddd Update max amount behaviour to meet new specs. 2017-12-06 21:15:39 -08:00
Dan
ec6c3c33bd Merge branch 'master' into NewUI-flat-merge-with-master 2017-12-06 21:11:52 -08:00
Alexander Tseung
b9f2f8c2a7 Show retry button on submitted transactions greater than 30 seconds, add hover styling 2017-12-07 00:01:11 -05:00
Dan Finlay
73da8a5a4f Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into RetryTransaction 2017-12-06 23:43:11 -05:00
Dan Finlay
0e25129028 Enforce retry tx at minimum gas of previous tx 2017-12-06 23:42:47 -05:00
Alexander Tseung
6b3909547f Fix styling of Retry buton 2017-12-06 23:27:43 -05:00
Dan Finlay
31564e0a86 Fix retry action 2017-12-06 23:20:15 -05:00
Dan Finlay
81fb9db1bc View tx after editing state to unconfirmed 2017-12-06 23:09:32 -05:00
Dan Finlay
97abbc5cbe Fix action 2017-12-06 22:55:47 -05:00
Alexander Tseung
02736d2d36 Connect to redux for retryTransaction 2017-12-06 22:48:26 -05:00
Alexander Tseung
500fbe450a Add button to retry transaction 2017-12-06 22:35:18 -05:00
Dan Finlay
6ff580584a Add retry background method and action 2017-12-06 22:20:58 -05:00
Dan
bd5ce9461e User is automatically added to new UI if they meet conditions at time of login. 2017-12-06 20:49:45 -03:30
Dan
9db00fa507 Show user notifications after switch between UIs 2017-12-04 23:36:54 -03:30
Dan
730d7f84ca Update newUI UI for switching back to old UI. 2017-12-04 23:08:51 -03:30
Dan
84321b2d9b Lint fix 2017-12-04 23:08:23 -03:30
Dan
ce14ee2ffc New-ui actions accomodates old-ui. 2017-12-04 23:08:23 -03:30
Dan
7f79524070 Add UI selection 2017-12-04 23:08:23 -03:30
Anatoli Babenia
a171b9b847
Download State Logs with .json extension
That doesn't fix #2095, but at least makes downloaded files
syntax-highlighted when opened in editors
2017-12-05 00:46:19 +03:00
Alexander Tseung
7dba114feb Update font weights to 300, remove animation from network dropdown, fix network dropdown not closing from certain click-areas 2017-12-01 14:19:53 -08:00
Thomas Huang
f131468353
Remove useBlockie in props for render
Removed unused useBlock for Lint validation.
2017-11-28 13:37:45 -06:00
Jason Clark
a34362b776 Fixes changes requested in pullrequestreview-79088534 2017-11-27 08:11:48 -07:00
Jason Clark
75ef848196 making eslint happy 2017-11-25 15:47:34 -07:00
Jason Clark
bd48d858f4 fixing blockies display issues 2017-11-25 15:11:29 -07:00
Jason Clark
1b89ceb63a swapped out ethereum-blockies lib for MEW blockies library, tightened up identicon.js code 2017-11-25 14:33:42 -07:00
Jason Clark
41be4714c2 tweaking styling 2017-11-24 14:18:46 -07:00
Jason Clark
dc7bd3c628 incremental commit of working blockie component 2017-11-24 13:48:56 -07:00
Jason Clark
fc46a16a32 toggle wired up to preferences property store 2017-11-24 10:35:17 -07:00
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07:00
Dan Finlay
597af980dd Prevent multiple submissions of first time form 2017-11-20 14:03:47 -08:00
Dan Finlay
28409294c3 Remove unneeded type casting 2017-11-21 03:42:46 +08:00
Dan Finlay
c6713e93ad Fix bug where gas param was not a string
Prevented sending transactions.

Fixes #2598
2017-11-21 03:42:46 +08:00
Chi Kei Chan
b944a63ff8
Merge pull request #2591 from MetaMask/NewUI-flat
Release 4.0.4
2017-11-15 13:33:47 -08:00
Chi Kei Chan
e61ba93194 Merge branch 'master' into merge-master 2017-11-15 12:03:13 -08:00
Dan
960cc8abcb Gas customzier does not consider amount when sending tokens. 2017-11-15 15:29:57 -03:30
Dan
bbdb35c35a Use currency input component in input number, to improve input behaviour in gas estimator 2017-11-15 15:00:35 -03:30
Alexander Tseung
59e46e7cb2 Show tokens with zero balance 2017-11-14 16:19:24 -08:00
Dan
9e3f921ba9 Create single action for updating all of send in redux state. 2017-11-14 16:18:00 -08:00
Dan
4671f28476 Allow editing of token transactions. 2017-11-14 16:18:00 -08:00
Dan
0a91671ff6 Fix lint errors. 2017-11-14 16:18:00 -08:00
Dan
34ca7290c5 Allow editing of send ether. 2017-11-14 16:18:00 -08:00
Dan
7eb083bd9f Improve variable name. 2017-11-13 09:52:40 -08:00
Dan
544166437a Deposit button shows link to faucet on testnet networks. 2017-11-13 09:52:40 -08:00
Dan
08d9ecc045 Cursor pointer and hover background on from and to dropdown items. 2017-11-10 14:14:07 -08:00
Dan
a33ced3994 Focus amount input when click anywhere in amount field container 2017-11-10 14:13:29 -08:00
Dan
5a0126f17b Rounding of vals < 0.01 in currency display consistent with master. 2017-11-10 14:12:26 -08:00
Thomas Huang
5120cfdff3 Linting 2017-11-10 14:07:27 -08:00
Dan
62f2aebe1d Network loading does not block network loading. 2017-11-09 11:18:47 -08:00
cjeria
424c1f23c9 darker backdrop style for modal 2017-11-09 11:18:08 -08:00
Dan
d1977225a4 Calculate max amount for send ether based on minimum gas total. 2017-11-07 21:55:12 -03:30
Dan
c156c85eaa Fix amount max for sending token. 2017-11-07 21:47:14 -03:30
Dan
c57d504794 Add currency-input component to correct send amount behaviour and move currency display value state to parent component. 2017-11-07 20:06:26 -03:30
frankiebee
08867874cc Merge remote-tracking branch 'origin/uat' into mascara-first-screen 2017-11-07 12:29:47 -05:00
Dan
8c6e1232e4 Lint fixes. 2017-11-06 16:14:46 -03:30
Dan
e5391cf9fd Allow sending 0 eth or tokens 2017-11-06 16:07:03 -03:30
Dan
716bbf67d7 Set gas price allows for WEI precision. 2017-11-06 16:07:02 -03:30
Dan
b16946723f Insufficient balance warning in gas customizer works for send token 2017-11-06 16:03:05 -03:30
Dan
c420249fb9 Adds max amount feature for send token 2017-11-06 16:03:04 -03:30
Dan
319779ab08 Adds max amount feature for send-ether 2017-11-06 16:03:04 -03:30
Dan
67bdfe87e3 Token balance in send state; validating sufficient tokens, validation updates on 'from' switching. 2017-11-06 15:57:57 -03:30
Chi Kei Chan
9f70762434
Merge pull request #2530 from MetaMask/uat
Merge uat into NewUI-flat
2017-11-02 15:20:29 -07:00
Dan
dc0b3255cf Fixes width of from and to dropdowns in extension and on mobile views. 2017-11-02 15:17:34 -07: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
frankiebee
06a931f988 ui - allow optional size for mascot 2017-10-31 14:01:10 -05:00
Daijiro Wachi
6574499165 Use const and fix lint warnings 2017-10-30 20:08:10 +01:00
Daijiro Wachi
0bfa10e501 Remove warning message when show import page
Fixes: https://github.com/MetaMask/metamask-extension/issues/1192
2017-10-30 20:04:44 +01:00
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
5d8b53bcf4 Provide default new account name 2017-10-27 00:24:07 -07:00
Alexander Tseung
4e8d8639cb Fix Settings/Info screen being visible on logout (#2490) 2017-10-26 23:02:56 -07:00
Dan J Miller
3d53716f43 Correct rendering of conversions when conversion rate is a token. (#2498) 2017-10-26 22:55:34 -07:00
Kevin Serrano
3deeb6df0b
Add option to copy directly to clipboard. 2017-10-26 16:40:13 -07:00
Kevin Serrano
1e9c0a9db2
Resolve merge conflicts 2017-10-26 16:22:08 -07:00
Dan
0ed1add110 Clear import error state on logout. 2017-10-26 12:27:09 -07:00
Dan
f9fc6cec3b eth_sign warning color 2017-10-26 12:26:05 -07:00
Dan
220da24f9a Change min gas price to 0.1 GWEI 2017-10-26 12:25:33 -07:00
Alexander Tseung
0d8f21ad58 Fix input border rendering on mobile 2017-10-26 12:23:24 -07:00
Chi Kei Chan
b2e440e4ff Add Token styling fix 2017-10-25 18:49:25 -07:00
Chi Kei Chan
5aecce908f Merge branch 'master' into NewUI-flat 2017-10-25 18:49:02 -07:00
Alexander Tseung
22d9e3a7e6 Allow editing account name in account details modal 2017-10-25 18:44:24 -07:00
Chi Kei Chan
fa95303e1e Sign Typed Request styling fixes 2017-10-25 18:05:52 -07:00
Dan
ddf11011c9 Signature request fixes. 2017-10-25 17:40:48 -07:00
Alexander Tseung
39d4fe311f Fix Import an Account link not working in Create Account modal 2017-10-25 16:04:38 -07:00
Dan Finlay
2489caddd4 Merge pull request #2476 from MetaMask/100MweiMinGasPrice
Reduce minimum gas price to 100 MWEI
2017-10-25 13:53:03 -07:00
Dan
78836b0ead Signature Request 2017-10-25 12:40:16 -07:00
Dan
0d39a3a8d4 Fix send token bug. 2017-10-25 12:21:35 -07:00
Dan
f89b766534 Adds revert feature to customize gas modal. 2017-10-25 12:19:29 -07:00
Alexander Tseung
3d8182f5d5 Add Info section 2017-10-25 12:16:47 -07:00
Kevin Serrano
4903f3e71a
Add labels to clarify warning. 2017-10-25 11:52:16 -07:00
Kevin Serrano
e7a22fc62b
Account for non-submitted mins and max 2017-10-25 11:47:40 -07:00
Kevin Serrano
b3b9e16ec0
Add clarifying comment about wei conversion. 2017-10-25 11:40:07 -07:00
Kevin Serrano
7f093f67a7
Cut out intermediary wei steps. 2017-10-25 11:38:32 -07:00
Kevin Serrano
dee172fb3a
Remove unneeded toString conversions. 2017-10-25 11:36:12 -07:00
Kevin Serrano
e1b9734cbf
Move upsize conversions for input warning at front of fn. 2017-10-25 11:35:18 -07:00
Kevin Serrano
cb7d07ebae
Fix mismatched decimal/hex conversion in pending-tx 2017-10-25 11:32:38 -07:00
Dan Finlay
c0e0522c30 Remove css build bundle from uat 2017-10-25 10:39:03 -07:00
Chi Kei Chan
2b72b70647 Add GWEI to gas price unit 2017-10-25 01:17:17 -07:00
Chi Kei Chan
ff7e7db9ec From and To field cannot be the same 2017-10-25 01:12:53 -07:00
Chi Kei Chan
0d522139ba Fix gas input styling on mobile view 2017-10-25 01:08:14 -07:00
Chi Kei Chan
e263ae9421 Update Import Account Help Link 2017-10-25 00:38:20 -07:00
Chi Kei Chan
8d3a317b91 Show home page when metafox is clicked 2017-10-25 00:34:12 -07:00
Chi Kei Chan
7c10cda8a4 Fix alignment on right arrow of confirm tx screens 2017-10-25 00:24:26 -07:00
Chi Kei Chan
311ca1f3ca Fix styling on notification view 2017-10-25 00:10:09 -07:00
Chi Kei Chan
3e55caeffd Add ellipsis to super long account name 2017-10-24 23:47:43 -07:00
Chi Kei Chan
6231431894 Change download to show in Export Private Key Modal 2017-10-24 22:48:20 -07:00
Chi Kei Chan
ebb2d38480 Remove memo input 2017-10-24 22:43:49 -07:00
Chi Kei Chan
630ab79cc3 Styling and UX changes on sidebar 2017-10-24 20:04:29 -07:00
Chi Kei Chan
ad91fcd662 Add token list and buy modal alignment fix 2017-10-24 17:15:10 -07:00
Chi Kei Chan
301c737bbc Merge branch 'master' into NewUI-flat 2017-10-24 16:56:49 -07:00
Chi Kei Chan
3f1ae92bb7 Hide sidebar on add token 2017-10-24 16:55:02 -07:00
Kevin Serrano
1767dceba4 Merge pull request #2422 from watilde/fixes-lint
Fixes lint warnings
2017-10-24 16:53:54 -07:00
Chi Kei Chan
7c20011023 Merge branch 'master' into NewUI-flat 2017-10-24 16:50:25 -07:00
Kevin Serrano
242456ba6a
Resolve merge conflict. 2017-10-24 16:44:25 -07:00
Kevin Serrano
98d8275743
Fix for gas price to be lowered. 2017-10-24 16:43:03 -07:00
Chi Kei Chan
ac3072e037 Merge pull request #2435 from danjm/NewUI-flat-disable-send-next-in-error
[NewUI] Disable Send-v2 next button when form is in error
2017-10-24 16:31:35 -07:00
Dan
ef2b0d8485 Simply logic for rendering matching accounts in to-autocomplete dropdown. 2017-10-24 16:31:04 -07:00
Dan
07c4c92db6 Style dropdown of to-autocomplete. 2017-10-24 16:31:04 -07:00
Dan Finlay
35ca7e83bd Reduce minimum gas price to 100 MWEI
Also now representing gas price in MWEI, because our current bn inputs actually aren't tolerant of minimums less than 1 unit.
2017-10-24 15:10:03 -07:00
tmashuang
099078d13b Add error messages when importing an account 2017-10-24 08:40:07 -07:00
tmashuang
91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -07:00
Daniel Tsui
09445ef692 Merge branch 'NewUI-flat' into NewUI-flat-disable-send-next-in-error 2017-10-24 04:32:19 -07:00
Chi Kei Chan
de3a48ec66 Fix mobile add token button 2017-10-24 01:19:00 -07:00
Chi Kei Chan
6daa834323 Disable network dropdown on conf tx screen 2017-10-24 01:07:51 -07:00
Chi Kei Chan
966e4cfd11 Change clickable area for account detail; change network dot size 2017-10-24 00:54:49 -07:00
Chi Kei Chan
4336794355 Fix styling in private key modal 2017-10-24 00:43:12 -07:00
Chi Kei Chan
ba9cefb24e Add caret to Add Token toggle 2017-10-24 00:38:39 -07:00
Chi Kei Chan
2871beebe6 Add "Add Token" button to side bar 2017-10-24 00:29:20 -07:00
Chi Kei Chan
3891cf1af6 Fix clickable area on logout 2017-10-24 00:16:19 -07:00
Chi Kei Chan
4401800a42 Account menu white check mark 2017-10-24 00:13:49 -07:00
Chi Kei Chan
a63373401b New Sidebar uplift 2017-10-23 23:59:21 -07:00
Chi Kei Chan
6d3f261b2f Change LOOSE label to IMPORTED 2017-10-23 23:11:47 -07:00
Alexander Tseung
8895a225dc Remove Current Provider info from Settings 2017-10-23 23:05:01 -07:00
Dan
e058efd6a8 Use classnames library and disabled attribute on 'Next' button in send-v2 2017-10-23 22:41:30 -07:00
Dan
e737a9565a Improve customize gas modal error handling 2017-10-23 22:41:30 -07:00
Dan
a7069acf2e Disable send-v2 next button if in error 2017-10-23 22:41:30 -07:00
Dan
09d659614e Cleaner implementation of currency-display input. 2017-10-23 22:40:55 -07:00
Alexander Tseung
754d117d18 Fix settings styling on mobile view 2017-10-23 22:40:33 -07:00
Chi Kei Chan
66758b784a Update token menu css 2017-10-23 15:57:14 -07:00
Dan
0a436dcf9a Disable send-v2 next button if in error 2017-10-23 16:47:55 -02:30
Chi Kei Chan
0cbaec16f3 Merge pull request #2433 from danjm/NewUI-flat-precision-improvements
[NewUI] Improves precision of a calculation in send, and in confirm
2017-10-23 11:50:59 -07:00
Chi Kei Chan
9984c9516a Merge pull request #2434 from danjm/NewUI-flat-clear-send-state
[NewUI] Clear send state on cancelling and signing.
2017-10-23 11:49:14 -07:00
Chi Kei Chan
8de0292d66 Merge pull request #2431 from alextsg/nu-2406
[NewUI] Change all "Buy" to "Deposit"
2017-10-23 11:48:49 -07:00
Dan
b96ba55229 Clear send state on cancelling and signing. 2017-10-23 16:03:48 -02:30
Dan
b3dad510b7 Improve precision in send and confirm. 2017-10-23 15:53:28 -02:30
Alexander Tseung
bef1405a50 Change all "Buy" to "Deposit" 2017-10-22 22:59:55 -07:00
Alexander Tseung
2c032e0df4 Update settings screen to new UI 2017-10-22 22:40:03 -07:00
Dan Finlay
926abc12b1 Add support for alternative ENS TLDs
Fixes #2428
2017-10-22 22:12:12 -07:00
Daijiro Wachi
43b1cb9100 Fix lint warnings
Fixed warnings:
```md
app/scripts/controllers/computed-balances.js
+ 35:27  warning  Missing space before function parentheses            space-before-function-paren
+ 41:14  warning  'address' is never reassigned. Use 'const' instead   prefer-const
+ 61:9   warning  'updater' is never reassigned. Use 'const' instead   prefer-const
+ 68:11  warning  'newState' is never reassigned. Use 'const' instead  prefer-const

app/scripts/controllers/network.js
+ 104:29  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/createLoggerMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 15:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createOriginMiddleware.js
+ 4:32  warning  Missing space before function parentheses      space-before-function-paren
+ 9:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/createProviderMiddleware.js
+ 5:34  warning  Missing space before function parentheses      space-before-function-paren
+ 13:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/events-proxy.js
+ 1:50  warning  Missing space before function parentheses      space-before-function-paren
+ 31:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/nodeify.js
+ 2:22  warning  Missing space before function parentheses  space-before-function-paren
+ 2:24  warning  Missing space before opening brace         space-before-blocks
+ 5:18  warning  Missing space before function parentheses  space-before-function-paren
+ 5:20  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/pending-balance-calculator.js
+ 16:19  warning  Missing space before function parentheses  space-before-function-paren

app/scripts/lib/pending-tx-tracker.js
+ 85:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 87:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 88:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 90:11  warning  '||' should be placed at the end of the line  operator-linebreak
+ 91:11  warning  '||' should be placed at the end of the line  operator-linebreak

app/scripts/lib/port-stream.js
+ 3:22  warning  Missing space before function parentheses  space-before-function-paren
+ 3:24  warning  Missing space before opening brace         space-before-blocks

app/scripts/lib/tx-gas-utils.js
+ 84:2  warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-history-helper.js
+ 12:37  warning  Missing space before function parentheses      space-before-function-paren
+ 23:30  warning  Missing space before function parentheses      space-before-function-paren
+ 30:23  warning  Missing space before function parentheses      space-before-function-paren
+ 35:28  warning  Missing space before function parentheses      space-before-function-paren
+ 41:2   warning  Newline required at end of file but not found  eol-last

app/scripts/lib/tx-state-manager.js
+ 94:13  warning  'value' is never reassigned. Use 'const' instead  prefer-const

ui/app/reducers.js
+ 45:7  warning  'state' is never reassigned. Use 'const' instead        prefer-const
+ 53:7  warning  'stateString' is never reassigned. Use 'const' instead  prefer-const

ui/lib/tx-helper.js
+ 27:2  warning  Newline required at end of file but not found  eol-last

ui/app/components/account-dropdowns.js
+ 163:1  warning  More than 2 blank lines not allowed  no-multiple-empty-lines

ui/app/components/menu-droppo.js
+ 22:7  warning  'style' is never reassigned. Use 'const' instead  prefer-const

ui/app/components/shapeshift-form.js
+ 135:11  warning  '&&' should be placed at the end of the line  operator-linebreak

ui/app/components/typed-message-renderer.js
+ 35:25  warning  Missing space before function parentheses      space-before-function-paren
+ 42:2   warning  Newline required at end of file but not found  eol-last

mascara/server/index.js
+ 11:42  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 12:36  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 13:33  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 14:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 20:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 21:29  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
+ 26:40  warning  Use path.join() or path.resolve() instead of + to create paths  no-path-concat
```
2017-10-21 21:06:39 +02:00
Chi Kei Chan
f503120b82 Add Import With Seed Phrase 2017-10-20 22:31:59 -07:00
Chi Kei Chan
ac50db52a9 Fix linter 2017-10-20 21:51:37 -07:00
Chi Kei Chan
5cbbb476b3 ShapeShift Integration 2017-10-20 21:51:37 -07:00
Chi Kei Chan
c6a3d00d80 Fix merge conflict; separate onboarding buy screen 2017-10-20 21:51:37 -07:00
Jacky Chan
638bbe0428 Shuffle tokens 2017-10-20 21:51:37 -07:00
Jacky Chan
85e485128f Add Go to Coinbase; Show Buy Ether after signup 2017-10-20 21:51:37 -07:00
Jacky Chan
449bce5eea Implement Import Account Screen 2017-10-20 21:51:37 -07:00
Jacky Chan
1a9b217558 Add BackupPhraseScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
fd4fbdc0cd Add NoticeScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
e1497fafa6 Add UniqueImageScreen 2017-10-20 21:51:37 -07:00
Jacky Chan
0264ecaad7 Adding CreatePasswordScreen 2017-10-20 21:51:37 -07:00
Chi Kei Chan
8f3b762461 Fix Conversions bugs; Fiat value bugs 2017-10-20 18:26:18 -07:00
Chi Kei Chan
5eb3cf43bf Add resiliency to confirm-send-token 2017-10-20 16:18:25 -07:00
Chi Kei Chan
d6f1f2bcca Merge pull request #2410 from alextsg/nu-2280
[NewUI] Fix loading animation not showing on network change
2017-10-20 15:35:26 -07:00
Chi Kei Chan
511339a969 Merge pull request #2413 from danjm/NewUI-flat-fix-addtoken-search
[NewUI-flat] Fixes add token search.
2017-10-20 15:35:04 -07:00
Dan
80025e278b Fixes regression in confirm-send-token 2017-10-20 18:17:13 -02:30
Chi Kei Chan
344b467d03 Merge branch 'master' into NewUI-flat 2017-10-20 11:05:10 -07:00
Dan
b25c73a866 Only show erc20 tokens in add token search. 2017-10-20 12:01:34 -02:30
Dan
89573533b8 Fixes add token search. 2017-10-20 11:48:01 -02:30
Alexander Tseung
5a93ec0252 Fix loading animation not showing on network change 2017-10-19 21:06:14 -07:00
Chi Kei Chan
79be956be9 Fix network dropdown styles 2017-10-19 14:10:29 -07:00
Chi Kei Chan
0458643f10 various styling fix on mobile 2017-10-19 14:08:58 -07:00
Chi Kei Chan
376ae032fe Fix selectors 2017-10-19 12:47:44 -07:00
Chi Kei Chan
f1c097ab5c Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-state 2017-10-19 12:35:39 -07:00
Dan
c2880c4b8f Min and default gas price, limit, total; comments out code for gas slider. 2017-10-19 12:34:34 -07:00
Dan
7362fb8dfc Identicon in send token show who you are sending to, not the token's identicon. 2017-10-19 12:34:14 -07:00
Dan
89af385a35 Fix handling of arithmetic on token gas in confirm-send-token. 2017-10-19 12:34:14 -07:00
Dan
332c7441b6 Get currency from state in account details, send and confirm screens. 2017-10-19 16:30:54 -02:30
Dan
59015cccef Min and default gas price, limit, total; comments out code for gas slider. 2017-10-19 16:26:46 -02:30
Dan
bd11e60b8c Amount field shows insufficient funds error based on amoutn + gas total. 2017-10-19 11:38:14 -07:00
Dan
f01d119cc1 Fixes mobile styling. 2017-10-19 11:38:14 -07:00
Chi Kei Chan
c8c773d641 Merge branch 'NewUI-flat' into merge 2017-10-18 22:58:46 -07:00
Dan
de1da7d1b2 Fix cancel button on send screen. 2017-10-18 20:21:46 -07:00
Dan
6e73eacd5f Turn off feature toggle. 2017-10-18 20:21:46 -07:00
Dan
60eda592b5 Handling to and amount errors. 2017-10-18 20:21:46 -07:00
Dan
f81226fbe9 Move all of send state to metamask state. 2017-10-18 20:21:46 -07:00
Dan
4f9ac1c4fe Get from and update addressBook in send-v2 2017-10-18 20:21:46 -07:00
Dan
4915aff750 Breaks send-v2 down into renderable functions. 2017-10-18 20:21:46 -07:00
Dan Finlay
4dc494fdd1 Fix bug that breaks ui dev mode 2017-10-18 17:14:42 -07:00
kumavis
8da0d0b28a Revert "NetworkController refactor for new EthClient interface" 2017-10-18 15:09:32 -07:00
Chi Kei Chan
03685c64b8 Network dropdown update 2017-10-17 22:42:56 -07:00
Chi Kei Chan
085551b7e6 New Account modal 2017-10-17 22:38:07 -07:00
Chi Kei Chan
5ee6e4d3b3 wip 2017-10-17 22:38:00 -07:00
Dan
ac43872c1a Enable send-v2 functionality. 2017-10-17 21:10:09 -04:00
Daijiro Wachi
ad970180f2 Increase line-height for account nicknames 2017-10-17 22:03:40 +02:00
Alexander Tseung
7caa914223 Fix Import Account link not hiding sidebar 2017-10-16 01:43:27 -04:00
Dan
a9244f5e42 Customize Gas connected to state 2017-10-15 23:09:05 -04:00
Dan Finlay
06094c914b Move etherscan link logic into module 2017-10-14 11:23:44 -04:00
Alexander Tseung
a59972dcab Prevent adding already added tokens (#2362) 2017-10-13 14:14:48 -07:00
Alexander Tseung
3fd9c8b57f Fix cursor on unclickable transactions (#2356) 2017-10-13 14:14:26 -07:00
Alexander Tseung
b149cceda0 Fix exception thrown when tokens is null (#2355) 2017-10-13 13:34:28 -07:00
Alexander Tseung
a84014eff8 Fix Localhost 8545 option in network dropdown (#2357) 2017-10-13 13:25:33 -07:00
Alexander Tseung
54a61a4021 Fix styling for Accept buttons in notices (#2358) 2017-10-13 13:24:17 -07:00
Alexander Tseung
6defb880fb Fix SELECT TYPE dropdown changing sizes based on error message (#2359) 2017-10-13 13:23:50 -07:00
Alexander Tseung
222a203353 Fix click to copy for private key not working (#2360) 2017-10-13 13:23:10 -07:00
Dan J Miller
803eaaf968 [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state (#2364)
* Adds memo field to send-v2.

* Vertical align transaction with flexbox.

* Customize Gas UI

* Remove internal state from InputNumber and fix use in gastooltip.

* Move customize-gas-modal to its own folder and minor cleanup

* Create send container, get account info from state, and make currency display more reusable

* Adjusts send-v2 and container for send-token. Dynamically getting suggested gas prices.
2017-10-13 13:19:22 -07:00
Chi Kei Chan
81f62a7443 Adding Account Dropdown V2 2017-10-13 02:11:01 -04:00
Chi Kei Chan
57179d2b05 Various styling fixes 2017-10-12 18:46:18 -04:00
Dan
7ec77e0b45 Refactor amount input: dynamic input width with vanilla js. 2017-10-12 11:09:05 -07:00
Dan
2898914a54 Send v2 amount unit moves correctly. 2017-10-12 11:09:05 -07:00
Dan
ea7926c211 Adds amount and gas field to sendV2. 2017-10-12 11:09:05 -07:00
Frankie
c4adefcc53 Merge pull request #2318 from MetaMask/network-controller-client
NetworkController refactor for new EthClient interface
2017-10-12 05:45:10 -07:00
Dan Finlay
9f063c320c Fix link to token support page 2017-10-11 15:15:31 -04:00
kumavis
f0713d4b1a ui - network - fix localhost active status 2017-10-11 01:01:29 -07:00
Dan
fbab0f3a1f Send v2 to autocomplete. 2017-10-10 18:19:15 -07:00
Chi Kei Chan
e20ec3b389 Token menu ellipsis alignment 2017-10-10 14:43:06 -07:00
Chi Kei Chan
b7e2bcf806 Reduce header shadow on mobile 2017-10-10 14:40:00 -07:00
Chi Kei Chan
d4343fe7e5 Fix recipient on send token 2017-10-10 14:36:13 -07:00
Chi Kei Chan
c221f5ce79 Confirm Token and Confirm Contract v2 2017-10-10 14:30:20 -07:00
Chi Kei Chan
119c2b2423 Confirm eth v2 2017-10-10 14:16:57 -07:00
Kevin Serrano
1816eca914
Merge branch 'master' into version-debugging 2017-10-10 08:38:27 -07:00
Kevin Serrano
24a55cf777
Make the function callback friendly. 2017-10-10 08:36:15 -07:00
Dan
71d6463984 Refactor 'rendersingleidentity' to a stand alone account-list-item component. 2017-10-09 18:24:14 -07:00
Dan
80463072b5 UI for readonly from component. From dropdown opening and closing. Mockdata. 2017-10-09 18:24:14 -07:00
Dan Finlay
f18615a82a Merge pull request #2296 from MetaMask/precision-fix
Fix precision to account for small wei increase.
2017-10-09 14:15:09 -07:00
Dan
db1258f3de Conversion util can invert conversion rate 2017-10-08 17:49:52 -07:00
Dan
49f76d27a9 Adds checkFeatureToggle util. 2017-10-08 17:48:09 -07:00
Dan
bbe893a0d8 UI for send screen container without form rows. 2017-10-08 17:48:09 -07:00
Dan
49aa6e73ea Edit account modal shows and allows editing of name from props, not just placeholder. 2017-10-08 17:45:59 -07:00
Dan
c9c940bfc1 Clear selected token when changing network. 2017-10-08 17:45:34 -07:00
Sergey Ukustov
53bb4bebb1 More appropriate styling 2017-10-07 23:25:40 +03:00
Kevin Serrano
b9012a62e5
Merge branch 'master' into version-debugging 2017-10-05 17:06:55 -07:00
Kevin Serrano
e6a618b82d
Fix precision to account for small wei increase. 2017-10-05 15:26:03 -07:00
Dan Finlay
c5b7880f05 Merge branch 'master' into SignTypedData 2017-10-05 11:55:23 -07:00
Dan
583342bd56 Removes old/second setProviderType method from before merge (commit bd99bc2e) 2017-10-04 15:43:10 -07:00
Kevin Serrano
27c72ee565
Revert to normal balances. 2017-10-04 12:10:01 -07:00
Kevin Serrano
bb9c2b3563
lint 2017-10-04 11:14:30 -07:00
Kevin Serrano
52aee7aa9e
Further adjustment to maintain API 2017-10-04 11:07:16 -07:00
Kevin Serrano
b158d7fea0
Rename to maintain API 2017-10-04 11:00:52 -07:00
Kevin Serrano
3d80565339
Configured for callback-required function.' 2017-10-04 10:55:10 -07:00
Kevin Serrano
e64c64a049
change global to window 2017-10-04 10:00:07 -07:00
Kevin Serrano
2f135c2e68
Include browser version 2017-10-04 09:56:40 -07:00
Kevin Serrano
147b81068a
Include OS version 2017-10-04 09:56:18 -07:00
Chi Kei Chan
bd99bc2e88 Merge branch 'master' into NewUI-flat 2017-10-03 16:02:58 -07:00
Dan
ac4868170f Enables remove token and ensures add/remove update the list without need for refresh. 2017-10-03 15:46:01 -07:00
Kevin Serrano
1893c50730 Merge pull request #2175 from MetaMask/RemoveSlackLink
Remove slack link
2017-10-03 10:46:29 -07:00
Kevin Serrano
44949813de Merge pull request #2251 from BrandenSoropia/remove-metamask-title
Removed MetaMask title. Fixed #1730.
2017-10-03 10:15:33 -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
d206f183f5 Hide token confirmation modal ui 2017-10-02 18:09:09 -07:00
Sergey Ukustov
e11ca12890 Merge remote-tracking branch 'upstream/master' 2017-10-03 02:10:47 +03:00
kumavis
2113d83489 ui - tx history - simplify error+warning display code 2017-10-02 15:39:44 -07:00
Kevin Serrano
4b0e6a0a77 Merge branch 'master' into RemoveSlackLink 2017-10-02 15:23:27 -07:00
Branden Soropia
db1dd46f8d Removed MetaMasktitle. Fixed #1730. 2017-10-02 00:02:30 -04:00
Dan
47ebcbb2ed Token menu ui. 2017-10-01 19:02:21 -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
kumavis
a2b6d3ffc5 network - remove long dead etherscan provider code 2017-09-29 16:37:01 -07:00
kumavis
d6ea2fa425 network - convert localhost from custom rpc to network type 2017-09-29 16:35:58 -07:00
Sergey Ukustov
82d1f39198 Respect code style 2017-09-29 19:53:03 +03:00
Sergey Ukustov
c2b8dada91 Add eth_signTypedData handler 2017-09-29 19:40:46 +03:00
Chi Kei Chan
67ee5b21e6 Query for gas estimates 2017-09-28 17:39:53 -07:00
Chi Kei Chan
4f106854ba Hide ShapeShift and Fix Modal Stylings 2017-09-28 16:34:42 -07:00
Chi Kei Chan
06292107d7 Always set currency to USD on app mount 2017-09-28 16:13:53 -07:00
Dan
66ed4dfaa3 Ensure sent token value is recognized as hex. 2017-09-28 15:55:18 -07:00
Dan
a195427e72 Fix send of USD and backspacing amount to 0 2017-09-28 15:54:51 -07:00
Dan
b55a40c7f1 Close sidebar on token selection. 2017-09-28 15:54:04 -07:00
Dan
a4838b1c57 Close mobile sidebar when selecting 'Add token' from account options dropdown. 2017-09-28 15:54:04 -07:00
Chi Kei Chan
5a1d50cd43 Merge branch 'master' into mmn 2017-09-27 22:32:07 -07:00
Dan
deee689426 Use font-awesome icons for create and import account. 2017-09-27 18:08:49 -07:00
Dan
c2ccd6e90e Makes styling fixes to account dropdown. 2017-09-27 18:08:49 -07:00
Dan
10345a12c2 Keep privateKey out of state and clear it after closing export private key modal. 2017-09-27 18:06:26 -07:00
Dan
01816e1b22 Adds a back button to export private key modal; connects account details to same modal. 2017-09-27 18:06:26 -07:00
kumavis
15b2823e54 Merge branch 'master' into new-currency-test 2017-09-27 16:04:51 -07:00
tmashuang
734490c58c Add AUD, HKD, SGD, IDR, PHP to currency conversion list 2017-09-27 11:16:38 -07:00
Chi Kei Chan
c77029ea90 Implement Confirm Deploy Contract screen 2017-09-26 19:21:04 -07:00
Dan
39365f2cc4 Update the correct values in state when estimates are received. 2017-09-26 18:43:26 -07:00
Dan
541b69dda9 Gets gas and price estimates when send components mount. 2017-09-26 18:43:26 -07:00
Dan
25c2865076 Restore notification functionality 2017-09-26 18:42:39 -07:00
Kevin Serrano
e998d528f0 Merge branch 'master' into RemoveSlackLink 2017-09-26 15:47:31 -07:00
Kevin Serrano
accee14282
Remove old conversion list. 2017-09-26 10:35:13 -07:00
Kevin Serrano
7b199e215d
Polish names on currency list. 2017-09-26 10:11:18 -07:00
Kevin Serrano
88ddedfb5a
Account for undefined currencies. 2017-09-26 10:09:50 -07:00
Dan Finlay
57b5f15265 Remove slack link 2017-09-26 10:01:16 -07:00
Chi Kei Chan
bdd1e58e55 Return null if transaction.key is shapeshift 2017-09-26 09:15:14 -07:00
Dan
7102772c3a Connect export key modal to state and enable actions. 2017-09-26 09:05:29 -07:00
Chi Kei Chan
0d4433ed58 Merge branch 'NewUI-flat' into MM-57-use-gas-estimator 2017-09-25 19:55:56 -07:00
Dan
5f6ec6aa98 Remove unnecessary trailing comma. 2017-09-25 18:30:56 -07:00
Dan
56697ea9a4 Select all in to and from of send screens, instead of clearing on focus. 2017-09-25 18:30:56 -07:00
Dan
eae40e0544 Able to change selections in to and from fields of send and send token. 2017-09-25 18:30:56 -07:00
Dan
2c474b0d6e Export private key modal body ui. 2017-09-25 18:29:43 -07:00
Dan
fc3e071ad6 Send token now estimates gas and price. 2017-09-25 22:09:10 -02:30
Dan
79bcb88db3 Refactor to store estimated gas and price in local state, return promise from actions. 2017-09-25 21:54:55 -02:30
Dan
88c4226bf1 Estimate gasPrice and gasLimit in send screen. 2017-09-25 21:54:55 -02:30
Dan
a1d87b821b Update send token to handle errors onBlur events and prevent clicking send until all errors handled 2017-09-25 21:45:51 -02:30
Dan
171d38c8db Handles errors with to field and renders warnings from backend in send token. 2017-09-25 21:19:30 -02:30
Dan
0eeba3771c Exports private key modal opens from dropdown. 2017-09-23 17:33:50 -07:00
Chi Kei Chan
e1077836ce Add Confirm Send token screen 2017-09-22 14:38:17 -07:00
Dan
13f22ff6b0 get identities from getState() instead of passing from caller, only set new account label if label set. 2017-09-22 14:35:51 -07:00
Dan
a1d72a59fe New account modal now allows for addition of account name. 2017-09-22 14:35:51 -07:00
Dan
e325e5e2f5 Default class params to empty string in readonly-input 2017-09-22 14:23:57 -07:00
Dan
48867d95fe ReadOnlyInput component. 2017-09-22 14:23:57 -07:00
Dan Finlay
f9d2f523c6 Merge branch 'master' into AddBalanceController 2017-09-22 14:12:41 -07:00
Dan
fe37dd7ecd Open account details modal on buy -> direct deposit. 2017-09-22 12:16:31 -07:00
Dan
14bdc5a78c Client side error handling for from, to and amount fields in send.js 2017-09-22 12:10:30 -07:00
Chi Kei Chan
83cda2b82e Refactor Confirmation Tx to render different screen 2017-09-21 22:25:16 -07:00
Chi Kei Chan
3ec2f53463 Integrate Add Token 2017-09-21 18:44:52 -07:00
Dan
24fd16b1be Abstract account modal. 2017-09-21 16:45:18 -07:00
Dan
39afbea7aa Confirm screen shows amount plus gas in total field 2017-09-21 16:43:29 -07:00
Dan
4fa79ffc6e Clean up code in send.js 2017-09-21 16:42:55 -07:00
Dan
97810acb53 Handles errors with to field and renders warnings from backend in send token. 2017-09-21 16:41:52 -07:00
Chi Kei Chan
04da22db08 Add Token UI - hover/select state; fetch token address 2017-09-20 22:57:36 -07:00
Kevin Serrano
b22783a223
Merge branch 'master' into new-currency-test 2017-09-20 09:40:33 -07:00
Chi Kei Chan
0204aa2001 Add Add Token UI; Add Fuzzy search for tokens 2017-09-19 21:18:36 -07:00
Chi Kei Chan
e7f1fc4436 Buy Modal Styling 2017-09-19 18:49:35 -07:00
Dan
566ffee8cd Ensure conversion util does not return insignificant trailing zeroes. 2017-09-19 12:56:51 -07:00
Chi Kei Chan
a67d3ecd46 Merge branch 'master' into NewUI-flat 2017-09-18 18:13:15 -07:00
Kevin Serrano
bd8428e9ed
Comply with current currency API and add additional styling. 2017-09-18 16:09:01 -07:00
Kevin Serrano
51cebcc173
Fix the property query for new currencies. 2017-09-18 12:20:41 -07:00
Roman Rodov
9af52ee1c5
Another merge conflict resolved. 2017-09-18 12:00:12 -07:00
Roman Rodov
f6f7798828
Resolve merge conflicts for currency sort merge. 2017-09-18 11:51:17 -07:00
Dan Finlay
fa50bf9587 Merge pull request #2075 from MetaMask/mixed-case
Specific error for send screen: address checksum fails
2017-09-18 11:46:50 -07:00
Kevin Serrano
51f0911f87
Merge branch 'master' into new-currency-test 2017-09-18 11:46:10 -07:00
Chi Kei Chan
190330db92 Merge branch 'master' into NewUI-flat 2017-09-18 11:41:46 -07:00
Chi Kei Chan
162a3827c7 Fix Merge Problems; update yarn lock 2017-09-18 11:34:07 -07:00
Chi Kei Chan
6c5865d564 Merge branch 'master' into nm 2017-09-18 11:28:10 -07:00
Dan Finlay
545cbbebb9 Merge branch 'master' into fix-tooltip 2017-09-18 11:20:00 -07:00
Dan Finlay
67accea693 Merge branch 'master' into mixed-case 2017-09-18 11:17:00 -07:00
Dan
54bbf8d859 Handle transaction totals in WEI in tx-list, send and pending. 2017-09-15 16:23:23 -07:00
Dan
b0f1fba2e5 Ensures that new accounts are only created from the modal, and not when clicking 'Create New Account' 2017-09-15 16:19:48 -07:00
Dan
feb90f2fc4 Clear token selection when changing account. 2017-09-15 16:18:48 -07:00
Dan
095d327140 Adds USD to token list. 2017-09-15 16:16:41 -07:00
Dan
ab77142c90 Show dollar sign before USD on account details page. 2017-09-15 16:10:34 -07:00
Dan
5c86194c0a Show loading on conf-tx until the pending tx is available. 2017-09-14 15:45:18 -07:00
Chi Kei Chan
7d76e404f2 Make send token responsive; fix desktop send modal height 2017-09-14 11:45:59 -07:00
Chi Kei Chan
35d8671843 Add responsive UI to send ether modal 2017-09-14 09:56:40 -07:00
Kevin Serrano
456ceefcf7
Modify conversion to new api. 2017-09-14 09:14:57 -07:00
Kevin Serrano
cb8856597c
Merge branch 'master' into new-currency-test 2017-09-14 08:35:48 -07:00
Chi Kei Chan
4bcc62500f Style send ether screen 2017-09-14 01:32:24 -07:00
Chi Kei Chan
93a1089e08 Show token tx properly 2017-09-14 01:09:57 -07:00
Chi Kei Chan
d722c1045f Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate 2017-09-13 19:57:33 -07:00
Dan
6bd71d6937 Fix send and pending. 2017-09-13 16:30:39 -07:00
Dan Finlay
c17c657693 Merge branch 'master' into AddBalanceController 2017-09-13 15:11:03 -07:00
Dan Finlay
a01921758b Add computed balance to account detail view 2017-09-13 15:06:04 -07:00
Dan Finlay
0ba6493175 Use computed balance for tx confirmation 2017-09-13 14:31:48 -07:00
Dan
ca46bd200b Stop setting 'currentCurrency' and use local state for active currency in send.js 2017-09-13 14:25:20 -07:00
Dan
a5ab91e572 Enables Cancel button in confirmation screen. 2017-09-13 14:24:48 -07:00
Dan
e2dc9328fc Send user to most recent pending transaction after sending a transaction. 2017-09-13 14:24:03 -07:00
Dan
09a4491bb1 Fix saving/sending of amounts in USD 2017-09-13 14:22:58 -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
Dan
6fa1cd6225 Reapply conversion utility changes and fix calls to utility in pending-tx. 2017-09-13 14:22:30 -07:00
Kevin Serrano
a22a2586ab
Haha silly me, only when gas is estimated and not explicit. 2017-09-13 13:24:16 -07:00
Kevin Serrano
6e725b123b
Lower warning threshold for high tx fee to account for fluctuating blockGasLimits 2017-09-13 12:22:08 -07:00
Kevin Serrano
06153dd47d
Add warning of higher failure risk since app proposed gasLimit. 2017-09-13 12:17:42 -07:00
Chi Kei Chan
8f31b05ac5 Add token exchange rates 2017-09-13 01:25:39 -07:00
Chi Kei Chan
8b5f2a95df Improve styling in Confirmation Screen; Show decoded send token data 2017-09-12 23:04:01 -07:00
Chi Kei Chan
b64471833f Revert "Overhaul currency conversion utility and update calls to utility in pending-tx."
This reverts commit 080890a46e.
2017-09-12 23:04:01 -07:00
Kevin Serrano
962794d025
fixed position of tooltips to avoid overflow. 2017-09-12 16:15:56 -07:00
Dan
080890a46e Overhaul currency conversion utility and update calls to utility in pending-tx. 2017-09-12 16:05:59 -07:00
Dan Finlay
7ed1fe90f8 Fix support link 2017-09-12 15:07:08 -07:00
Dan J Miller
492507aa94 [NewUI] Color tx-list-item text depending on transaction status. (#2050)
* Color tx-list-item text depending on transaction status.

* Handle css change of text colour with scss instead on inline styles, add classnames package and helper function.

* Refactored to use classnames with component property className.
2017-09-12 14:59:33 -07:00
Kevin Serrano
ef6967325e
Check if all lower or upper before doing checksum. 2017-09-12 12:52:13 -07:00
Kevin Serrano
7810880f0c
Add specific error message for failed address checksum. 2017-09-12 12:23:21 -07:00
Kevin Serrano
ad14e9338d
Convert state logs into a download. 2017-09-12 09:34:48 -07:00
Chi Kei Chan
7eb6dae418 Added signTokenTx; Adding token confirmation screen 2017-09-12 02:22:23 -07:00
Chi Kei Chan
836bf2e1a3 Add frontend validation to send-token 2017-09-11 23:18:54 -07:00
Dan J Miller
1e83835ba8 [New-UI] Confirm Screen restyle and connect to state (#2042)
* Adds utility for converting currencies (WIP)

* Implements confirm screen

* Style tweaks.

* Confirm screen total ammount now uses real data.

* Confirm screen total ammount now uses real data.

* Replace content divider with sibling css.

* Replace section divider with scss.
2017-09-11 22:19:05 -07:00
Chi Kei Chan
062e67bff8 Add buttons; handle back; add yarn.lock 2017-09-11 22:14:09 -07:00
Dan
392d0d020c Use transparent border for consistent size with and without border. 2017-09-11 19:16:43 -07:00
Dan
8342c20b58 Cleaner css for circle icon. 2017-09-11 19:16:43 -07:00
Dan
6beb1b33bb Replace checkmark with font-awesome equivalent. 2017-09-11 19:16:43 -07:00
Dan
99047e3ef4 Adds title, divider and descriptive text to network dropdown. 2017-09-11 19:16:43 -07:00
Dan
6a3c59e409 Highlighted circle icons for the network menu. 2017-09-11 19:16:43 -07:00
Kevin Serrano
213af0cd6c
Fix typo. 2017-09-11 16:52:35 -07:00
Kevin Serrano
e7c1a11b4d
Add ability to save seed words as file. 2017-09-11 16:48:02 -07:00
Kevin Serrano
aa021b9209
Add some styling. 2017-09-11 16:40:45 -07:00
Kevin Serrano
fa1ec5dcd1
Move function as util function. 2017-09-11 16:22:20 -07:00
Kevin Serrano
3a7d4a5d4e
Basic private key download file functionality. 2017-09-11 16:13:28 -07:00
Kevin Serrano
27ba7f6ed3
Show reject all only when tx count is > 1 2017-09-11 14:12:35 -07:00
Kevin Serrano
2e18dd27a4
Merge github.com:MetaMask/metamask-extension into rejectallunapproved 2017-09-11 13:58:46 -07:00
Chi Kei Chan
663cb758b3 Style send token screen 2017-09-11 00:45:06 -07:00
Thomas Huang
430d6d20f1 Merge pull request #2047 from MetaMask/i1997-networkindicate
Add caret to dropdown network selector
2017-09-08 14:38:00 -07:00
Dan
395e8bfce0 Use width 100 and margin for the new modal input. 2017-09-08 10:56:56 -07:00
Dan
5a8433b6ce New account modal top right close button working. 2017-09-08 10:56:56 -07:00
Dan
ab4005cab8 Tweak styles in new-account-modal. 2017-09-08 10:56:56 -07:00
Kevin Serrano
0e6c11a3b5
Fix typo. 2017-09-07 18:01:39 -07:00
Kevin Serrano
54a5a117d5
Fix link to open new tab. 2017-09-07 18:00:45 -07:00
Kevin Serrano
6560a2c3af
Add front-end validation for own adddresses as a token contract address. Add information on token contract addresses. 2017-09-07 17:55:34 -07:00
Kevin Serrano
54fb8e8cef
Add cursor on hover on loading. Change some wording. 2017-09-07 16:26:31 -07:00
Kevin Serrano
8d7f78c1a5
Add caret to indicate network is dropdown. 2017-09-07 16:18:32 -07:00
Dan Finlay
64717726c4 Reword forgot password to restore seed phrase
This always confuses people, I just finally did it.
2017-09-07 15:27:40 -07:00
Kevin Serrano
41e9904d9b
Convert icon to button. 2017-09-07 15:03:25 -07:00
Kevin Serrano
3a87a30912
Fold submit and buy ether into one button slot 2017-09-07 13:55:59 -07:00
Kevin Serrano
34e7bb5015
Merge branch 'master' of github.com:davidp94/metamask-extension into rejectallunapproved 2017-09-07 13:20:14 -07:00
Kevin Serrano
69c7fe24b3
Place object property retrieval inside try-catch 2017-09-07 12:17:36 -07:00
Kevin Serrano
f0ab4ce52d
Change expected type to array. 2017-09-07 11:51:04 -07:00
Chi Kei Chan
272ade0f66 Fix .filter token tx 2017-09-07 11:46:05 -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
a0ca3fab77 Modify readonly value in for input in qr-code. 2017-09-07 10:26:21 -07:00
Dan
c4eb2fb3ea Account-detail address is a readonly input. 2017-09-07 10:26:21 -07:00
Dan
1d5a725ffb Close button in account-details-modal working. 2017-09-07 10:26:21 -07:00
Dan
b8b0c8c62a Remove highlight on modal 2017-09-07 10:26:21 -07:00
Dan
61b965fe14 Touch up style of account-details-modal. 2017-09-07 10:26:21 -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
3e6b619bd8 Use ternary operator instead of two conditionals. 2017-09-07 10:25:56 -07:00
Dan
64f8a4d22b Improve tx-list item hover scss. 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
Dan
aa60944e30 Remove default to confirm screen on login. 2017-09-07 10:25:56 -07:00
Chi Kei Chan
b670c8074e Fix font sizes on Send Token 2017-09-07 04:26:29 -07:00
Chi Kei Chan
8b919758e5 Send Token screen partial UI 2017-09-07 04:24:03 -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