aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'uat' into uat-master-011618Alexander Tseung2018-01-17351-3712/+39761
|\
| * [NewUI-flat] Fix gulp build (#2975)Dan J Miller2018-01-163-14/+90
| * Restore display of all unconfirmed transactions.Dan2018-01-161-34/+34
| * Fix send screen value inputAlexander Tseung2018-01-161-3/+11
| * Fix Hide Token modal styling, popup positioningAlexander Tseung2018-01-164-25/+15
| * Merge pull request #2964 from alextsg/cb-505cDan Finlay2018-01-161-1/+1
| |\
| | * Move blockies option to the bottom of SettingsAlexander Tseung2018-01-151-1/+1
| * | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946)Dan J Miller2018-01-163-26/+79
| * | Fix confirm Add Token button orderAlexander Tseung2018-01-131-4/+4
| * | Fix Add Token button order, stylingAlexander Tseung2018-01-132-14/+16
| * | Fix input box padding and select highlight in new account create and import p...Dan2018-01-132-1/+11
| * | New add account page with create and import options.Dan2018-01-1313-95/+475
| * | Merge pull request #2928 from alextsg/cb-388Chi Kei Chan2018-01-1324-234/+284
| |\ \
| | * \ Merge branch 'uat' into cb-388Chi Kei Chan2018-01-130-0/+0
| | |\ \ | | |/ / | |/| |
| | * | Merge branch 'uat' into cb-388Chi Kei Chan2018-01-1324-315/+758
| | |\ \ | | |/ / | |/| |
| * | | Fix styling in initializationAlexander Tseung2018-01-133-7/+21
| | |/ | |/|
| * | [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-1314-318/+717
| * | Fix margin styling for name and address in account detail section. (#2790)Dan J Miller2018-01-122-3/+4
| * | [NewUI] Build mascara with uglification and gzipping. (#2735)Dan J Miller2018-01-124-1/+15
| * | Fix logging out of old UI causing infinite spinner (#2914)Alexander Tseung2018-01-122-2/+6
| * | Fix padding of a hovered tx-list-item (#2859)Dan J Miller2018-01-121-1/+1
| | * Fix token balance colorAlexander Tseung2018-01-121-1/+3
| | * Fix lint errorsAlexander Tseung2018-01-121-1/+0
| | * Change styling for network dropdownAlexander Tseung2018-01-122-58/+25
| | * Update styling for buttons, font weightsAlexander Tseung2018-01-1216-125/+83
| | * Update main view stylingAlexander Tseung2018-01-1113-85/+198
| |/
| * 4.0.9kumavis2018-01-091-1/+1
| * ui - fix font path namekumavis2018-01-091-2/+2
| * Merge pull request #2848 from MetaMask/NewUI-flatAlexander Tseung2018-01-0412-1313/+2204
| |\
| | * Merge pull request #2845 from alextsg/NewUI-flat-4.0.5cAlexander Tseung2018-01-0410-14/+115
| | |\
| | | * Fix merge conflictAlexander Tseung2018-01-041-1/+0
| | | * Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-04338-3279/+38277
| | | |\ | | | |/ | | |/|
| | * | Fix sign typed dataAlexander Tseung2017-12-302-1298/+2088
| | * | Fix mascara first time flow button colorsAlexander Tseung2017-12-301-3/+3
| * | | Merge pull request #2799 from MetaMask/NewUI-flatAlexander Tseung2017-12-23193-659/+21414
| |\| |
| | * | Merge pull request #2798 from alextsg/NewUI-flat-4.0.5Alexander Tseung2017-12-233-8/+1
| | |\ \
| | | * \ Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-231-1/+1
| | | |\ \ | | | |/ / | | |/| |
| | * | | Update manifest.json version from 4.0.4 to 4.0.5 (#2797)Alexander Tseung2017-12-231-1/+1
| | | * | Merge branch 'NewUI-flat' into merge-masterAlexander Tseung2017-12-23337-2146/+36353
| | | |\ \ | | | |/ / | | |/| |
| | * | | Track usage of old and new UI (#2794)Alexander Tseung2017-12-239-17/+125
| | * | | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788)Dan J Miller2017-12-226-8/+12
| | * | | Merge pull request #2785 from danjm/merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-2120-79/+1114
| | |\ \ \
| | | * \ \ Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-210-0/+0
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-218-74/+98
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Clone transaction while editing instead of mutating object from state.Dan2017-12-211-6/+7
| | * | | | Add constanst for token transfer function signature.Dan2017-12-212-1/+5
| | * | | | Lint fixes.Dan2017-12-214-6/+2
| | * | | | Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-218-101/+85
| | * | | | Canceled, edited transactions show edited amount.Dan2017-12-215-2/+41
| | | * | | Merge branch 'master' into NewUI-flatDan2017-12-2120-79/+1114
| | |/| | |
| | * | | | [NewUI] Hide UI toggle in mascara (#2772)Dan J Miller2017-12-214-19/+23
| | * | | | Hide fiat values on account details screen when eth/token value is 0.Dan2017-12-213-3/+8
| | * | | | Hides the sidebar after the an account menu actions changes the screen behind...Dan2017-12-211-0/+6
| | * | | | Fix edit to field bug. (#2738)Dan J Miller2017-12-131-6/+7
| | * | | | Remove inline style.Dan2017-12-133-4/+4
| | * | | | Make transaction list and item more flexible.Dan2017-12-132-4/+4
| | * | | | Flex account-data-subsectionDan2017-12-133-19/+20
| | * | | | Fix old ui width in mobile and extension.Dan2017-12-132-24/+21
| | * | | | Fix height of login screenDan2017-12-131-27/+25
| | * | | | Fix isMascara and update yarn.lockChi Kei Chan2017-12-132-290/+464
| | * | | | Substitute isMascara check for explicit check if user is on mobile browser.Dan2017-12-132-13/+2
| | * | | | Hide open in browser button on mobile (but still show on extension); adds a f...Dan2017-12-133-3/+15
| | * | | | Adds button for opening app in main browser window in extension.Dan2017-12-134-0/+29
| | * | | | Delete uneeded files from old-ui.Dan2017-12-139-2106/+0
| | * | | | Merge pull request #2639 from alextsg/cb-372Chi Kei Chan2017-12-085-23/+28
| | |\ \ \ \
| | | * \ \ \ Merge branch 'NewUI-flat' into cb-372Chi Kei Chan2017-12-080-0/+0
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge branch 'NewUI-flat' into cb-372Chi Kei Chan2017-12-08162-152/+21152
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #2697 from danjm/MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-08138-43/+20783
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-080-0/+0
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-0828-109/+369
| | | |\ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Update max amount behaviour to meet new specs.Dan2017-12-076-15/+55
| | * | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-12-073-23/+88
| | |\ \ \ \ \ \
| | * | | | | | | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-0719-71/+226
| | | | * | | | | User is automatically added to new UI if they meet conditions at time of login.Dan2017-12-072-3/+47
| | | | * | | | | Show user notifications after switch between UIsDan2017-12-058-3/+185
| | | | * | | | | Update newUI UI for switching back to old UI.Dan2017-12-052-8/+24
| | | | * | | | | Lint fixDan2017-12-052-3/+3
| | | | * | | | | Css selected in background based on betaUI state.Dan2017-12-051-6/+15
| | | | * | | | | New-ui actions accomodates old-ui.Dan2017-12-052-8/+11
| | | | * | | | | Use newui actions in old-uiDan2017-12-0526-25/+28
| | | | * | | | | Add UI selectionDan2017-12-0511-51/+136
| | | | * | | | | Add old-ui directoryDan2017-12-05122-0/+20398
| | | |/ / / / / | | |/| | | | |
| | | | * | | | Update font weights to 300, remove animation from network dropdown, fix netwo...Alexander Tseung2017-12-025-23/+28
| | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #2615 from jpclark/NewUI-flatThomas Huang2017-11-2910-28/+494
| | |\ \ \ \ \
| | | * | | | | Remove useBlockie in props for renderThomas Huang2017-11-291-1/+1
| | | * | | | | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-273-2/+4
| | | * | | | | more eslint fixesJason Clark2017-11-262-2/+2
| | | * | | | | adding blockies lib to eslint ignore so it doesn't blow up the style checker ...Jason Clark2017-11-261-1/+2
| | | * | | | | making eslint happyJason Clark2017-11-263-7/+8
| | | * | | | | fixing blockies display issuesJason Clark2017-11-262-5/+9
| | | * | | | | swapped out ethereum-blockies lib for MEW blockies library, tightened up iden...Jason Clark2017-11-264-86/+413
| | | * | | | | tweaking stylingJason Clark2017-11-252-9/+27
| | | * | | | | incremental commit of working blockie componentJason Clark2017-11-253-18/+57
| | | * | | | | toggle wired up to preferences property storeJason Clark2017-11-256-26/+47
| | | * | | | | incremental commitClark, Jason (Contractor)2017-11-247-5/+58
| | * | | | | | Merge pull request #2618 from MetaMask/NewUI-flat-update-depsDan Finlay2017-11-296-17/+27
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Update babelify to 8.0.0Thomas Huang2017-11-281-1/+1
| | | * | | | | Update react, react-dom, and react-test-renderer to 15.6.2Thomas Huang2017-11-271-3/+3
| | | * | | | | Update ethjs-query to v0.3.1Thomas Huang2017-11-271-1/+1
| | | * | | | | Update Qunit to QunitJS v2.4.1Thomas Huang2017-11-271-1/+1
| | | * | | | | Update to Enzyme 3.2.0Thomas Huang2017-11-266-11/+21
| | |/ / / / /
| | * | | | | Remove unneeded type castingDan Finlay2017-11-211-1/+1
| | * | | | | Fix bug where gas param was not a stringDan Finlay2017-11-212-3/+3
| * | | | | | Merge pull request #2591 from MetaMask/NewUI-flatChi Kei Chan2017-11-1640-180/+780
| |\| | | | |
| | * | | | | Merge pull request #2590 from MetaMask/merge-masterChi Kei Chan2017-11-1610-17/+53
| | |\ \ \ \ \
| | | * | | | | Version BumpChi Kei Chan2017-11-162-1/+5
| | | * | | | | Merge branch 'master' into merge-masterChi Kei Chan2017-11-168-16/+48
| | |/| | | | |
| | * | | | | | Merge pull request #2587 from danjm/MM-281-currencyinput-in-gas-estimatorDaniel Tsui2017-11-162-5/+8
| | |\ \ \ \ \ \
| | | * | | | | | Gas customzier does not consider amount when sending tokens.Dan2017-11-161-1/+1
| | | * | | | | | Use currency input component in input number, to improve input behaviour in g...Dan2017-11-161-4/+7
| | |/ / / / / /
| | * | | | | | Show tokens with zero balanceAlexander Tseung2017-11-151-4/+1
| | * | | | | | Create single action for updating all of send in redux state.Dan2017-11-155-13/+38
| | * | | | | | Allow editing of token transactions.Dan2017-11-152-11/+91
| | * | | | | | Fix lint errors.Dan2017-11-154-18/+15
| | * | | | | | Allow editing of send ether.Dan2017-11-155-23/+131
| | * | | | | | Improve variable name.Dan2017-11-141-2/+2
| | * | | | | | Deposit button shows link to faucet on testnet networks.Dan2017-11-141-15/+23
| | * | | | | | Cursor pointer and hover background on from and to dropdown items.Dan2017-11-114-0/+15
| | * | | | | | 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
| | |\ \ \ \ \ \
| | * | | | | | | Fixes width of from and to dropdowns in extension and on mobile views.Dan2017-11-032-2/+3
| * | | | | | | | Merge pull request #2518 from MetaMask/mascara-first-screenFrankie2017-11-085-54/+110
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Merge remote-tracking branch 'origin/uat' into mascara-first-screenfrankiebee2017-11-0864-1161/+1296
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | 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
| | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | 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
| | | * | | | | | mascara:create-password - use less words in metamask explanationfrankiebee2017-11-071-1/+1
| | | * | | | | | mascara - fix words and enviroment varsfrankiebee2017-11-032-11/+7
| | | * | | | | | mascara:first-time - fix wordingfrankiebee2017-11-011-2/+2
| | | * | | | | | fix mascara buildfrankiebee2017-11-011-1/+1
| | | * | | | | | mascara:first-time - add alpha warning and a about metamask and mascotfrankiebee2017-11-012-47/+107
| | | * | | | | | ui - allow optional size for mascotfrankiebee2017-11-011-3/+3
| | |/ / / / / / | |/| | | | | |
| * | | | | | | 4.0.3kumavis2017-10-261-1/+1
| * | | | | | | Merge branch 'NewUI-flat' into uatChi Kei Chan2017-10-26117-953/+5652
| |\| | | | | |
| | * | | | | | Add Token styling fixChi Kei Chan2017-10-262-5/+29
| | * | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-264-10/+20
| | |\ \ \ \ \ \
| | * | | | | | | 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
| | |\ \ \ \ \ \ \
| | * | | | | | | | 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 #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
| | |/ / / / / / / / /
| * | | | | | | | | | 4.0.2kumavis2017-10-211-1/+1
| * | | | | | | | | | Merge branch 'NewUI-flat' into uatChi Kei Chan2017-10-2111-62/+74
| |\| | | | | | | | |
| | * | | | | | | | | 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
| | |/ / / / / / / / / /
| * / / / / / / / / / / 4.0.1kumavis2017-10-211-1/+1
| |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-217-30/+97
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | 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