1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 21:00:13 +01:00
Commit Graph

1088 Commits

Author SHA1 Message Date
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
Kevin Serrano
98d8275743
Fix for gas price to be lowered. 2017-10-24 16:43:03 -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
91b23246cd Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin into firsttimeflow 2017-10-24 08:36:02 -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
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
Dan
e737a9565a Improve customize gas modal error handling 2017-10-23 22:41:30 -07:00
Dan
09d659614e Cleaner implementation of currency-display input. 2017-10-23 22:40:55 -07:00
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
ac50db52a9 Fix linter 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
Dan
80025e278b Fixes regression in confirm-send-token 2017-10-20 18:17:13 -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
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
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
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
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
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
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
Dan
fbab0f3a1f Send v2 to autocomplete. 2017-10-10 18:19:15 -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
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
49aa6e73ea Edit account modal shows and allows editing of name from props, not just placeholder. 2017-10-08 17:45:59 -07:00
Sergey Ukustov
53bb4bebb1 More appropriate styling 2017-10-07 23:25:40 +03: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
Kevin Serrano
27c72ee565
Revert to normal balances. 2017-10-04 12:10:01 -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
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
kumavis
2113d83489 ui - tx history - simplify error+warning display code 2017-10-02 15:39:44 -07: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
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
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
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
Kevin Serrano
88ddedfb5a
Account for undefined currencies. 2017-09-26 10:09:50 -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
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
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
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
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
e7f1fc4436 Buy Modal Styling 2017-09-19 18:49:35 -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
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
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
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
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
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
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 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
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
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
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
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
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
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
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
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
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
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
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
Chi Kei Chan
f1fb9e10a0 Adding Token transaction detail screen 2017-09-06 03:17:49 -07:00
Chi Kei Chan
690ddf5ed7 Fix token list 2017-09-06 00:36:52 -07:00
Chi Kei Chan
06b2a04a42 Implement tokens list UI 2017-09-06 00:36:31 -07:00
Kevin Serrano
3e2bd19881
Merge branch 'master' into readd-loose 2017-09-05 15:48:15 -07:00
Dan Finlay
90272e252f Make eth_sign deprecation warning more useful
Link to descriptive article that demonstrates the new preferred method.
2017-09-05 11:44:26 -07:00
Kevin Serrano
e647337a8a
Resolve merge conflict from master 2017-09-05 09:03:44 -07:00
Dan
7d6ad48f15 Touch up transaction list item styles, remove main-content scroll bars, align buttons with main-content.. 2017-09-04 18:46:14 -07:00
Dan
3cb51e32c9 Capitalizations via text-transform for main screen transactions. 2017-09-04 18:46:14 -07:00
Chi Kei Chan
75c3009f83 Fix header style; Address comments 2017-09-04 15:57:43 -07:00
Chi Kei Chan
9213789c44 Fix merge conflict 2017-09-04 15:57:43 -07:00
Jacky Chan
b1fc290bed Fix menu style 2017-09-04 15:57:43 -07:00
Dan
e7b3ef0708 Lint fixes 2017-08-31 04:16:07 -07:00
Dan
3ea841e276 Refactor gas-fee-display to include usd and eth fee displays as separate components. 2017-08-30 16:46:24 -07:00
Dan
5a7e4c4e76 Move gas fee to a separate component. 2017-08-30 16:46:24 -07:00
Dan
1485ec7392 Move currency toggle to its own component. 2017-08-30 16:46:24 -07:00
Dan
3ce69e1b65 Clean up send.js and eth-balance.js with es6. 2017-08-30 16:46:24 -07:00
Thomas Huang
04011f9ea7 Multiple tokens shows the amount when greater than 1 2017-08-29 17:54:01 -07:00
Dan
c605c9897d Minor clean up. 2017-08-29 16:09:56 -02:30
Dan
b251d0f675 Center tooltip on small screen size by using flexbox 2017-08-29 13:43:43 -02:30
Dan
cd5861541c Use hex values only in send.js to handle limit and price; GasTooltip accepts and returns values as hex (allows user to enter floats) 2017-08-29 12:26:33 -02:30
Dan
dc72c4cc91 Using eth balance component to ensure proper rounding. 2017-08-29 12:26:32 -02:30
Dan
43ceeacf0f Refactor for clean handling of tooltip close. 2017-08-29 12:26:31 -02:30
Dan
0a44c82458 Styles and behaviour correct 2017-08-29 12:26:20 -02:30
Dan
c9e134a996 Fully connect gas data in send form and tooltip to state; final styling improvements.
Fully connect gas fields in send form and tooltip to state
2017-08-25 20:54:04 -02:30
Dan
ff247289ae Tooltip closing on click outside. 2017-08-25 17:04:23 -02:30
Dan
e56b8c5055 Refactor tooltip to remove external lib; tooltip now updating gas fee in parent. 2017-08-25 17:04:23 -02:30
Dan
5677fdaf68 Toggling tooltip. 2017-08-25 17:03:41 -02:30
Dan J Miller
4076496c8e Patch 3 new account modal (#1962)
* Account details modal styling changes.

* Tweaking styles.

* New account modal re-styling.

* Tweaks to paddings, margins, font sizes, colors and modal dimensions.

* Replace colour codes with variables.
2017-08-24 17:31:01 -07:00
Dan J Miller
744b78e9c8 Patch 2 account details modal (#1957)
* Account details modal styling changes.

* Tweaking styles.
2017-08-24 17:25:27 -07:00
Dan Finlay
e0ccdcd6fd Remove eth-tx-viz link from tx history icons 2017-08-23 09:40:24 -07:00
Dan J Miller
5b62f10a5f Modify buy and send buttons color, border-radius and various size properties. (#1956) 2017-08-22 16:42:17 -07:00
sdtsui
9d69401041 Hook up showAddToken to dropdown menu item in account options dropdown 2017-08-22 16:25:23 -07:00
sdtsui
18496ad859 Render TxListItem component from real data: address, identicon, status, ETH value 2017-08-22 16:16:56 -07:00
sdtsui
9dce1b6fd5 Remove fake transactions and balances from tx-list and wallet-view, respectively 2017-08-22 15:24:48 -07:00
sdtsui
97a6a8e4f6 Add layout and props for send screen inputs 2017-08-22 12:47:58 -07:00
sdtsui
b0759ddc18 Hook up send screen action to Send Button in TxView 2017-08-21 12:53:15 -07:00
sdtsui
27b75b67b4 Hook up identicon and buttons to AccountDetailsModal, clean up colors 2017-08-21 12:26:36 -07:00
sdtsui
877faaf096 Integrate old QR component with new modal layout 2017-08-21 10:27:56 -07:00
sdtsui
b836d0483d [WIP] Render a QR code in AccountDetailsModal 2017-08-21 10:06:29 -07:00
sdtsui
fe5817051b [WIP] Aggregate data for QRView 2017-08-21 09:50:22 -07:00
sdtsui
86b71f014a Add wrapper CSS for NewAccountModal 2017-08-21 06:14:28 -07:00
sdtsui
35508a2898 Add wrapper CSS for AccountDetailsModal 2017-08-21 05:58:30 -07:00
sdtsui
3fa7c5dc08 Hook up hideModal action to close icon in EditAccountNameModal 2017-08-21 04:53:39 -07:00
sdtsui
c2636143c3 Hook up selected account label display to main wallet view 2017-08-21 04:51:55 -07:00
sdtsui
d82233b95c Hook up actions to EditAccountNameModal 2017-08-21 04:46:38 -07:00
sdtsui
80a2cba38e Enhance global modal to accept styles from different components 2017-08-21 03:53:01 -07:00
sdtsui
66829b7a05 Implement new dropdown design, integrate account balances 2017-08-21 03:27:11 -07:00
sdtsui
18ea874a80 Hook up edit account name modal 2017-08-20 19:39:37 -07:00
sdtsui
beedd5b11e Remove old design - 'Show QR Code' dropdown menu item from account selection dropdown 2017-08-20 19:29:14 -07:00
sdtsui
73a593b42e Hook up template for New Account Modal 2017-08-20 19:28:20 -07:00
sdtsui
71b2dd290b Enhance global modal to handle Buy, Edit, and Details Modals 2017-08-20 19:10:49 -07:00
sdtsui
4e9376ca71 Extend modal implementation and state management to accomodate multiple modal types 2017-08-20 18:32:58 -07:00
sdtsui
e550d36084 Add 'Account Details' dropdown menu item to account options dropdown 2017-08-20 18:10:06 -07:00
sdtsui
7d02c90510 Add 'Add Token' dropdown menu item to account options dropdown 2017-08-20 18:09:09 -07:00