aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
Commit message (Collapse)AuthorAgeFilesLines
* Fix merge conflicts. Refactor onboarding flow.Alexander Tseung2018-03-299-17/+36
|
* Fix merge conflictsAlexander Tseung2018-03-2783-2744/+2070
|\
| * Merge pull request #3721 from alextsg/cb-944Dan Finlay2018-03-278-15/+19
| |\ | | | | | | Update button styles
| | * Update button stylesAlexander Tseung2018-03-268-15/+19
| | |
| * | Use ens-input component in send-v2 to allow sending to ens names.Dan2018-03-262-32/+13
| |/
| * ui - tx conf - only show special token tx conf screen for token sendkumavis2018-03-221-4/+8
| |
| * Merge branch 'i3554-fix-editing-dapp-token-txs' of ↵kumavis2018-03-222-4/+11
| |\ | | | | | | | | | https://github.com/danjm/metamask-extension into danjm-i3554-fix-editing-dapp-token-txs
| | * Identify token transactions by method names token data, and not just whether ↵Dan2018-03-202-4/+11
| | | | | | | | | | | | they've been add via metamask.
| * | Merge pull request #3624 from alextsg/cb-941kumavis2018-03-214-182/+244
| |\ \ | | | | | | | | Update confirm transaction screen
| | * | Update confirm transaction screenAlexander Tseung2018-03-214-182/+244
| | | |
| * | | Gas inputs can be changed by up and down arrows (#3598)Dan J Miller2018-03-212-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Up and down arrows can control gas inputs. * input-number.js just uses number type.
| * | | Add i18n to tx statusThomas2018-03-211-1/+26
| | | |
| * | | Merge branch 'master' into i3571-CompleteI18nTemplatesThomas2018-03-217-45/+260
| |\| |
| | * | Merge branch 'master' into retry-tx-refractorDan2018-03-202-2/+6
| | |\ \
| | | * | Don't block user from setting gas if estimating gas returns errors. (#3627)Dan J Miller2018-03-202-2/+6
| | | |/
| | * | Merge branch 'master' into retry-tx-refractorDan2018-03-2027-2155/+588
| | |\|
| | * | Merge branch 'retry-tx-refractor' of ↵frankiebee2018-03-163-22/+49
| | |\ \ | | | | | | | | | | | | | | | https://github.com/MetaMask/metamask-extension into retry-tx-refractor
| | | * | Set retry gasPrice to forceGasMin on confirm screen in cases where gas is ↵Dan2018-03-152-4/+34
| | | | | | | | | | | | | | | | | | | | not edited.
| | | * | Force gas min has correct precision and is set when editing gas if max.Dan2018-03-153-7/+8
| | | | |
| | | * | Ensure changes from customize gas modal opened from confirm screen are ↵Dan2018-03-152-12/+8
| | | | | | | | | | | | | | | | | | | | captured for non-tx transactions.
| | | * | Revert 'Set txMeta.time to reflect time of tx approval.'Dan2018-03-151-3/+3
| | | | |
| | * | | Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-161-4/+6
| | |\ \ \
| | * \ \ \ Merge branch 'master' into retry-tx-refractorfrankiebee2018-03-151-1/+1
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge branch 'master' into retry-tx-refractorDan2018-03-1447-349/+386
| | |\ \ \ \
| | * | | | | Fix more lint errors.Dan2018-03-143-11/+2
| | | | | | |
| | * | | | | Remove unnecessary addition of nonce to state.Dan2018-03-141-3/+0
| | | | | | |
| | * | | | | Make token confirmations compatible.Dan2018-03-142-14/+88
| | | | | | |
| | * | | | | Fix tx-list-item submitted check.Dan2018-03-141-1/+1
| | | | | | |
| | * | | | | Use correct name for submittedTime field in tx-list.jsDan2018-03-141-1/+1
| | | | | | |
| | * | | | | Use correct var name in new-ui showRetryButtonDan2018-03-141-1/+1
| | | | | | |
| | * | | | | Undefined check in showRetryButtonDan2018-03-141-3/+4
| | | | | | |
| | * | | | | Styling for dropped.Dan2018-03-141-0/+1
| | | | | | |
| | * | | | | Use new submittedTime field to correctly show retry button in old and new ui.Dan2018-03-143-9/+9
| | | | | | |
| | * | | | | Set txMeta.time to reflect time of tx approval.Dan2018-03-131-3/+3
| | | | | | |
| | * | | | | Improve phrasing of copy.Dan2018-03-132-2/+2
| | | | | | |
| | * | | | | Fix gas calculation and nonce / forceGasMin state setting errors; retry ↵Dan2018-03-133-25/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | button shows on correct tx.
| | * | | | | Lint fixes.Dan2018-03-091-2/+0
| | | | | | |
| | * | | | | Merge branch 'master' into retry-tx-refractorDan2018-03-095-25/+28
| | |\ \ \ \ \
| | * | | | | | Adds inline opening of gas customization to confirm-send-ether screen.Dan2018-03-092-10/+42
| | | | | | | |
| | * | | | | | Retry transaction logic added to tx-list-item, confirm-send-ether, ↵Dan2018-03-094-15/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | customize-gas-modal, and dependents.
| | * | | | | | Add html and css for responsive retry button.Dan2018-03-091-0/+9
| | | | | | | |
| * | | | | | | Started on Tx list i18nThomas2018-03-211-1/+1
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge pull request #3594 from danjm/i3344-improve-currency-inputThomas Huang2018-03-201-6/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Currency input defaults to empty string
| | * | | | | | Currency input defaults to empty stringDan2018-03-171-6/+14
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Remove unused files from ui folder. (#3577)anticlimactic2018-03-1921-1626/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removed unused UI files. Fixes #3434. * Reverted the deletion of "feature-toggle-utils.js". Reverted the deletion of the test files and modified the paths so they referred to the old-ui.
| * | | | | | Fix styling on confirm-send-ether and confirm-send-token (#3600)Alexander Tseung2018-03-173-225/+231
| | | | | | |
| * | | | | | Update Confirm Contract screen (#3597)Alexander Tseung2018-03-173-294/+340
| |/ / / / /
| * | | | / Update Deposit Eth icon (#3569)Alexander Tseung2018-03-161-4/+6
| | |_|_|/ | |/| | |
| * | | | Fix translations whose substitutions params were not in arrays.Dan2018-03-141-1/+1
| | |_|/ | |/| |
| * | | Merge branch 'master' into i18nThomas Huang2018-03-141-5/+5
| |\ \ \
| | * \ \ Merge pull request #3495 from alextsg/cb-290kumavis2018-03-141-5/+5
| | |\ \ \ | | | | | | | | | | | | Increase tap areas for menu buttons on mobile
| | | * | | Increase tap areas for menu buttons on mobileAlexander Tseung2018-03-101-5/+5
| | | | | |
| * | | | | Add missing opening parens to pag-container__subtitleThomas2018-03-141-1/+1
| | | | | |
| * | | | | Merge branch 'master' into i18nThomas Huang2018-03-142-54/+65
| |\| | | |
| | * | | | Update deposit ether styling (#3510)Alexander Tseung2018-03-132-53/+68
| | |/ / /
| * | | | Merge branch 'master' into i18nThomas Huang2018-03-122-6/+6
| |\| | |
| | * | | Add empty object default value for tokenData (#3493)Alexander Tseung2018-03-091-2/+2
| | | |/ | | |/|
| | * | Update network colours for better accessibility. (#3469)Dan J Miller2018-03-081-4/+4
| | | |
| * | | Correct caps of Send button on main screen.Dan2018-03-081-1/+1
| | | |
| * | | Merge branch 'master' into i18nDan Finlay2018-03-071-16/+0
| |\| |
| | * | Merge branch 'master' into ImportAccountMessageV2kumavis2018-03-073-4/+23
| | |\ \
| | * \ \ Merge branch 'master' into ImportAccountMessageV2Dan Finlay2018-03-071-5/+4
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Merge branch 'master' into ImportAccountMessageV2Thomas Huang2018-03-036-18/+32
| | |\ \ \
| | * | | | Remove committed out merge codeThomas2018-02-281-16/+0
| | | | | |
| | * | | | Change Loose label to ImportedThomas2018-02-281-1/+1
| | | | | |
| * | | | | Correct merge conflict resolution errors.Dan2018-03-071-7/+0
| | | | | |
| * | | | | Merge branch 'master' into i18nDan2018-03-0724-117/+277
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Shapeshift form handles market info unavailable errors.Dan2018-03-073-4/+23
| | | |_|/ | | |/| |
| | * | | Fixes shapeshift coin selection dropdown. (#3416)Dan J Miller2018-03-061-5/+4
| | | |/ | | |/|
| | * | Fix network menu for custom URLs (#3366)Alexander Tseung2018-03-021-13/+27
| | | |
| | * | Fix exception thrown when styleOverride is not present (#3364)Alexander Tseung2018-03-021-1/+1
| | | |
| | * | Merge pull request #3340 from danjm/i3338-contract-published-terminologykumavis2018-03-012-2/+2
| | |\ \ | | | | | | | | | | [NewUI] Replace 'Contract Published' label with 'Contract Deployment'
| | | * | Replace 'Contract Published' with 'Contract Deployment' for clearer ↵Dan2018-02-282-2/+2
| | | |/ | | | | | | | | | | | | indication of contract tx state.
| | * / Define event locally in onClickOutside method in account-dropdowns.jsDan2018-03-012-2/+2
| | |/
| | * Try fixing notice screen synchronous state callDan Finlay2018-02-211-2/+1
| | |
| | * Merge pull request #3200 from alextsg/cb-703kumavis2018-02-176-6/+6
| | |\ | | | | | | | | [NewUI] Remove accessing PropTypes from main React package
| | | * Remove accessing PropTypes from main React packageAlexander Tseung2018-02-076-6/+6
| | | |
| | * | Merge pull request #3209 from danjm/MM-634-newui-reset-accountDan Finlay2018-02-143-6/+89
| | |\ \ | | | | | | | | | | [NewUI] Add reset account button to new UI.
| | | * | Add reset account button to new UI.Dan2018-02-093-6/+89
| | | | |
| | * | | Updates the styling of confirm send ether and token screens. (#3235)Dan J Miller2018-02-132-18/+14
| | | | |
| * | | | complete i18n across new UINick Doiron2018-01-3026-77/+80
| | | | |
| * | | | get t imported in all files currently using i18nNick Doiron2018-01-2529-0/+29
| | | | |
| * | | | separate out cross-browser i18n for extensionsNick Doiron2018-01-2517-0/+17
| | | | |
| * | | | better organization of locale file; i18n in more view filesNick Doiron2018-01-2420-114/+103
| | | | |
| * | | | first steps to i18nNick Doiron2018-01-2330-144/+132
| | | | |
* | | | | Fix react-router related exceptionsAlexander Tseung2018-02-101-1/+1
| | | | |
* | | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵Alexander Tseung2018-02-092-36/+28
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | into cb-254
| * | | | Fixes shapeshift txs so that they render in tx list. (#3208)Dan J Miller2018-02-092-36/+28
| | |/ / | |/| |
* | | | Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension ↵Alexander Tseung2018-02-094-19/+34
|\| | | | | | | | | | | | | | | into cb-254
| * | | Make blockies icon round to match identicons (#3205)Alexander Tseung2018-02-081-4/+4
| | | |
| * | | Fix alignment of ellipsis and address in wallet view. (#3198)Dan J Miller2018-02-071-1/+1
| | |/ | |/|
| * | Remove duplicate token balance on uat next. (#3195)Dan J Miller2018-02-071-2/+0
| | |
| * | Add functional integration testing to Add Token flow (#3189)Alexander Tseung2018-02-061-3/+4
| | |
| * | Wallet view supports screen sizes between 576px and 667px (#3193)Dan J Miller2018-02-061-12/+17
| | |
* | | Fix lint errorsAlexander Tseung2018-02-022-7/+1
| | |
* | | Fix merge conflicts from uat-nextAlexander Tseung2018-02-018-26/+78
|\| |
| * | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120)Dan J Miller2018-02-012-10/+57
| |/ | | | | | | | | | | | | | | * Use tooltip for display of helper text in wallet views copy to clipboard feature. * Use react-tippy in wallet-view.js; center arrow tooltip throughout tooltip text change. * Remove unnecessary tabIndex attribute from wallet view address element.
| * Merge branch 'uat' into newmasterChi Kei Chan2018-01-2077-1258/+8026
| |\
| * | Add network-indicator classname to network loading spinnerThomas2018-01-181-1/+1
| | |
* | | Add create new account routes, fix conflicts from uat updatesAlexander Tseung2018-02-0112-115/+299
| | |
* | | Merge branch 'uat' of https://github.com/MetaMask/metamask-extension into cb-254Alexander Tseung2018-01-3031-548/+731
|\ \ \ | | |/ | |/|
| * | Fix transaction list font sizes, paddingAlexander Tseung2018-01-191-5/+1
| | |
| * | Merge pull request #3024 from alextsg/cb-529Kevin Serrano2018-01-191-2/+2
| |\ \ | | | | | | | | [NewUI] Update popout to fullscreen icon
| | * | Update popout to fullscreen iconAlexander Tseung2018-01-181-2/+2
| | | |
| * | | [NewUI] Send screen gas loading fixes (#3027)Dan J Miller2018-01-181-1/+2
| |/ / | | | | | | | | | | | | | | | * Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send. * Fix variable name.
| * | Fix tx-list, confirmation screen stylingAlexander Tseung2018-01-181-5/+4
| | |
| * | Merge pull request #3005 from alextsg/cb-385Chi Kei Chan2018-01-181-1/+3
| |\ \ | | | | | | | | [NewUI] Fix rendering QR code in full screen old UI, hide unnecessary back button
| | * | Fix rendering QR code in old UI, hide unnecessary back buttonAlexander Tseung2018-01-171-1/+3
| | | |
| * | | Readjust gas fees when switching networks on the send screenAlexander Tseung2018-01-171-0/+1
| |/ /
| * | Fix send screen value inputAlexander Tseung2018-01-161-3/+11
| | |
| * | Fix Hide Token modal styling, popup positioningAlexander Tseung2018-01-161-2/+2
| | |
| * | New add account page with create and import options.Dan2018-01-132-17/+9
| | |
| * | Merge branch 'uat' into cb-388Chi Kei Chan2018-01-138-296/+452
| |\ \
| | * | [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-137-295/+451
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * New deposit ether modal. * New deposit modal full screen on mobile, and other style fixes. * Hide shapeshift option from deposit modal for now. * Add shapeshift form to new deposit modal. * Store recipient address for shapeshift tx in background. * Use Simpledropdown to achieve desired styling in coin selector. * Lint fix * Fix typos and remove dead code. * Remove storage of shapeshift receiving address from background. * Fix typos
| | * | Fix logging out of old UI causing infinite spinner (#2914)Alexander Tseung2018-01-121-1/+1
| | | |
| * | | Change styling for network dropdownAlexander Tseung2018-01-121-31/+10
| | | |
| * | | Update styling for buttons, font weightsAlexander Tseung2018-01-126-14/+18
| | | |
| * | | Update main view stylingAlexander Tseung2018-01-113-13/+5
| |/ /
| * | Merge pull request #2799 from MetaMask/NewUI-flatAlexander Tseung2017-12-2317-141/+314
| |\ \ | | | | | | | | Update UAT to version 4.0.5
| | * \ Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-214-57/+11
| | |\ \
| | | * | Add constanst for token transfer function signature.Dan2017-12-211-0/+3
| | | | |
| | | * | Lint fixes.Dan2017-12-212-3/+1
| | | | |
| | | * | Adds updateTransaction to background and used it to update after editing in ↵Dan2017-12-213-67/+6
| | | | | | | | | | | | | | | | | | | | send-v2.
| | | * | Canceled, edited transactions show edited amount.Dan2017-12-212-2/+16
| | | | |
| | * | | Merge branch 'master' into NewUI-flatDan2017-12-212-37/+94
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge pull request #2706 from danjm/MM-fix-buy-cancel-buttonThomas Huang2017-12-151-1/+1
| | | |\ | | | | | | | | | | Fixes the cancel button in the buy screen to take the user home.
| | | | * Fixes the cancel button in the buy screen to take the user home.Dan2017-12-091-1/+1
| | | | |
| | | * | Show watched tokens with no balanceDan Finlay2017-12-131-4/+1
| | | |/
| | | * Add 10% price bump to retry attempts.Dan Finlay2017-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | Turns out geth requires at least a 10% price bump to replace txs: https://github.com/ethereum/go-ethereum/blob/9619a610248e9630968ba1d9be8e214b645c9c55/core/tx_pool.go#L133
| | | * Show retry button on submitted transactions greater than 30 seconds, add ↵Alexander Tseung2017-12-071-1/+7
| | | | | | | | | | | | | | | | hover styling
| | | * Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into ↵Dan Finlay2017-12-071-4/+4
| | | |\ | | | | | | | | | | | | | | | RetryTransaction
| | | | * Fix styling of Retry butonAlexander Tseung2017-12-071-4/+4
| | | | |
| | | * | Enforce retry tx at minimum gas of previous txDan Finlay2017-12-071-1/+9
| | | |/
| | | * Connect to redux for retryTransactionAlexander Tseung2017-12-071-2/+10
| | | |
| | | * Add button to retry transactionAlexander Tseung2017-12-071-34/+69
| | | |
| | | * Add retry background method and actionDan Finlay2017-12-071-1/+9
| | | |
| | * | 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 ↵Dan2017-12-211-0/+6
| | | | | | | | | | | | | | | | behind the sidebar.
| * | | Merge pull request #2591 from MetaMask/NewUI-flatChi Kei Chan2017-11-1619-116/+383
| |\ \ \ | | | | | | | | | | Release 4.0.4
| * \ \ \ Merge remote-tracking branch 'origin/uat' into mascara-first-screenfrankiebee2017-11-0841-368/+451
| |\ \ \ \
| * | | | | ui - allow optional size for mascotfrankiebee2017-11-011-3/+3
| | | | | |
* | | | | | Add route for signature requestAlexander Tseung2017-12-152-253/+321
| | | | | |
* | | | | | Add initialized checks for first time flow routesAlexander Tseung2017-12-154-71/+48
| | | | | |
* | | | | | Fix lint errorsAlexander Tseung2017-12-152-2/+1
| | | | | |
* | | | | | Add routes for mascaraAlexander Tseung2017-12-156-42/+83
| | | | | |
* | | | | | Add react-router to allow use of the browser back buttonAlexander Tseung2017-12-1522-177/+1989
| |_|_|/ / |/| | | |
* | | | | Fix edit to field bug. (#2738)Dan J Miller2017-12-131-6/+7
| | | | |
* | | | | Fix isMascara and update yarn.lockChi Kei Chan2017-12-131-2/+2
| | | | |
* | | | | Substitute isMascara check for explicit check if user is on mobile browser.Dan2017-12-131-1/+2
| | | | |
* | | | | Hide open in browser button on mobile (but still show on extension); adds a ↵Dan2017-12-131-2/+3
| | | | | | | | | | | | | | | | | | | | function to detect if viewing with mobile browser.
* | | | | Adds button for opening app in main browser window in extension.Dan2017-12-131-0/+5
| | | | |
* | | | | Merge branch 'NewUI-flat' into cb-372Chi Kei Chan2017-12-084-1/+110
|\ \ \ \ \
| * \ \ \ \ Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-082-1/+22
| |\ \ \ \ \
| | * | | | | Update max amount behaviour to meet new specs.Dan2017-12-072-1/+22
| | | | | | |
| * | | | | | Show user notifications after switch between UIsDan2017-12-052-0/+88
| |/ / / / /
* / / / / / Update font weights to 300, remove animation from network dropdown, fix ↵Alexander Tseung2017-12-022-18/+23
|/ / / / / | | | | | | | | | | | | | | | network dropdown not closing from certain click-areas
* | | | | Remove useBlockie in props for renderThomas Huang2017-11-291-1/+1
| | | | | | | | | | | | | | | Removed unused useBlock for Lint validation.
* | | | | Fixes changes requested in pullrequestreview-79088534Jason Clark2017-11-271-2/+2
| | | | |
* | | | | making eslint happyJason Clark2017-11-261-4/+5
| | | | |
* | | | | fixing blockies display issuesJason Clark2017-11-261-4/+8
| | | | |
* | | | | swapped out ethereum-blockies lib for MEW blockies library, tightened up ↵Jason Clark2017-11-262-85/+49
| | | | | | | | | | | | | | | | | | | | identicon.js code
* | | | | tweaking stylingJason Clark2017-11-252-9/+27
| | | | |
* | | | | incremental commit of working blockie componentJason Clark2017-11-252-15/+56
| | | | |
* | | | | incremental commitClark, Jason (Contractor)2017-11-241-1/+2
| | | | |
* | | | | Remove unneeded type castingDan Finlay2017-11-211-1/+1
| | | | |
* | | | | Fix bug where gas param was not a stringDan Finlay2017-11-212-3/+3
| |_|/ / |/| | | | | | | | | | | | | | | | | | | Prevented sending transactions. Fixes #2598
* | | | 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 ↵Dan2017-11-161-4/+7
| | | | | | | | | | | | | | | | gas estimator
* | | | Show tokens with zero balanceAlexander Tseung2017-11-151-4/+1
| | | |
* | | | Create single action for updating all of send in redux state.Dan2017-11-153-13/+19
| | | |
* | | | Allow editing of token transactions.Dan2017-11-151-8/+87
| | | |
* | | | Fix lint errors.Dan2017-11-152-11/+10
| | | |
* | | | Allow editing of send ether.Dan2017-11-152-6/+50
| | | |
* | | | 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-113-0/+4
| | | |
* | | | 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-111-1/+2
| | | |
* | | | LintingThomas Huang2017-11-113-4/+4
| | | |
* | | | Network loading does not block network loading.Dan2017-11-103-16/+4
| | | |
* | | | darker backdrop style for modalcjeria2017-11-101-1/+1
| | | |
* | | | Calculate max amount for send ether based on minimum gas total.Dan2017-11-081-8/+0
| | | |
* | | | Fix amount max for sending token.Dan2017-11-081-7/+23
| | | |
* | | | Add currency-input component to correct send amount behaviour and move ↵Dan2017-11-082-28/+101
| | | | | | | | | | | | | | | | currency display value state to parent component.
* | | | Lint fixes.Dan2017-11-073-4/+1
| | | |
* | | | Set gas price allows for WEI precision.Dan2017-11-073-9/+29
| | | |
* | | | Insufficient balance warning in gas customizer works for send tokenDan2017-11-071-3/+1
| | | |
* | | | Adds max amount feature for send-etherDan2017-11-072-1/+3
| | | |
* | | | Token balance in send state; validating sufficient tokens, validation ↵Dan2017-11-074-10/+46
| | | | | | | | | | | | | | | | updates on 'from' switching.
* | | | Merge pull request #2530 from MetaMask/uatChi Kei Chan2017-11-0336-254/+234
|\ \ \ \ | | |/ / | |/| | Merge uat into NewUI-flat
| * | | More lint fixesDan2017-11-0224-89/+81
| | | |
| * | | Lint fixes for NewUI-flat.Dan2017-11-0228-159/+147
| | | |
* | | | Fixes width of from and to dropdowns in extension and on mobile views.Dan2017-11-031-1/+1
|/ / /
* | | Add utility for getting token data; get token data in tx-list even if token ↵Dan2017-10-282-11/+48
| | | | | | | | | | | | has been removed.
* | | Provide default new account nameAlexander Tseung2017-10-271-63/+78
| | |
* | | Correct rendering of conversions when conversion rate is a token. (#2498)Dan J Miller2017-10-272-15/+46
| | |
* | | Clear import error state on logout.Dan2017-10-271-0/+1
| | |
* | | eth_sign warning colorDan2017-10-271-1/+8
| | |
* | | Change min gas price to 0.1 GWEIDan2017-10-276-30/+42
|/ /
* | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-261-6/+10
|\|
| * Merge pull request #2476 from MetaMask/100MweiMinGasPriceDan Finlay2017-10-262-12/+15
| |\ | | | | | | Reduce minimum gas price to 100 MWEI
| | * 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
| | |
| | * Resolve merge conflict.Kevin Serrano2017-10-251-1/+1
| | |\
| | | * Reduce minimum gas price to 100 MWEIDan Finlay2017-10-251-7/+7
| | | | | | | | | | | | | | | | Also now representing gas price in MWEI, because our current bn inputs actually aren't tolerant of minimums less than 1 unit.
| | * | Fix for gas price to be lowered.Kevin Serrano2017-10-252-11/+13
| | |/
* | | Allow editing account name in account details modalAlexander Tseung2017-10-263-55/+91
| | |
* | | Sign Typed Request styling fixesChi Kei Chan2017-10-261-2/+2
| | |
* | | Signature request fixes.Dan2017-10-261-6/+16
| | |
* | | Fix Import an Account link not working in Create Account modalAlexander Tseung2017-10-261-6/+10
| | |
* | | Signature RequestDan2017-10-263-47/+323
| | |
* | | Adds revert feature to customize gas modal.Dan2017-10-261-8/+15
| | |
* | | Add Info sectionAlexander Tseung2017-10-261-0/+6
| | |
* | | Add GWEI to gas price unitChi Kei Chan2017-10-251-1/+1
| | |
* | | Fix gas input styling on mobile viewChi Kei Chan2017-10-252-7/+7
| | |
* | | Fix alignment on right arrow of confirm tx screensChi Kei Chan2017-10-252-2/+2
| | |
* | | Change download to show in Export Private Key ModalChi Kei Chan2017-10-251-2/+2
| | |
* | | Styling and UX changes on sidebarChi Kei Chan2017-10-251-10/+12
| | |
* | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-253-6/+4
|\| |
| * | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-254-8/+6
| |\ \ | | |/ | |/| Fixes lint warnings
| | * Fix lint warningsDaijiro Wachi2017-10-224-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | Hide sidebar on add tokenChi Kei Chan2017-10-251-1/+4
| | |
* | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-257-1/+17
|\| |
| * | Merge branch 'firsttimeflow' of ↵tmashuang2017-10-246-0/+16
| |\ \ | | | | | | | | | | | | https://github.com/chikeichan/metamask-plugin into firsttimeflow
| | * | Fix linterChi Kei Chan2017-10-216-0/+16
| | |/
| * / Add support for alternative ENS TLDsDan Finlay2017-10-231-1/+1
| |/ | | | | | | Fixes #2428
* | Simply logic for rendering matching accounts in to-autocomplete dropdown.Dan2017-10-251-12/+4
| |
* | Style dropdown of to-autocomplete.Dan2017-10-252-29/+105
| |
* | Disable network dropdown on conf tx screenChi Kei Chan2017-10-241-1/+6
| |
* | Change clickable area for account detail; change network dot sizeChi Kei Chan2017-10-241-2/+4
| |
* | Fix styling in private key modalChi Kei Chan2017-10-241-1/+0
| |
* | Add "Add Token" button to side barChi Kei Chan2017-10-241-0/+5
| |
* | Fix clickable area on logoutChi Kei Chan2017-10-241-2/+3
| |
* | Account menu white check markChi Kei Chan2017-10-242-6/+7
| |
* | New Sidebar upliftChi Kei Chan2017-10-242-57/+36
| |
* | Change LOOSE label to IMPORTEDChi Kei Chan2017-10-241-1/+1
| |
* | Improve customize gas modal error handlingDan2017-10-245-36/+177
| |
* | Cleaner implementation of currency-display input.Dan2017-10-241-22/+14
| |
* | 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-241-0/+1
|\ \ \ | | | | | | | | [NewUI] Clear send state on cancelling and signing.
| * | | Clear send state on cancelling and signing.Dan2017-10-241-0/+1
| |/ /
* | | 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
| |/ /
* / / Update settings screen to new UIAlexander Tseung2017-10-232-30/+124
|/ /