aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | | | | | | | * | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Fixes lint warnings
| * | | | | | | | | | | Fix lint warningsDaijiro Wachi2017-10-2220-49/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | Implement Mascara First Time Flow
| * | | | | | | | | | | Add error messages when importing an accounttmashuang2017-10-242-17/+24
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'firsttimeflow' of ↵tmashuang2017-10-2435-63/+12249
|/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/chikeichan/metamask-plugin into firsttimeflow
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add support for alternative ENS TLDs
| * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2428
| * | | | | | | | | | | 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-engine
| * | | | | | | | | | 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.1
| * | | | | | | | | | Version 3.11.1v3.11.1Dan Finlay2017-10-212-1/+3
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #2401 from MetaMask/filter-fix-maybeFrankie2017-10-212-1/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | filters bug fix
| * | | | | | | | | | changelog entry for filter fixkumavis2017-10-211-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into ↵kumavis2017-10-218-32/+99
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | filter-fix-maybe
* | | | | | | | | | | Merge pull request #2412 from MetaMask/x-frame-optionskumavis2017-10-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mascara - set x-frame-options header to DENY
| * | | | | | | | | | | 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
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Disable Send-v2 next button when form is in error
| | | | | | | | | * \ \ \ 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
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Improves precision of a calculation in send, and in confirm
| | | | | | | | | * | | | 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
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Clear send state on cancelling and signing.
| | | | | | | | | * | | | | 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
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Change all "Buy" to "Deposit"
| | | | | | | | | * | | | | 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
| | | | | | | | |\ \ \ \ \ | | | | | | | | | |/ / / / | | | | | | | | |/| | | | [NewUI] Update settings screen to new UI
| | | | | | | | | * | | | 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
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Fix loading animation not showing on network change
| | | | | | | | | * | | | 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
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NewUI-flat] Fixes add token search.
| | | | | | | | | * | | | | 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
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Fixes regression in confirm-send-token
| | | | | | | | | * | | | | 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
| | | | | | | |\ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | / / / / | | | | | | | |/ / / /
* | | | | | | | | | | Merge pull request #2389 from MetaMask/i2348-SelectAccountOnNewVaultThomas Huang2017-10-217-29/+96
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | Select first account on create or restore vault
| * | | | | | | | | | 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 dependency
| * | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were doing a lot of conditional observation & updating. Pulled out a bunch of that for generic observer/syncers.
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per @kgserrano note
| * | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #2348
| * | | | | | | | | | 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
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | [NewUI] Get currentCurrency from state, allows other fiats
| | | | | | | | | * \ 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
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | [NewUI] Merge master into NewUI-flat
| | | | | | | | | * | 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 ↵Dan J Miller2017-10-1422-132/+915
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | | | | | | | * | 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 ↵Dan2017-10-091-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | placeholder.
| | | | | | | | * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refresh.
| | | | | | | | * | 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
| | | | | | | | | |
| | | | | | | | * | Enables the old shapeshift UI within new ui.Dan2017-10-023-3/+9
| | | | | | | | | |
| | | | | | | | * | Query for gas estimatesChi Kei Chan2017-09-295-8/+35
| | | | | | | | | |
| | | | | | | | * | Hide ShapeShift and Fix Modal StylingsChi Kei Chan2017-09-292-13/+52
| | | | | | | | | |
| | | | | | | | * | Always set currency to USD on app mountChi Kei Chan2017-09-298-4/+21
| | | | | | | | | |
| | | | | | | | * | Ensure sent token value is recognized as hex.Dan2017-09-291-1/+1
| | | | | | | | | |
| | | | | | | | * | Fix send of USD and backspacing amount to 0Dan2017-09-292-3/+7
| | | | | | | | | |
| | | | | | | | * | Close sidebar on token selection.Dan2017-09-292-4/+20
| | | | | | | | | |
| | | | | | | | * | Close mobile sidebar when selecting 'Add token' from account options dropdown.Dan2017-09-291-0/+2
| | | | | | | | | |
| | | | | | | | * | Update yarn.lockChi Kei Chan2017-09-291-116/+249
| | | | | | | | | |
| | | | | | | | * | Merge pull request #2201 from chikeichan/mergeChi Kei Chan2017-09-2849-1911/+2200
| | | | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | Merge master into NewUI-flat
| | | | | | | | | * | Merge branch 'mmn' into mergeChi Kei Chan2017-09-2849-1911/+2200
| | | | | | | | |/| |
| | | | | | | | | * | Merge branch 'master' into mmnChi Kei Chan2017-09-2849-1911/+2200
| | | | | | | | |/| |
| | | | | | | | * | | Use font-awesome icons for create and import account.Dan2017-09-281-9/+5
| | | | | | | | | | |
| | | | | | | | * | | Makes styling fixes to account dropdown.Dan2017-09-282-10/+12
| | | | | | | | | | |
| | | | | | | | * | | Keep privateKey out of state and clear it after closing export private key ↵Dan2017-09-282-20/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modal.
| | | | | | | | * | | Adds a back button to export private key modal; connects account details to ↵Dan2017-09-285-6/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same modal.
| | | | | | | | * | | Implement Confirm Deploy Contract screenChi Kei Chan2017-09-274-2/+357
| | | | | | | | | | |
| | | | | | | | * | | Update the correct values in state when estimates are received.Dan2017-09-272-18/+15
| | | | | | | | | | |
| | | | | | | | * | | Gets gas and price estimates when send components mount.Dan2017-09-273-42/+27
| | | | | | | | | | |
| | | | | | | | * | | Restore notification functionalityDan2017-09-272-0/+14
| | | | | | | | | | |
| | | | | | | | * | | Return null if transaction.key is shapeshiftChi Kei Chan2017-09-272-53/+18
| | | | | | | | | | |
| | | | | | | | * | | Connect export key modal to state and enable actions.Dan2017-09-273-15/+104
| | | | | | | | | | |
| | | | | | | | * | | Merge pull request #2157 from danjm/MM-57-use-gas-estimatorChi Kei Chan2017-09-263-29/+183
| | | | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Estimate gasPrice and gasLimit in send screen.
| | | | | | | | | * \ \ Merge branch 'NewUI-flat' into MM-57-use-gas-estimatorChi Kei Chan2017-09-265-4/+104
| | | | | | | | | |\ \ \ | | | | | | | | | |/ / / | | | | | | | | |/| | |
| | | | | | | | * | | | Remove unnecessary trailing comma.Dan2017-09-261-1/+1
| | | | | | | | | | | |
| | | | | | | | * | | | Select all in to and from of send screens, instead of clearing on focus.Dan2017-09-262-15/+5
| | | | | | | | | | | |
| | | | | | | | * | | | Able to change selections in to and from fields of send and send token.Dan2017-09-262-2/+19
| | | | | | | | | | | |
| | | | | | | | * | | | Export private key modal body ui.Dan2017-09-263-1/+92
| | | | | | | | | | | |
| | | | | | | | | * | | Send token now estimates gas and price.Dan2017-09-261-8/+37
| | | | | | | | | | | |
| | | | | | | | | * | | Refactor to store estimated gas and price in local state, return promise ↵Dan2017-09-263-81/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from actions.
| | | | | | | | | * | | Estimate gasPrice and gasLimit in send screen.Dan2017-09-263-7/+126
| | | | | | | | | | | |
| | | | | | | | | * | | Update send token to handle errors onBlur events and prevent clicking send ↵Dan2017-09-261-12/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | until all errors handled
| | | | | | | | | * | | Handles errors with to field and renders warnings from backend in send token.Dan2017-09-261-1/+1
| | | | | | | | |/ / /
| | | | | | | | * | | Exports private key modal opens from dropdown.Dan2017-09-244-54/+110
| | | | | | | | | | |
| | | | | | | | * | | Add Confirm Send token screenChi Kei Chan2017-09-236-64/+489
| | | | | | | | | | |
| | | | | | | | * | | get identities from getState() instead of passing from caller, only set new ↵Dan2017-09-232-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | account label if label set.
| | | | | | | | * | | New account modal now allows for addition of account name.Dan2017-09-233-7/+35
| | | | | | | | | | |
| | | | | | | | * | | Default class params to empty string in readonly-inputDan2017-09-231-2/+2
| | | | | | | | | | |
| | | | | | | | * | | ReadOnlyInput component.Dan2017-09-233-13/+34
| | | | | | | | | | |
| | | | | | | | * | | Open account details modal on buy -> direct deposit.Dan2017-09-231-1/+11
| | | | | | | | | | |
| | | | | | | | * | | Client side error handling for from, to and amount fields in send.jsDan2017-09-234-44/+184
| | | | | | | | | | |
| | | | | | | | * | | Refactor Confirmation Tx to render different screenChi Kei Chan2017-09-222-183/+163
| | | | | | | | | | |
| | | | | | | | * | | Integrate Add TokenChi Kei Chan2017-09-226-255/+333
| | | | | | | | | | |
| | | | | | | | * | | Abstract account modal.Dan2017-09-224-63/+96
| | | | | | | | | | |
| | | | | | | | * | | Confirm screen shows amount plus gas in total fieldDan2017-09-222-6/+29
| | | | | | | | | | |
| | | | | | | | * | | Clean up code in send.jsDan2017-09-221-234/+193
| | | | | | | | | | |
| | | | | | | | * | | Handles errors with to field and renders warnings from backend in send token.Dan2017-09-221-11/+17
| | | | | | | | | | |
| | | | | | | | * | | Add Token UI - hover/select state; fetch token addressChi Kei Chan2017-09-213-19/+82
| | | | | | | | | | |
| | | | | | | | * | | Add Add Token UI; Add Fuzzy search for tokensChi Kei Chan2017-09-205-140/+458
| | | | | | | | | | |
| | | | | | | | * | | Buy Modal StylingChi Kei Chan2017-09-202-10/+17
| | | | | | | | | | |
| | | | | | | | * | | Ensure conversion util does not return insignificant trailing zeroes.Dan2017-09-201-1/+1
| | | | | | | | | | |
| | | | | | | | * | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-1925-241/+150
| | | | | | | | |\ \ \
| | | | | | | | * \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-192-0/+10
| | | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ \ Merge pull request #2116 from chikeichan/nmChi Kei Chan2017-09-1962-640/+5027
| | | | | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [NewUI] Fix merge conflict with latest master
| | | | | | | | | * | | | | Fix Merge Problems; update yarn lockChi Kei Chan2017-09-192-49/+558
| | | | | | | | | | | | | |
| | | | | | | | | * | | | | Merge branch 'master' into nmChi Kei Chan2017-09-1961-591/+4469
| | | | | | | | |/| | | | |
| | | | | | | | * | | | | | Handle transaction totals in WEI in tx-list, send and pending.Dan2017-09-164-2/+15
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Ensures that new accounts are only created from the modal, and not when ↵Dan2017-09-163-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clicking 'Create New Account'
| | | | | | | | * | | | | | Clear token selection when changing account.Dan2017-09-161-0/+1
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Adds USD to token list.Dan2017-09-162-3/+41
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Show dollar sign before USD on account details page.Dan2017-09-162-4/+6
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Show loading on conf-tx until the pending tx is available.Dan2017-09-151-0/+1
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Make send token responsive; fix desktop send modal heightChi Kei Chan2017-09-152-5/+25
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Add responsive UI to send ether modalChi Kei Chan2017-09-156-13/+39
| | | | | | | | | | | | | |
| | | | | | | | * | | | | | Style send ether screenChi Kei Chan2017-09-142-340/+93
| | | | | | | | | | | | | |