| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| ... | |
| * | | | | | | | | | Merge pull request #2419 from MetaMask/Version-3.11.1 | Thomas Huang | 2017-10-21 | 2 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | Version 3.11.1v3.11.1 | Dan Finlay | 2017-10-21 | 2 | -1/+3 |
| |/ / / / / / / / / |
|
| * | | | | | | | | | Merge pull request #2401 from MetaMask/filter-fix-maybe | Frankie | 2017-10-21 | 2 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | changelog entry for filter fix | kumavis | 2017-10-21 | 1 | -0/+1 |
| | * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f... | kumavis | 2017-10-21 | 8 | -32/+99 |
| | |\ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | | Merge pull request #2412 from MetaMask/x-frame-options | kumavis | 2017-10-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | mascara - set x-frame-options header to DENY | frankiebee | 2017-10-20 | 1 | -1/+1 |
| | | * | | | | | | | | | deps - bump eth-json-rpc-filters for log filter fix | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | * | | | | | | | | | deps - bump eth-json-rpc-filters | kumavis | 2017-10-19 | 1 | -1/+1 |
| | | | | | | | | * | | | Merge pull request #2435 from danjm/NewUI-flat-disable-send-next-in-error | Chi Kei Chan | 2017-10-25 | 1 | -8/+3 |
| | | | | | | | | |\ \ \ |
|
| | | | | | | | | | * \ \ | Merge branch 'NewUI-flat' into NewUI-flat-disable-send-next-in-error | Daniel Tsui | 2017-10-24 | 29 | -188/+489 |
| | | | | | | | | | |\ \ \ |
|
| | | | | | | | | | * | | | | Disable send-v2 next button if in error | Dan | 2017-10-24 | 2 | -9/+18 |
| | | | | | | | | * | | | | | Simply logic for rendering matching accounts in to-autocomplete dropdown. | Dan | 2017-10-25 | 1 | -12/+4 |
| | | | | | | | | * | | | | | Style dropdown of to-autocomplete. | Dan | 2017-10-25 | 5 | -39/+136 |
| | | | | | | | | | |/ / /
| | | | | | | | |/| | | |
|
| | | | | | | | | * | | | | Fix mobile add token button | Chi Kei Chan | 2017-10-24 | 3 | -5/+7 |
| | | | | | | | | * | | | | Disable network dropdown on conf tx screen | Chi Kei Chan | 2017-10-24 | 3 | -9/+32 |
| | | | | | | | | * | | | | Change clickable area for account detail; change network dot size | Chi Kei Chan | 2017-10-24 | 3 | -6/+14 |
| | | | | | | | | * | | | | Fix styling in private key modal | Chi Kei Chan | 2017-10-24 | 2 | -1/+1 |
| | | | | | | | | * | | | | Add caret to Add Token toggle | Chi Kei Chan | 2017-10-24 | 2 | -2/+16 |
| | | | | | | | | * | | | | Add "Add Token" button to side bar | Chi Kei Chan | 2017-10-24 | 2 | -0/+18 |
| | | | | | | | | * | | | | Fix clickable area on logout | Chi Kei Chan | 2017-10-24 | 1 | -2/+3 |
| | | | | | | | | * | | | | Account menu white check mark | Chi Kei Chan | 2017-10-24 | 5 | -8/+34 |
| | | | | | | | | * | | | | New Sidebar uplift | Chi Kei Chan | 2017-10-24 | 3 | -66/+93 |
| | | | | | | | | * | | | | Change LOOSE label to IMPORTED | Chi Kei Chan | 2017-10-24 | 3 | -2/+3 |
| | | | | | | | | * | | | | Remove Current Provider info from Settings | Alexander Tseung | 2017-10-24 | 1 | -1/+1 |
| | | | | | | | | * | | | | Use classnames library and disabled attribute on 'Next' button in send-v2 | Dan | 2017-10-24 | 1 | -3/+8 |
| | | | | | | | | * | | | | Improve customize gas modal error handling | Dan | 2017-10-24 | 8 | -59/+230 |
| | | | | | | | | * | | | | Disable send-v2 next button if in error | Dan | 2017-10-24 | 2 | -9/+18 |
| | | | | | | | | * | | | | Cleaner implementation of currency-display input. | Dan | 2017-10-24 | 2 | -22/+24 |
| | | | | | | | | * | | | | Fix settings styling on mobile view | Alexander Tseung | 2017-10-24 | 1 | -0/+7 |
| | | | | | | | | * | | | | Update token menu css | Chi Kei Chan | 2017-10-24 | 3 | -10/+11 |
| | | | | | | | | |/ / / |
|
| | | | | | | | | * | | | Merge pull request #2433 from danjm/NewUI-flat-precision-improvements | Chi Kei Chan | 2017-10-24 | 2 | -3/+5 |
| | | | | | | | | |\ \ \ |
|
| | | | | | | | | | * | | | Improve precision in send and confirm. | Dan | 2017-10-24 | 2 | -3/+5 |
| | | | | | | | | * | | | | Merge pull request #2434 from danjm/NewUI-flat-clear-send-state | Chi Kei Chan | 2017-10-24 | 4 | -7/+31 |
| | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | * | | | | Clear send state on cancelling and signing. | Dan | 2017-10-24 | 4 | -7/+31 |
| | | | | | | | | | |/ / / |
|
| | | | | | | | | * | | | | Merge pull request #2431 from alextsg/nu-2406 | Chi Kei Chan | 2017-10-24 | 3 | -4/+4 |
| | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | * | | | | Change all "Buy" to "Deposit" | Alexander Tseung | 2017-10-23 | 3 | -4/+4 |
| | | | | | | | | | |/ / / |
|
| | | | | | | | | * | | | | Merge pull request #2430 from alextsg/cb-130 | Chi Kei Chan | 2017-10-24 | 10 | -287/+596 |
| | | | | | | | | |\ \ \ \
| | | | | | | | | |/ / /
| | | | | | | | |/| | | |
|
| | | | | | | | | | * | | | Update settings screen to new UI | Alexander Tseung | 2017-10-23 | 10 | -287/+596 |
| | | | | | | | | |/ / / |
|
| | | | | | | | * | | | | 4.0.2 | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | | | | | | * | | | | Merge branch 'NewUI-flat' into uat | Chi Kei Chan | 2017-10-21 | 11 | -62/+74 |
| | | | | | | | |\| | | |
|
| | | | | | | | | * | | | Fix Conversions bugs; Fiat value bugs | Chi Kei Chan | 2017-10-21 | 5 | -9/+24 |
| | | | | | | | | * | | | Add resiliency to confirm-send-token | Chi Kei Chan | 2017-10-21 | 1 | -5/+5 |
| | | | | | | | | * | | | Merge pull request #2410 from alextsg/nu-2280 | Chi Kei Chan | 2017-10-21 | 4 | -46/+38 |
| | | | | | | | | |\ \ \ |
|
| | | | | | | | | | * | | | Fix loading animation not showing on network change | Alexander Tseung | 2017-10-20 | 4 | -46/+38 |
| | | | | | | | | * | | | | Merge pull request #2413 from danjm/NewUI-flat-fix-addtoken-search | Chi Kei Chan | 2017-10-21 | 1 | -1/+4 |
| | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | * | | | | Only show erc20 tokens in add token search. | Dan | 2017-10-20 | 1 | -1/+3 |
| | | | | | | | | | * | | | | Fixes add token search. | Dan | 2017-10-20 | 1 | -0/+1 |
| | | | | | | | | | |/ / / |
|
| | | | | | | | | * | | | | Merge pull request #2418 from danjm/NewUI-flat-fix-confirm-token | Chi Kei Chan | 2017-10-21 | 1 | -2/+4 |
| | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | | * | | | | Fixes regression in confirm-send-token | Dan | 2017-10-21 | 1 | -2/+4 |
| | | | | | | | | |/ / / / |
|
| | | | | | | | * / / / / | 4.0.1 | kumavis | 2017-10-21 | 1 | -1/+1 |
| | | | | | | | |/ / / / |
|
| | | | | | | | * | | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-21 | 7 | -30/+97 |
| | | | | | | | |\ \ \ \
| |_|_|_|_|_|_|/ / / /
|/| | | | | | | / / /
| | | | | | | |/ / / |
|
| * | | | | | | | | | | Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVault | Thomas Huang | 2017-10-21 | 7 | -29/+96 |
| |\ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
| | * | | | | | | | | | Merge branch 'master' into i2348-SelectAccountOnNewVault | Thomas Huang | 2017-10-20 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \
| |/ / / / / / / / /
|/| | | | | | | | | |
|
| * | | | | | | | | | | Merge pull request #2409 from chikeichan/fix-account-creation | kumavis | 2017-10-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Update eth-keyring-controller dependency | Chi Kei Chan | 2017-10-20 | 1 | -1/+1 |
| |/ / / / / / / / / / |
|
| | * | | | | | | | | | Linted | Dan Finlay | 2017-10-20 | 2 | -2/+1 |
| | * | | | | | | | | | Fix bug where new account was not immediately selected | Dan Finlay | 2017-10-20 | 1 | -3/+14 |
| | * | | | | | | | | | Allow computed balances to enumerate its own view | Dan Finlay | 2017-10-20 | 1 | -2/+3 |
| | * | | | | | | | | | Patch sandwich-expando for security update | Dan Finlay | 2017-10-20 | 1 | -1/+1 |
| | * | | | | | | | | | Fix bug that breaks ui dev mode | Dan Finlay | 2017-10-19 | 1 | -1/+6 |
| | * | | | | | | | | | Remove account-tracker from keyringController | Dan Finlay | 2017-10-19 | 2 | -2/+1 |
| | * | | | | | | | | | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-19 | 12 | -105/+97 |
| | |\| | | | | | | | |
|
| | * | | | | | | | | | Make account tracking much more reactive | Dan Finlay | 2017-10-19 | 2 | -12/+13 |
| | * | | | | | | | | | Make account tracking more reactive | Dan Finlay | 2017-10-19 | 3 | -29/+33 |
| | * | | | | | | | | | Refresh computed balances controller when restoring vault | Dan Finlay | 2017-10-19 | 2 | -1/+6 |
| | * | | | | | | | | | Add validation to balance constructor | Dan Finlay | 2017-10-19 | 1 | -0/+10 |
| | * | | | | | | | | | Stop tracking old account balances after restore vault | Dan Finlay | 2017-10-19 | 1 | -0/+13 |
| | * | | | | | | | | | Merge branch 'master' into i2348-SelectAccountOnNewVault | Dan Finlay | 2017-10-18 | 9 | -66/+6 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Bump changelog | Dan Finlay | 2017-10-18 | 1 | -0/+1 |
| | * | | | | | | | | | | Promisify metamask-controller vault creating methods | Dan Finlay | 2017-10-18 | 1 | -17/+10 |
| | * | | | | | | | | | | Select first account when restoring seed | Dan Finlay | 2017-10-18 | 1 | -3/+17 |
| | * | | | | | | | | | | Select first account on new vault creation | Dan Finlay | 2017-10-18 | 1 | -1/+12 |
| | | |_|_|_|_|_|_|/ /
| |/| | | | | | | | |
|
| | | | | | | | | * | | Fix network dropdown styles | Chi Kei Chan | 2017-10-20 | 1 | -1/+1 |
| | | | | | | | | * | | various styling fix on mobile | Chi Kei Chan | 2017-10-20 | 7 | -16/+47 |
| | | | | | | | | * | | Fix selectors | Chi Kei Chan | 2017-10-20 | 5 | -26/+80 |
| | | | | | | | | * | | Merge pull request #2399 from danjm/MM-128-get-currentCurrency-from-state | Chi Kei Chan | 2017-10-20 | 14 | -67/+90 |
| | | | | | | | | |\ \ |
|
| | | | | | | | | | * \ | Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-state | Chi Kei Chan | 2017-10-20 | 3 | -22/+48 |
| | | | | | | | | | |\ \
| | | | | | | | | |/ /
| | | | | | | | |/| | |
|
| | | | | | | | | * | | | Min and default gas price, limit, total; comments out code for gas slider. | Dan | 2017-10-20 | 4 | -18/+47 |
| | | | | | | | | * | | | Identicon in send token show who you are sending to, not the token's identicon. | Dan | 2017-10-20 | 1 | -3/+3 |
| | | | | | | | | * | | | Fix handling of arithmetic on token gas in confirm-send-token. | Dan | 2017-10-20 | 3 | -21/+47 |
| | | | | | | | | | * | | Get currency from state in account details, send and confirm screens. | Dan | 2017-10-20 | 14 | -66/+89 |
| | | | | | | | | | * | | Min and default gas price, limit, total; comments out code for gas slider. | Dan | 2017-10-20 | 4 | -18/+47 |
| | | | | | | | | |/ / |
|
| | | | | | | | | * | | Amount field shows insufficient funds error based on amoutn + gas total. | Dan | 2017-10-20 | 2 | -7/+22 |
| | | | | | | | | * | | Fixes mobile styling. | Dan | 2017-10-20 | 4 | -56/+103 |
| | | | | | | | | * | | Merge pull request #2402 from chikeichan/merge | Chi Kei Chan | 2017-10-19 | 37 | -161/+965 |
| | | | | | | | | |\ \ |
|
| | | | | | | | | | * | | Merge master to NewUI-flat | Chi Kei Chan | 2017-10-19 | 1 | -0/+26 |
| | | | | | | | | | * | | Merge branch 'NewUI-flat' into merge | Chi Kei Chan | 2017-10-19 | 182 | -2367/+23624 |
| | |_|_|_|_|_|_|_|/| |
|/| | | | | | | |/ / |
|
| | | | | | | | | * | | Fix cancel button on send screen. | Dan | 2017-10-19 | 1 | -0/+1 |
| | | | | | | | | * | | Turn off feature toggle. | Dan | 2017-10-19 | 1 | -8/+10 |
| | | | | | | | | * | | Handling to and amount errors. | Dan | 2017-10-19 | 8 | -28/+151 |
| | | | | | | | | * | | Move all of send state to metamask state. | Dan | 2017-10-19 | 8 | -61/+155 |
| | | | | | | | | * | | Get from and update addressBook in send-v2 | Dan | 2017-10-19 | 4 | -9/+29 |
| | | | | | | | | * | | Breaks send-v2 down into renderable functions. | Dan | 2017-10-19 | 1 | -102/+159 |
| | | | | | | | | * | | Network dropdown update | Chi Kei Chan | 2017-10-18 | 1 | -1/+2 |
| | | | | | | | | * | | New Account modal | Chi Kei Chan | 2017-10-18 | 10 | -65/+132 |
| | | | | | | | | * | | wip | Chi Kei Chan | 2017-10-18 | 8 | -11/+159 |
| | | | | | | | | * | | Enable send-v2 functionality. | Dan | 2017-10-18 | 5 | -9/+72 |
| | | | | | | | | * | | Fix Import Account link not hiding sidebar | Alexander Tseung | 2017-10-16 | 2 | -3/+9 |
| | | | | | | | | * | | Customize Gas connected to state | Dan | 2017-10-16 | 8 | -27/+147 |
| | | | | | | | | * | | Prevent adding already added tokens (#2362) | Alexander Tseung | 2017-10-14 | 2 | -4/+39 |
| | | | | | | | | * | | Fix cursor on unclickable transactions (#2356) | Alexander Tseung | 2017-10-14 | 1 | -3/+9 |
| | | | | | | | | * | | Fix exception thrown when tokens is null (#2355) | Alexander Tseung | 2017-10-14 | 1 | -1/+2 |
| | | | | | | | | * | | Fix Localhost 8545 option in network dropdown (#2357) | Alexander Tseung | 2017-10-14 | 1 | -1/+1 |
| | | | | | | | | * | | Fix styling for Accept buttons in notices (#2358) | Alexander Tseung | 2017-10-14 | 1 | -1/+1 |
| | | | | | | | | * | | Fix SELECT TYPE dropdown changing sizes based on error message (#2359) | Alexander Tseung | 2017-10-14 | 1 | -2/+4 |
| | | | | | | | | * | | Fix click to copy for private key not working (#2360) | Alexander Tseung | 2017-10-14 | 3 | -7/+11 |
| | | | | | | | | * | | [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state... | Dan J Miller | 2017-10-14 | 22 | -132/+915 |
| | | | | | | | | * | | Adding Account Dropdown V2 | Chi Kei Chan | 2017-10-13 | 11 | -25/+256 |
| | | | | | | | | * | | Various styling fixes | Chi Kei Chan | 2017-10-13 | 16 | -85/+170 |
| | | | | | | | | * | | Refactor amount input: dynamic input width with vanilla js. | Dan | 2017-10-13 | 2 | -42/+32 |
| | | | | | | | | * | | Send v2 amount unit moves correctly. | Dan | 2017-10-13 | 1 | -1/+19 |
| | | | | | | | | * | | Adds amount and gas field to sendV2. | Dan | 2017-10-13 | 6 | -8/+187 |
| | | | | | | | | * | | Send v2 to autocomplete. | Dan | 2017-10-11 | 3 | -2/+94 |
| | | | | | | | | * | | Token menu ellipsis alignment | Chi Kei Chan | 2017-10-11 | 1 | -3/+8 |
| | | | | | | | | * | | Reduce header shadow on mobile | Chi Kei Chan | 2017-10-11 | 2 | -1/+5 |
| | | | | | | | | * | | Fix recipient on send token | Chi Kei Chan | 2017-10-11 | 2 | -2/+5 |
| | | | | | | | | * | | Confirm Token and Confirm Contract v2 | Chi Kei Chan | 2017-10-11 | 3 | -38/+43 |
| | | | | | | | | * | | Confirm eth v2 | Chi Kei Chan | 2017-10-11 | 6 | -200/+184 |
| | | | | | | | | * | | Refactor 'rendersingleidentity' to a stand alone account-list-item component. | Dan | 2017-10-10 | 5 | -92/+105 |
| | | | | | | | | * | | UI for readonly from component. From dropdown opening and closing. Mockdata. | Dan | 2017-10-10 | 4 | -1/+226 |
| | | | | | | | | * | | Conversion util can invert conversion rate | Dan | 2017-10-09 | 2 | -9/+18 |
| | | | | | | | | * | | Adds checkFeatureToggle util. | Dan | 2017-10-09 | 2 | -4/+13 |
| | | | | | | | | * | | UI for send screen container without form rows. | Dan | 2017-10-09 | 5 | -2/+218 |
| | | | | | | | | * | | Edit account modal shows and allows editing of name from props, not just plac... | Dan | 2017-10-09 | 1 | -2/+3 |
| | | | | | | | | * | | Clear selected token when changing network. | Dan | 2017-10-09 | 1 | -4/+11 |
| | | | | | | | | * | | Removes old/second setProviderType method from before merge (commit bd99bc2e) | Dan | 2017-10-05 | 1 | -9/+0 |
| | | | | | | | | * | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-10-04 | 20 | -232/+238 |
| | | | | | | | | |\ \
| | | | | |_|_|_|/ /
| | | | |/| | | | | |
|
| | | | | | | | | * | | Enables remove token and ensures add/remove update the list without need for ... | Dan | 2017-10-04 | 7 | -14/+72 |
| | | | | | | | | * | | Add needed iterator in tx-list and path to account in selectors. | Dan | 2017-10-03 | 2 | -2/+7 |
| | | | | | | | | * | | Hide token confirmation modal ui | Dan | 2017-10-03 | 5 | -3/+170 |
| | | | | | | | | * | | Token menu ui. | Dan | 2017-10-02 | 3 | -0/+103 |
| | | | | | | | | * | | Shapeshift deposit tx modal. | Dan | 2017-10-02 | 7 | -43/+65 |
| | | | | | | | | * | | Enables the old shapeshift UI within new ui. | Dan | 2017-10-02 | 3 | -3/+9 |
| | | | | | | | | * | | Query for gas estimates | Chi Kei Chan | 2017-09-29 | 5 | -8/+35 |
| | | | | | | | | * | | Hide ShapeShift and Fix Modal Stylings | Chi Kei Chan | 2017-09-29 | 2 | -13/+52 |
| | | | | | | | | * | | Always set currency to USD on app mount | Chi Kei Chan | 2017-09-29 | 8 | -4/+21 |
| | | | | | | | | * | | Ensure sent token value is recognized as hex. | Dan | 2017-09-29 | 1 | -1/+1 |
| | | | | | | | | * | | Fix send of USD and backspacing amount to 0 | Dan | 2017-09-29 | 2 | -3/+7 |
| | | | | | | | | * | | Close sidebar on token selection. | Dan | 2017-09-29 | 2 | -4/+20 |
| | | | | | | | | * | | Close mobile sidebar when selecting 'Add token' from account options dropdown. | Dan | 2017-09-29 | 1 | -0/+2 |
| | | | | | | | | * | | Update yarn.lock | Chi Kei Chan | 2017-09-29 | 1 | -116/+249 |
| | | | | | | | | * | | Merge pull request #2201 from chikeichan/merge | Chi Kei Chan | 2017-09-28 | 49 | -1911/+2200 |
| | | | | | | | | |\ \ |
|
| | | | | | | | | | * | | Merge branch 'mmn' into merge | Chi Kei Chan | 2017-09-28 | 49 | -1911/+2200 |
| | | | | | | | | |/| | |
|
| | | | | | | | | | * | | Merge branch 'master' into mmn | Chi Kei Chan | 2017-09-28 | 49 | -1911/+2200 |
| | | | | | | | | |/| | |
|
| | | | | | | | | * | | | Use font-awesome icons for create and import account. | Dan | 2017-09-28 | 1 | -9/+5 |
| | | | | | | | | * | | | Makes styling fixes to account dropdown. | Dan | 2017-09-28 | 2 | -10/+12 |
| | | | | | | | | * | | | Keep privateKey out of state and clear it after closing export private key mo... | Dan | 2017-09-28 | 2 | -20/+40 |
| | | | | | | | | * | | | Adds a back button to export private key modal; connects account details to s... | Dan | 2017-09-28 | 5 | -6/+62 |
| | | | | | | | | * | | | Implement Confirm Deploy Contract screen | Chi Kei Chan | 2017-09-27 | 4 | -2/+357 |
| | | | | | | | | * | | | Update the correct values in state when estimates are received. | Dan | 2017-09-27 | 2 | -18/+15 |
| | | | | | | | | * | | | Gets gas and price estimates when send components mount. | Dan | 2017-09-27 | 3 | -42/+27 |
| | | | | | | | | * | | | Restore notification functionality | Dan | 2017-09-27 | 2 | -0/+14 |
| | | | | | | | | * | | | Return null if transaction.key is shapeshift | Chi Kei Chan | 2017-09-27 | 2 | -53/+18 |
| | | | | | | | | * | | | Connect export key modal to state and enable actions. | Dan | 2017-09-27 | 3 | -15/+104 |
| | | | | | | | | * | | | Merge pull request #2157 from danjm/MM-57-use-gas-estimator | Chi Kei Chan | 2017-09-26 | 3 | -29/+183 |
| | | | | | | | | |\ \ \ |
|
| | | | | | | | | | * \ \ | Merge branch 'NewUI-flat' into MM-57-use-gas-estimator | Chi Kei Chan | 2017-09-26 | 5 | -4/+104 |
| | | | | | | | | | |\ \ \
| | | | | | | | | |/ / /
| | | | | | | | |/| | | |
|
| | | | | | | | | * | | | | Remove unnecessary trailing comma. | Dan | 2017-09-26 | 1 | -1/+1 |
| | | | | | | | | * | | | | Select all in to and from of send screens, instead of clearing on focus. | Dan | 2017-09-26 | 2 | -15/+5 |
| | | | | | | | | * | | | | Able to change selections in to and from fields of send and send token. | Dan | 2017-09-26 | 2 | -2/+19 |
| | | | | | | | | * | | | | Export private key modal body ui. | Dan | 2017-09-26 | 3 | -1/+92 |
| | | | | | | | | | * | | | Send token now estimates gas and price. | Dan | 2017-09-26 | 1 | -8/+37 |
| | | | | | | | | | * | | | Refactor to store estimated gas and price in local state, return promise from... | Dan | 2017-09-26 | 3 | -81/+38 |
| | | | | | | | | | * | | | Estimate gasPrice and gasLimit in send screen. | Dan | 2017-09-26 | 3 | -7/+126 |
| | | | | | | | | | * | | | Update send token to handle errors onBlur events and prevent clicking send un... | Dan | 2017-09-26 | 1 | -12/+59 |
| | | | | | | | | | * | | | Handles errors with to field and renders warnings from backend in send token. | Dan | 2017-09-26 | 1 | -1/+1 |
| | | | | | | | | |/ / / |
|
| | | | | | | | | * | | | Exports private key modal opens from dropdown. | Dan | 2017-09-24 | 4 | -54/+110 |
| | | | | | | | | * | | | Add Confirm Send token screen | Chi Kei Chan | 2017-09-23 | 6 | -64/+489 |
| | | | | | | | | * | | | get identities from getState() instead of passing from caller, only set new a... | Dan | 2017-09-23 | 2 | -8/+9 |
| | | | | | | | | * | | | New account modal now allows for addition of account name. | Dan | 2017-09-23 | 3 | -7/+35 |
| | | | | | | | | * | | | Default class params to empty string in readonly-input | Dan | 2017-09-23 | 1 | -2/+2 |
| | | | | | | | | * | | | ReadOnlyInput component. | Dan | 2017-09-23 | 3 | -13/+34 |
| | | | | | | | | * | | | Open account details modal on buy -> direct deposit. | Dan | 2017-09-23 | 1 | -1/+11 |
| | | | | | | | | * | | | Client side error handling for from, to and amount fields in send.js | Dan | 2017-09-23 | 4 | -44/+184 |
| | | | | | | | | * | | | Refactor Confirmation Tx to render different screen | Chi Kei Chan | 2017-09-22 | 2 | -183/+163 |
| | | | | | | | | * | | | Integrate Add Token | Chi Kei Chan | 2017-09-22 | 6 | -255/+333 |
| | | | | | | | | * | | | Abstract account modal. | Dan | 2017-09-22 | 4 | -63/+96 |
| | | | | | | | | * | | | Confirm screen shows amount plus gas in total field | Dan | 2017-09-22 | 2 | -6/+29 |
| | | | | | | | | * | | | Clean up code in send.js | Dan | 2017-09-22 | 1 | -234/+193 |
| | | | | | | | | * | | | Handles errors with to field and renders warnings from backend in send token. | Dan | 2017-09-22 | 1 | -11/+17 |
| | | | | | | | | * | | | Add Token UI - hover/select state; fetch token address | Chi Kei Chan | 2017-09-21 | 3 | -19/+82 |
| | | | | | | | | * | | | Add Add Token UI; Add Fuzzy search for tokens | Chi Kei Chan | 2017-09-20 | 5 | -140/+458 |
| | | | | | | | | * | | | Buy Modal Styling | Chi Kei Chan | 2017-09-20 | 2 | -10/+17 |
| | | | | | | | | * | | | Ensure conversion util does not return insignificant trailing zeroes. | Dan | 2017-09-20 | 1 | -1/+1 |
| | | | | | | | | * | | | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 25 | -241/+150 |
| | | | | | | | | |\ \ \ |
|
| | | | | | | | | * \ \ \ | Merge branch 'master' into NewUI-flat | Chi Kei Chan | 2017-09-19 | 2 | -0/+10 |
| | | | | | | | | |\ \ \ \ |
|
| | | | | | | | | * \ \ \ \ | Merge pull request #2116 from chikeichan/nm | Chi Kei Chan | 2017-09-19 | 62 | -640/+5027 |
| | | | | | | | | |\ \ \ \ \ |
|
| | | | | | | | | | * | | | | | Fix Merge Problems; update yarn lock | Chi Kei Chan | 2017-09-19 | 2 | -49/+558 |
| | | | | | | | | | * | | | | | Merge branch 'master' into nm | Chi Kei Chan | 2017-09-19 | 61 | -591/+4469 |
| | | | | | | | | |/| | | | | |
|
| | | | | | | | | * | | | | | | Handle transaction totals in WEI in tx-list, send and pending. | Dan | 2017-09-16 | 4 | -2/+15 |
| | | | | | | | | * | | | | | | Ensures that new accounts are only created from the modal, and not when click... | Dan | 2017-09-16 | 3 | -5/+9 |
| | | | | | | | | * | | | | | | Clear token selection when changing account. | Dan | 2017-09-16 | 1 | -0/+1 |
| | | | | | | | | * | | | | | | Adds USD to token list. | Dan | 2017-09-16 | 2 | -3/+41 |
| | | | | | | | | * | | | | | | Show dollar sign before USD on account details page. | Dan | 2017-09-16 | 2 | -4/+6 |
| | | | | | | | | * | | | | | | Show loading on conf-tx until the pending tx is available. | Dan | 2017-09-15 | 1 | -0/+1 |
| | | | | | | | | * | | | | | | Make send token responsive; fix desktop send modal height | Chi Kei Chan | 2017-09-15 | 2 | -5/+25 |
| | | | | | | | | * | | | | | | Add responsive UI to send ether modal | Chi Kei Chan | 2017-09-15 | 6 | -13/+39 |
| | | | | | | | | * | | | | | | Style send ether screen | Chi Kei Chan | 2017-09-14 | 2 | -340/+93 |
| | | | | | | | | * | | | | | | Show token tx properly | Chi Kei Chan | 2017-09-14 | 4 | -38/+104 |
| | | | | | | | | * | | | | | | Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rate | Chi Kei Chan | 2017-09-14 | 6 | -56/+331 |
| | | | | | | | | * | | | | | | Fix send and pending. | Dan | 2017-09-14 | 2 | -2/+2 |
| | | | | | | | | * | | | | | | Stop setting 'currentCurrency' and use local state for active currency in sen... | Dan | 2017-09-14 | 5 | -27/+25 |
| | | | | | | | | * | | | | | | Enables Cancel button in confirmation screen. | Dan | 2017-09-14 | 2 | -2/+12 |
| | | | | | | | | * | | | | | | Send user to most recent pending transaction after sending a transaction. | Dan | 2017-09-14 | 1 | -2/+6 |
| | | | | | | | | * | | | | | | Fix saving/sending of amounts in USD | Dan | 2017-09-14 | 1 | -3/+9 |
| | | | | | | | | * | | | | | | Fixes the saving of transactions in send and display in tx-list with conversi... | Dan | 2017-09-14 | 3 | -9/+39 |
| | | | | | | | | * | | | | | | Reapply conversion utility changes and fix calls to utility in pending-tx. | Dan | 2017-09-14 | 3 | -50/+123 |
| | | | | | | | | * | | | | | | Add token exchange rates | Chi Kei Chan | 2017-09-13 | 8 | -14/+100 |
| | | | | | | | | * | | | | | | Improve styling in Confirmation Screen; Show decoded send token data | Chi Kei Chan | 2017-09-13 | 5 | -213/+234 |
| | | | | | | | | * | | | | | | Revert "Overhaul currency conversion utility and update calls to utility in p... | Chi Kei Chan | 2017-09-13 | 3 | -122/+51 |
| | | | | | | | | * | | | | | | Overhaul currency conversion utility and update calls to utility in pending-tx. | Dan | 2017-09-13 | 3 | -51/+122 |
| | | | | | | | | * | | | | | | [NewUI] Color tx-list-item text depending on transaction status. (#2050) | Dan J Miller | 2017-09-13 | 3 | -5/+33 |
| | | | | | | | | * | | | | | | Added signTokenTx; Adding token confirmation screen | Chi Kei Chan | 2017-09-12 | 6 | -15/+65 |
| | | | | | | | | * | | | | | | Add frontend validation to send-token | Chi Kei Chan | 2017-09-12 | 7 | -14/+119 |
| | | | | | | | | * | | | | | | [New-UI] Confirm Screen restyle and connect to state (#2042) | Dan J Miller | 2017-09-12 | 6 | -197/+429 |
| | | | | | | | | * | | | | | | Add buttons; handle back; add yarn.lock | Chi Kei Chan | 2017-09-12 | 9 | -42/+9862 |
| | | | | | | | | * | | | | | | Use transparent border for consistent size with and without border. | Dan | 2017-09-12 | 1 | -1/+1 |
| | | | | | | | | * | | | | | | Cleaner css for circle icon. | Dan | 2017-09-12 | 3 | -24/+28 |
| | | | | | | | | * | | | | | | Replace checkmark with font-awesome equivalent. | Dan | 2017-09-12 | 1 | -6/+6 |
| | | | | | | | | * | | | | | | Adds title, divider and descriptive text to network dropdown. | Dan | 2017-09-12 | 2 | -0/+45 |
| | | | | | | | | * | | | | | | Highlighted circle icons for the network menu. | Dan | 2017-09-12 | 5 | -10/+99 |
| | | | | | | | | * | | | | | | Style send token screen | Chi Kei Chan | 2017-09-11 | 7 | -31/+57 |
| | | | | | | | | * | | | | | | Use width 100 and margin for the new modal input. | Dan | 2017-09-09 | 1 | -1/+2 |
| | | | | | | | | * | | | | | | New account modal top right close button working. | Dan | 2017-09-09 | 1 | -1/+3 |
| | | | | | | | | * | | | | | | Tweak styles in new-account-modal. | Dan | 2017-09-09 | 2 | -9/+18 |
| | | | | | | | | * | | | | | | Fix .filter token tx | Chi Kei Chan | 2017-09-08 | 1 | -1/+2 |
| | | | | | | | | * | | | | | | Re-enable Contract tx list item | Chi Kei Chan | 2017-09-08 | 2 | -19/+8 |
| | | | | | | | | * | | | | | | Fix css merge conflicts | Chi Kei Chan | 2017-09-08 | 2 | -2/+2 |
| | | | | | | | | * | | | | | | Modify readonly value in for input in qr-code. | Dan | 2017-09-08 | 1 | -1/+1 |
| | | | | | | | | * | | | | | | Account-detail address is a readonly input. | Dan | 2017-09-08 | 2 | -2/+7 |
| | | | | | | | | * | | | | | | Close button in account-details-modal working. | Dan | 2017-09-08 | 1 | -1/+3 |
| | | | | | | | | * | | | | | | Remove highlight on modal | Dan | 2017-09-08 | 1 | -0/+4 |
| | | | | | | | | * | | | | | | Touch up style of account-details-modal. | Dan | 2017-09-08 | 3 | -12/+27 |
| | | | | | | | | * | | | | | | Modify status copy for status === 'unapproved' | Dan | 2017-09-08 | 1 | -0/+1 |
| | | | | | | | | * | | | | | | Link user from transaction list to etherscan if they have a transaction hash. | Dan | 2017-09-08 | 3 | -4/+34 |
| | | | | | | | | * | | | | | | Use ternary operator instead of two conditionals. | Dan | 2017-09-08 | 1 | -1/+1 |
| | | | | | | | | * | | | | | | Improve tx-list item hover scss. | Dan | 2017-09-08 | 1 | -3/+3 |
| | | | | | | | | * | | | | | | Create tx-list-item component. | Dan | 2017-09-08 | 3 | -74/+123 |
| | | | | | | | | * | | | | | | Show confirm transaction screen when clicking a pending transaction in the list. | Dan | 2017-09-08 | 4 | -7/+20 |
| | | | | | | | | * | | | | | | Remove default to confirm screen on login. | Dan | 2017-09-08 | 2 | -10/+0 |
| | | | | | | | | * | | | | | | Fix font sizes on Send Token | Chi Kei Chan | 2017-09-07 | 1 | -3/+3 |
| | | | | | | | | * | | | | | | Send Token screen partial UI | Chi Kei Chan | 2017-09-07 | 7 | -3/+283 |
| | | | | | | | | * | | | | | | Add Contract Tx List Item; Update Token Tx on select | Chi Kei Chan | 2017-09-07 | 8 | -58/+96 |
| | | | | | | | | * | | | | | | Show token balance and identicon | Chi Kei Chan | 2017-09-07 | 7 | -57/+90 |
| | | | | | | | | * | | | | | | Adding Token transaction detail screen | Chi Kei Chan | 2017-09-06 | 11 | -81/+256 |
| | | | | | | | | * | | | | | | Fix token list | Chi Kei Chan | 2017-09-06 | 2 | -15/+24 |
| | | | | | | | | * | | | | | | Fix html height | Chi Kei Chan | 2017-09-06 | 1 | -2/+2 |
| | | | | | | | | * | | | | | | Implement tokens list UI | Chi Kei Chan | 2017-09-06 | 10 | -107/+122 |
| | | | | | | | | * | | | | | | Use .entries() instead of .keys(), and use more destructuring, for simpler code. | Dan | 2017-09-06 | 1 | -9/+8 |
| | | | | | | | | * | | | | | | Send tx working; user is taken to confirm page with correct transaction infor... | Dan | 2017-09-06 | 2 | -38/+66 |
