m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code
6,862 Commits 2 Branches 0 Tags 265 MiB
72649a0b59
Commit Graph

1230 Commits

Author SHA1 Message Date
Dan
b0122be3c9 Set retry gasPrice to forceGasMin on confirm screen in cases where gas is not edited. 2018-03-14 22:45:10 -02:30
Dan
66422cd083 Force gas min has correct precision and is set when editing gas if max. 2018-03-14 22:29:43 -02:30
kumavis
34aeef50a0 i18n - load locales manually 2018-03-14 16:32:35 -07:00
Dan
a4c6a5e92e Ensure changes from customize gas modal opened from confirm screen are captured for non-tx transactions. 2018-03-14 17:10:59 -02:30
Dan
fb838da734 Revert 'Set txMeta.time to reflect time of tx approval.' 2018-03-14 17:07:09 -02:30
Dan
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
Thomas Huang
1d2cb46eff
Merge branch 'master' into i18n 2018-03-13 11:00:52 -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
Alexander Tseung
08542c18e1
Update deposit ether styling (#3510) 2018-03-12 19:25:12 +01: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
d84341f323
Add empty object default value for tokenData (#3493) 2018-03-09 16:31:17 +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
09dae760bc Correct caps of Send button on main screen. 2018-03-07 22:47:29 -03:30
Dan J Miller
ca047b1ea0
Update network colours for better accessibility. (#3469) 2018-03-07 15:22:10 -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
Dan
9d215bab0f Merge branch 'master' into i18n 2018-03-06 20:45:45 -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
Dan J Miller
1bd18cebd7
Fixes shapeshift coin selection dropdown. (#3416) 2018-03-05 13:33:46 -03:30
Thomas Huang
d3a0a27c0c
Merge branch 'master' into ImportAccountMessageV2 2018-03-02 18:26:52 -08:00
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
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
Dan Finlay
a1b72e5252 Try fixing notice screen synchronous state call 2018-02-20 13:51:06 -08:00
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 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 J Miller
35c762da47 Updates the styling of confirm send ether and token screens. (#3235) 2018-02-12 22:51:05 -08:00
Alexander Tseung
72ffa2c3f5 Fix react-router related exceptions 2018-02-09 12:05:27 -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
Alexander Tseung
e9c2c0eec1
Make blockies icon round to match identicons (#3205) 2018-02-07 18:46:27 -08:00
Alexander Tseung
8b90b1d1b1 Remove accessing PropTypes from main React package 2018-02-06 22:03:37 -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
Alexander Tseung
2fd9e58e61 Fix lint errors 2018-02-01 14:13:08 -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
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
Nick Doiron
bad70eb1b3 first steps to i18n 2018-01-22 23:48:03 -10: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
f8bf8cb527 Update popout to fullscreen icon 2018-01-17 17:56:18 -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
Thomas
8c792ba3ee Add network-indicator classname to network loading spinner 2018-01-17 10:51:23 -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
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
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
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
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
Alexander Tseung
208e94d3bf Update main view styling 2018-01-10 21:09:09 -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
Chi Kei Chan
9959aea598
Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 2017-12-20 17:38:28 -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
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
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
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
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
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
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
9db00fa507 Show user notifications after switch between UIs 2017-12-04 23:36:54 -03:30
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
Clark, Jason (Contractor)
90fc4812bc incremental commit 2017-11-23 18:33:44 -07: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
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
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
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
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
Dan J Miller
3d53716f43 Correct rendering of conversions when conversion rate is a token. (#2498) 2017-10-26 22:55:34 -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
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
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
Chi Kei Chan
2b72b70647 Add GWEI to gas price unit 2017-10-25 01:17:17 -07:00
Chi Kei Chan
0d522139ba Fix gas input styling on mobile view 2017-10-25 01:08:14 -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
6231431894 Change download to show in Export Private Key Modal 2017-10-24 22:48:20 -07:00
Chi Kei Chan
630ab79cc3 Styling and UX changes on sidebar 2017-10-24 20:04:29 -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