aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Focus amount input when click anywhere in amount field containerDan2017-11-112-0/+4
* Rounding of vals < 0.01 in currency display consistent with master.Dan2017-11-112-2/+3
* LintingThomas Huang2017-11-115-9/+9
* Network loading does not block network loading.Dan2017-11-105-16/+27
* darker backdrop style for modalcjeria2017-11-101-1/+1
* Merge pull request #2549 from danjm/NewUI-flat-send-amount-fixesDaniel Tsui2017-11-082-20/+29
|\
| * Calculate max amount for send ether based on minimum gas total.Dan2017-11-082-10/+1
| * Fix amount max for sending token.Dan2017-11-082-10/+28
|/
* Merge pull request #2510 from danjm/NewUI-flat-token-balanceDaniel Tsui2017-11-0817-82/+387
|\
| * Add currency-input component to correct send amount behaviour and move curren...Dan2017-11-083-32/+103
| * Lint fixes.Dan2017-11-075-15/+3
| * Allow sending 0 eth or tokensDan2017-11-071-3/+3
| * Set gas price allows for WEI precision.Dan2017-11-074-10/+30
| * Insufficient balance warning in gas customizer works for send tokenDan2017-11-071-3/+1
| * Adds max amount feature for send tokenDan2017-11-071-5/+12
| * Adds max amount feature for send-etherDan2017-11-075-2/+65
| * Token balance in send state; validating sufficient tokens, validation updates...Dan2017-11-0711-33/+191
|/
* Merge pull request #2530 from MetaMask/uatChi Kei Chan2017-11-0354-1019/+952
|\
| * Update classnames for integration tests and add output/index.css to integrati...Dan2017-11-033-38/+25
| * Get current NewUI-flat tests working.Dan2017-11-036-137/+113
| * Merge pull request #2519 from danjm/NewUI-flat-lintfixesThomas Huang2017-11-0357-986/+1158
| |\
| | * More lint fixesDan2017-11-0233-115/+108
| | * Lint fixes for NewUI-flat.Dan2017-11-0235-726/+703
| * | 4.0.3kumavis2017-10-261-1/+1
| * | Merge branch 'NewUI-flat' into uatChi Kei Chan2017-10-26117-953/+5652
| |\ \
| * | | 4.0.2kumavis2017-10-211-1/+1
| * | | Merge branch 'NewUI-flat' into uatChi Kei Chan2017-10-2111-62/+74
| |\ \ \
| * | | | 4.0.1kumavis2017-10-211-1/+1
* | | | | Fixes width of from and to dropdowns in extension and on mobile views.Dan2017-11-032-2/+3
| |_|_|/ |/| | |
* | | | Add utility for getting token data; get token data in tx-list even if token h...Dan2017-10-284-29/+89
* | | | Provide default new account nameAlexander Tseung2017-10-271-63/+78
* | | | Fix Settings/Info screen being visible on logout (#2490)Alexander Tseung2017-10-272-6/+43
* | | | Correct rendering of conversions when conversion rate is a token. (#2498)Dan J Miller2017-10-273-20/+52
* | | | Clear import error state on logout.Dan2017-10-272-0/+5
* | | | eth_sign warning colorDan2017-10-272-3/+18
* | | | Change min gas price to 0.1 GWEIDan2017-10-277-31/+68
* | | | Fix input border rendering on mobileAlexander Tseung2017-10-271-0/+1
| |_|/ |/| |
* | | Add Token styling fixChi Kei Chan2017-10-262-5/+29
* | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-264-10/+20
|\ \ \
| * \ \ Merge pull request #2100 from ChainsawBaby/patch-1Kevin Serrano2017-10-262-3/+8
| |\ \ \
| | * | | Bump ChangelogKevin Serrano2017-10-261-0/+1
| | * | | Resolving that ugly merge.Kevin Serrano2017-10-261-3/+7
| |/ / /
| * | | Merge pull request #2476 from MetaMask/100MweiMinGasPriceDan Finlay2017-10-263-12/+16
| |\ \ \
| | * | | Add labels to clarify warning.Kevin Serrano2017-10-261-4/+4
| | * | | Account for non-submitted mins and maxKevin Serrano2017-10-261-2/+2
| | * | | Add clarifying comment about wei conversion.Kevin Serrano2017-10-261-0/+1
| | * | | Cut out intermediary wei steps.Kevin Serrano2017-10-261-4/+2
| | * | | Remove unneeded toString conversions.Kevin Serrano2017-10-261-2/+2
| | * | | Move upsize conversions for input warning at front of fn.Kevin Serrano2017-10-261-3/+5
| | * | | Fix mismatched decimal/hex conversion in pending-txKevin Serrano2017-10-261-1/+1
| | * | | Remove css build bundle from uatDan Finlay2017-10-261-4491/+0
| | * | | Update changelogDan Finlay2017-10-261-1/+1
| | * | | Resolve merge conflict.Kevin Serrano2017-10-253-1/+4493
| | |\ \ \
| | | * | | Reduce minimum gas price to 100 MWEIDan Finlay2017-10-253-7/+4499
| | * | | | Fix for gas price to be lowered.Kevin Serrano2017-10-252-11/+13
| | |/ / /
| * | | | Merge pull request #2478 from MetaMask/mascaraHeadersFixFrankie2017-10-261-1/+1
| |\ \ \ \
| | * | | | Fix X-Frame-Options for mascaratmashuang2017-10-251-1/+1
| |/ / / /
* | | | | Allow editing account name in account details modalAlexander Tseung2017-10-267-64/+149
* | | | | Sign Typed Request styling fixesChi Kei Chan2017-10-263-10/+18
* | | | | Signature request fixes.Dan2017-10-264-26/+30
* | | | | Fix Import an Account link not working in Create Account modalAlexander Tseung2017-10-261-6/+10
* | | | | Signature RequestDan2017-10-267-60/+613
* | | | | Fix send token bug.Dan2017-10-261-1/+2
* | | | | Adds revert feature to customize gas modal.Dan2017-10-262-15/+16
* | | | | Add Info sectionAlexander Tseung2017-10-265-6/+173
* | | | | Add GWEI to gas price unitChi Kei Chan2017-10-252-2/+1
* | | | | From and To field cannot be the sameChi Kei Chan2017-10-251-2/+8
* | | | | Fix gas input styling on mobile viewChi Kei Chan2017-10-254-14/+34
* | | | | Update Import Account Help LinkChi Kei Chan2017-10-251-1/+1
* | | | | Show home page when metafox is clickedChi Kei Chan2017-10-252-4/+12
* | | | | Fix alignment on right arrow of confirm tx screensChi Kei Chan2017-10-255-4/+12
* | | | | Fix styling on notification viewChi Kei Chan2017-10-253-3/+12
* | | | | Add ellipsis to super long account nameChi Kei Chan2017-10-251-1/+9
* | | | | Change download to show in Export Private Key ModalChi Kei Chan2017-10-251-2/+2
* | | | | Remove memo inputChi Kei Chan2017-10-252-7/+18
* | | | | Add BuyEtherWidget for future use in buy ether modalChi Kei Chan2017-10-251-0/+197
* | | | | Styling and UX changes on sidebarChi Kei Chan2017-10-252-11/+14
* | | | | Add token list and buy modal alignment fixChi Kei Chan2017-10-253-15/+36
* | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2521-48/+60
|\| | | |
| * | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-2522-49/+55
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix lint warningsDaijiro Wachi2017-10-2220-49/+47
| | * | | Add lint:fix command to gulp and npm-scriptsDaijiro Wachi2017-10-222-0/+8
* | | | | Hide sidebar on add tokenChi Kei Chan2017-10-252-2/+5
* | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2541-163/+2966
|\| | | |
| * | | | Merge pull request #1990 from chikeichan/firsttimeflowThomas Huang2017-10-2536-64/+12257
| |\ \ \ \
| | * | | | Add error messages when importing an accounttmashuang2017-10-242-17/+24
| | * | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-2435-63/+12249
| |/| | | |
| | * | | | Add Import With Seed PhraseChi Kei Chan2017-10-216-19/+156
| | * | | | Add mobile responsivenessChi Kei Chan2017-10-212-177/+192
| | * | | | Remove import optionChi Kei Chan2017-10-211-1/+3
| | * | | | Fix importChi Kei Chan2017-10-211-21/+31
| | * | | | Fix capitializationChi Kei Chan2017-10-211-1/+1
| | * | | | Add Integration TestsChi Kei Chan2017-10-214-15/+61
| | * | | | Fixing integraiton testChi Kei Chan2017-10-212-3/+130
| | * | | | Fix unit testChi Kei Chan2017-10-212-2/+3
| | * | | | Fix linterChi Kei Chan2017-10-2110-123/+245
| | * | | | ShapeShift IntegrationChi Kei Chan2017-10-216-90/+287
| | * | | | Add ShapeShift UIChi Kei Chan2017-10-216-80/+353
| | * | | | Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-218-29/+9558
| | * | | | Add missing presetsChi Kei Chan2017-10-211-0/+1
| | * | | | Move "Skip this step" to side panelJacky Chan2017-10-212-12/+17
| | * | | | Disable CTA unless notice is scrolled to bottomJacky Chan2017-10-212-4/+29
| | * | | | Fix Buy Ether flowJacky Chan2017-10-212-2/+5
| | * | | | Shuffle tokensJacky Chan2017-10-214-25/+44
| | * | | | Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-2110-74/+125
| | * | | | Hide Warning after changing import optionsJacky Chan2017-10-212-5/+10
| | * | | | Implement Buy Ether Screen UIJacky Chan2017-10-213-8/+318
| | * | | | Implement Import Account ScreenJacky Chan2017-10-215-16/+328
| | * | | | Add BackupPhraseScreenJacky Chan2017-10-216-14/+406
| | * | | | Add NoticeScreenJacky Chan2017-10-214-20/+119
| | * | | | Add UniqueImageScreenJacky Chan2017-10-2110-64/+329
| | * | | | Add BreadcrumbsJacky Chan2017-10-213-2/+47
| | * | | | CreatePasswordScreenJacky Chan2017-10-214-3/+105
| | * | | | Adding CreatePasswordScreenJacky Chan2017-10-216-2/+95
| | |/ / /
| * | | | Merge pull request #2429 from MetaMask/i2428-AltEnsTldsFrankie2017-10-244-2/+13
| |\ \ \ \
| | * | | | Try to fix intermittent test failure in NonceTracker testsDan Finlay2017-10-231-0/+4
| | * | | | Add support for alternative ENS TLDsDan Finlay2017-10-232-1/+3
| | * | | | Version 3.11.2v3.11.2Dan Finlay2017-10-222-1/+6
| |/ / / /
| * | | | Merge pull request #2423 from MetaMask/json-rpc-fixThomas Huang2017-10-221-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Temporarily reversal of json-rpc-engineKevin Serrano2017-10-221-1/+1
| |/ / /
| * | | Merge pull request #2419 from MetaMask/Version-3.11.1Thomas Huang2017-10-212-1/+3
| |\ \ \
| | * | | Version 3.11.1v3.11.1Dan Finlay2017-10-212-1/+3
| |/ / /
| * | | Merge pull request #2401 from MetaMask/filter-fix-maybeFrankie2017-10-212-1/+2
| |\ \ \
| | * | | changelog entry for filter fixkumavis2017-10-211-0/+1
| | * | | Merge branch 'master' of github.com:MetaMask/metamask-extension into filter-f...kumavis2017-10-218-32/+99
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #2412 from MetaMask/x-frame-optionskumavis2017-10-211-1/+1
| |\ \ \ \
| | * | | | mascara - set x-frame-options header to DENYfrankiebee2017-10-201-1/+1
| | | * | | deps - bump eth-json-rpc-filters for log filter fixkumavis2017-10-211-1/+1
| | | * | | deps - bump eth-json-rpc-filterskumavis2017-10-191-1/+1
* | | | | | Merge pull request #2435 from danjm/NewUI-flat-disable-send-next-in-errorChi Kei Chan2017-10-251-8/+3
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'NewUI-flat' into NewUI-flat-disable-send-next-in-errorDaniel Tsui2017-10-2429-188/+489
| |\ \ \ \ \ \
| * | | | | | | Disable send-v2 next button if in errorDan2017-10-242-9/+18
* | | | | | | | Simply logic for rendering matching accounts in to-autocomplete dropdown.Dan2017-10-251-12/+4
* | | | | | | | Style dropdown of to-autocomplete.Dan2017-10-255-39/+136
| |/ / / / / / |/| | | | | |
* | | | | | | Fix mobile add token buttonChi Kei Chan2017-10-243-5/+7
* | | | | | | Disable network dropdown on conf tx screenChi Kei Chan2017-10-243-9/+32
* | | | | | | Change clickable area for account detail; change network dot sizeChi Kei Chan2017-10-243-6/+14
* | | | | | | Fix styling in private key modalChi Kei Chan2017-10-242-1/+1
* | | | | | | Add caret to Add Token toggleChi Kei Chan2017-10-242-2/+16
* | | | | | | Add "Add Token" button to side barChi Kei Chan2017-10-242-0/+18
* | | | | | | Fix clickable area on logoutChi Kei Chan2017-10-241-2/+3
* | | | | | | Account menu white check markChi Kei Chan2017-10-245-8/+34
* | | | | | | New Sidebar upliftChi Kei Chan2017-10-243-66/+93
* | | | | | | Change LOOSE label to IMPORTEDChi Kei Chan2017-10-243-2/+3
* | | | | | | Remove Current Provider info from SettingsAlexander Tseung2017-10-241-1/+1
* | | | | | | Use classnames library and disabled attribute on 'Next' button in send-v2Dan2017-10-241-3/+8
* | | | | | | Improve customize gas modal error handlingDan2017-10-248-59/+230
* | | | | | | Disable send-v2 next button if in errorDan2017-10-242-9/+18
* | | | | | | Cleaner implementation of currency-display input.Dan2017-10-242-22/+24
* | | | | | | Fix settings styling on mobile viewAlexander Tseung2017-10-241-0/+7
* | | | | | | Update token menu cssChi Kei Chan2017-10-243-10/+11
|/ / / / / /
* | | | | | Merge pull request #2433 from danjm/NewUI-flat-precision-improvementsChi Kei Chan2017-10-242-3/+5
|\ \ \ \ \ \
| * | | | | | Improve precision in send and confirm.Dan2017-10-242-3/+5
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #2434 from danjm/NewUI-flat-clear-send-stateChi Kei Chan2017-10-244-7/+31
|\ \ \ \ \ \
| * | | | | | Clear send state on cancelling and signing.Dan2017-10-244-7/+31
| |/ / / / /
* | | | | | Merge pull request #2431 from alextsg/nu-2406Chi Kei Chan2017-10-243-4/+4
|\ \ \ \ \ \
| * | | | | | Change all "Buy" to "Deposit"Alexander Tseung2017-10-233-4/+4
| |/ / / / /
* | | | | | Merge pull request #2430 from alextsg/cb-130Chi Kei Chan2017-10-2410-287/+596
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update settings screen to new UIAlexander Tseung2017-10-2310-287/+596
|/ / / / /
* | | | | Fix Conversions bugs; Fiat value bugsChi Kei Chan2017-10-215-9/+24
* | | | | Add resiliency to confirm-send-tokenChi Kei Chan2017-10-211-5/+5
* | | | | Merge pull request #2410 from alextsg/nu-2280Chi Kei Chan2017-10-214-46/+38
|\ \ \ \ \
| * | | | | Fix loading animation not showing on network changeAlexander Tseung2017-10-204-46/+38
* | | | | | Merge pull request #2413 from danjm/NewUI-flat-fix-addtoken-searchChi Kei Chan2017-10-211-1/+4
|\ \ \ \ \ \
| * | | | | | Only show erc20 tokens in add token search.Dan2017-10-201-1/+3
| * | | | | | Fixes add token search.Dan2017-10-201-0/+1
| |/ / / / /
* | | | | | Merge pull request #2418 from danjm/NewUI-flat-fix-confirm-tokenChi Kei Chan2017-10-211-2/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fixes regression in confirm-send-tokenDan2017-10-211-2/+4
|/ / / / /
* | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-217-30/+97
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVaultThomas Huang2017-10-217-29/+96
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch 'master' into i2348-SelectAccountOnNewVaultThomas Huang2017-10-201-2/+2
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #2409 from chikeichan/fix-account-creationkumavis2017-10-201-1/+1
| |\ \ \
| | * | | Update eth-keyring-controller dependencyChi Kei Chan2017-10-201-1/+1
| |/ / /
| | * | LintedDan Finlay2017-10-202-2/+1
| | * | Fix bug where new account was not immediately selectedDan Finlay2017-10-201-3/+14
| | * | Allow computed balances to enumerate its own viewDan Finlay2017-10-201-2/+3
| | * | Patch sandwich-expando for security updateDan Finlay2017-10-201-1/+1
| | * | Fix bug that breaks ui dev modeDan Finlay2017-10-191-1/+6
| | * | Remove account-tracker from keyringControllerDan Finlay2017-10-192-2/+1
| | * | Merge remote-tracking branch 'origin/master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-1912-105/+97
| | |\|
| | * | Make account tracking much more reactiveDan Finlay2017-10-192-12/+13
| | * | Make account tracking more reactiveDan Finlay2017-10-193-29/+33
| | * | Refresh computed balances controller when restoring vaultDan Finlay2017-10-192-1/+6
| | * | Add validation to balance constructorDan Finlay2017-10-191-0/+10
| | * | Stop tracking old account balances after restore vaultDan Finlay2017-10-191-0/+13
| | * | Merge branch 'master' into i2348-SelectAccountOnNewVaultDan Finlay2017-10-189-66/+6
| | |\ \
| | * | | Bump changelogDan Finlay2017-10-181-0/+1
| | * | | Promisify metamask-controller vault creating methodsDan Finlay2017-10-181-17/+10
| | * | | Select first account when restoring seedDan Finlay2017-10-181-3/+17
| | * | | Select first account on new vault creationDan Finlay2017-10-181-1/+12
* | | | | Fix network dropdown stylesChi Kei Chan2017-10-201-1/+1
* | | | | various styling fix on mobileChi Kei Chan2017-10-207-16/+47
* | | | | Fix selectorsChi Kei Chan2017-10-205-26/+80
* | | | | Merge pull request #2399 from danjm/MM-128-get-currentCurrency-from-stateChi Kei Chan2017-10-2014-67/+90
|\ \ \ \ \
| * \ \ \ \ Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-stateChi Kei Chan2017-10-203-22/+48
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Min and default gas price, limit, total; comments out code for gas slider.Dan2017-10-204-18/+47
* | | | | | Identicon in send token show who you are sending to, not the token's identicon.Dan2017-10-201-3/+3
* | | | | | Fix handling of arithmetic on token gas in confirm-send-token.Dan2017-10-203-21/+47
| * | | | | Get currency from state in account details, send and confirm screens.Dan2017-10-2014-66/+89
| * | | | | Min and default gas price, limit, total; comments out code for gas slider.Dan2017-10-204-18/+47
|/ / / / /
* | | | | Amount field shows insufficient funds error based on amoutn + gas total.Dan2017-10-202-7/+22
* | | | | Fixes mobile styling.Dan2017-10-204-56/+103
* | | | | Merge pull request #2402 from chikeichan/mergeChi Kei Chan2017-10-1937-161/+965
|\ \ \ \ \
| * | | | | Merge master to NewUI-flatChi Kei Chan2017-10-191-0/+26
| * | | | | Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-19182-2367/+23624
| |\ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
* | | | | Fix cancel button on send screen.Dan2017-10-191-0/+1
* | | | | Turn off feature toggle.Dan2017-10-191-8/+10
* | | | | Handling to and amount errors.Dan2017-10-198-28/+151
* | | | | Move all of send state to metamask state.Dan2017-10-198-61/+155
* | | | | Get from and update addressBook in send-v2Dan2017-10-194-9/+29
* | | | | Breaks send-v2 down into renderable functions.Dan2017-10-191-102/+159
* | | | | Network dropdown updateChi Kei Chan2017-10-181-1/+2
* | | | | New Account modalChi Kei Chan2017-10-1810-65/+132
* | | | | wipChi Kei Chan2017-10-188-11/+159
* | | | | Enable send-v2 functionality.Dan2017-10-185-9/+72
* | | | | Fix Import Account link not hiding sidebarAlexander Tseung2017-10-162-3/+9
* | | | | Customize Gas connected to stateDan2017-10-168-27/+147
* | | | | Prevent adding already added tokens (#2362)Alexander Tseung2017-10-142-4/+39
* | | | | Fix cursor on unclickable transactions (#2356)Alexander Tseung2017-10-141-3/+9
* | | | | Fix exception thrown when tokens is null (#2355)Alexander Tseung2017-10-141-1/+2
* | | | | Fix Localhost 8545 option in network dropdown (#2357)Alexander Tseung2017-10-141-1/+1
* | | | | Fix styling for Accept buttons in notices (#2358)Alexander Tseung2017-10-141-1/+1
* | | | | Fix SELECT TYPE dropdown changing sizes based on error message (#2359)Alexander Tseung2017-10-141-2/+4
* | | | | Fix click to copy for private key not working (#2360)Alexander Tseung2017-10-143-7/+11
* | | | | [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state...Dan J Miller2017-10-1422-132/+915
* | | | | Adding Account Dropdown V2Chi Kei Chan2017-10-1311-25/+256
* | | | | Various styling fixesChi Kei Chan2017-10-1316-85/+170
* | | | | Refactor amount input: dynamic input width with vanilla js.Dan2017-10-132-42/+32
* | | | | Send v2 amount unit moves correctly.Dan2017-10-131-1/+19
* | | | | Adds amount and gas field to sendV2.Dan2017-10-136-8/+187
* | | | | Send v2 to autocomplete.Dan2017-10-113-2/+94
* | | | | Token menu ellipsis alignmentChi Kei Chan2017-10-111-3/+8
* | | | | Reduce header shadow on mobileChi Kei Chan2017-10-112-1/+5
* | | | | Fix recipient on send tokenChi Kei Chan2017-10-112-2/+5
* | | | | Confirm Token and Confirm Contract v2Chi Kei Chan2017-10-113-38/+43
* | | | | Confirm eth v2Chi Kei Chan2017-10-116-200/+184
* | | | | Refactor 'rendersingleidentity' to a stand alone account-list-item component.Dan2017-10-105-92/+105
* | | | | UI for readonly from component. From dropdown opening and closing. Mockdata.Dan2017-10-104-1/+226
* | | | | Conversion util can invert conversion rateDan2017-10-092-9/+18
* | | | | Adds checkFeatureToggle util.Dan2017-10-092-4/+13
* | | | | UI for send screen container without form rows.Dan2017-10-095-2/+218
* | | | | Edit account modal shows and allows editing of name from props, not just plac...Dan2017-10-091-2/+3
* | | | | Clear selected token when changing network.Dan2017-10-091-4/+11
* | | | | Removes old/second setProviderType method from before merge (commit bd99bc2e)Dan2017-10-051-9/+0
* | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-0420-232/+238
|\ \ \ \ \
* | | | | | Enables remove token and ensures add/remove update the list without need for ...Dan2017-10-047-14/+72
* | | | | | Add needed iterator in tx-list and path to account in selectors.Dan2017-10-032-2/+7
* | | | | | Hide token confirmation modal uiDan2017-10-035-3/+170
* | | | | | Token menu ui.Dan2017-10-023-0/+103
* | | | | | Shapeshift deposit tx modal.Dan2017-10-027-43/+65
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:14:58 +0800