aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
Commit message (Expand)AuthorAgeFilesLines
* 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
| * 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
| |\ \
| | * | Update popout to fullscreen iconAlexander Tseung2018-01-181-2/+2
| * | | [NewUI] Send screen gas loading fixes (#3027)Dan J Miller2018-01-181-1/+2
| |/ /
| * | 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
| |\ \
| | * | 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
| | * | 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
| |\ \
| | * \ 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 s...Dan2017-12-213-67/+6
| | | * | 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.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
| | | * Show retry button on submitted transactions greater than 30 seconds, add hove...Alexander Tseung2017-12-071-1/+7
| | | * Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into R...Dan Finlay2017-12-071-4/+4
| | | |\
| | | | * 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 behind...Dan2017-12-211-0/+6
| * | | Merge pull request #2591 from MetaMask/NewUI-flatChi Kei Chan2017-11-1619-116/+383
| |\ \ \
| * \ \ \ 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 f...Dan2017-12-131-2/+3
* | | | | 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 netwo...Alexander Tseung2017-12-022-18/+23
|/ / / / /
* | | | | Remove useBlockie in props for renderThomas Huang2017-11-291-1/+1
* | | | | 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 iden...Jason Clark2017-11-262-85/+49
* | | | | 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
| |_|/ / |/| | |
* | | | 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-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 curren...Dan2017-11-082-28/+101
* | | | 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 updates...Dan2017-11-074-10/+46
* | | | Merge pull request #2530 from MetaMask/uatChi Kei Chan2017-11-0336-254/+234
|\ \ \ \ | | |/ / | |/| |
| * | | 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 h...Dan2017-10-282-11/+48
* | | 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
| |\
| | * 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
| | * | 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
| |\ \ | | |/ | |/|
| | * Fix lint warningsDaijiro Wachi2017-10-224-8/+6
* | | 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 https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-246-0/+16
| |\ \
| | * | Fix linterChi Kei Chan2017-10-216-0/+16
| | |/
| * / Add support for alternative ENS TLDsDan Finlay2017-10-231-1/+1
| |/
* | 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
|\ \
| * | 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
|\ \ \
| * | | 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
|\ \ \
| * | | Change all "Buy" to "Deposit"Alexander Tseung2017-10-233-4/+4
| |/ /
* / / Update settings screen to new UIAlexander Tseung2017-10-232-30/+124
|/ /
* | Fix Conversions bugs; Fiat value bugsChi Kei Chan2017-10-214-6/+20
* | Add resiliency to confirm-send-tokenChi Kei Chan2017-10-211-5/+5
* | Merge pull request #2410 from alextsg/nu-2280Chi Kei Chan2017-10-212-42/+35
|\ \
| * | Fix loading animation not showing on network changeAlexander Tseung2017-10-202-42/+35
* | | Fixes regression in confirm-send-tokenDan2017-10-211-2/+4
|/ /
* | Fix network dropdown stylesChi Kei Chan2017-10-201-1/+1
* | various styling fix on mobileChi Kei Chan2017-10-201-4/+4
* | Fix selectorsChi Kei Chan2017-10-202-5/+4
* | Merge branch 'NewUI-flat' into MM-128-get-currentCurrency-from-stateChi Kei Chan2017-10-201-17/+34
|\ \
| * | Min and default gas price, limit, total; comments out code for gas slider.Dan2017-10-203-15/+43
| * | 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-201-16/+33
* | | Get currency from state in account details, send and confirm screens.Dan2017-10-209-62/+74
* | | Min and default gas price, limit, total; comments out code for gas slider.Dan2017-10-203-15/+43
|/ /
* | Fixes mobile styling.Dan2017-10-201-1/+1
* | Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-1964-721/+6200
|\ \ | |/ |/|
| * Fix cancel button on send screen.Dan2017-10-191-0/+1
| * Handling to and amount errors.Dan2017-10-193-13/+21
| * Move all of send state to metamask state.Dan2017-10-194-19/+24
| * Get from and update addressBook in send-v2Dan2017-10-191-4/+8
| * Network dropdown updateChi Kei Chan2017-10-181-1/+2
| * New Account modalChi Kei Chan2017-10-182-53/+51
| * wipChi Kei Chan2017-10-183-7/+113
| * Enable send-v2 functionality.Dan2017-10-183-7/+21
| * Fix Import Account link not hiding sidebarAlexander Tseung2017-10-162-3/+9
| * Customize Gas connected to stateDan2017-10-163-14/+80
| * 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 click to copy for private key not working (#2360)Alexander Tseung2017-10-142-3/+7
| * [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state...Dan J Miller2017-10-1413-52/+445
| * Adding Account Dropdown V2Chi Kei Chan2017-10-132-0/+100
| * Various styling fixesChi Kei Chan2017-10-132-3/+10
| * Refactor amount input: dynamic input width with vanilla js.Dan2017-10-131-41/+32
| * Send v2 amount unit moves correctly.Dan2017-10-131-1/+19
| * Adds amount and gas field to sendV2.Dan2017-10-131-0/+85
| * Send v2 to autocomplete.Dan2017-10-111-0/+55
| * Fix recipient on send tokenChi Kei Chan2017-10-111-2/+4
| * Confirm Token and Confirm Contract v2Chi Kei Chan2017-10-112-36/+39
| * Confirm eth v2Chi Kei Chan2017-10-111-19/+19
| * Refactor 'rendersingleidentity' to a stand alone account-list-item component.Dan2017-10-102-49/+71
| * UI for readonly from component. From dropdown opening and closing. Mockdata.Dan2017-10-101-0/+94
| * Edit account modal shows and allows editing of name from props, not just plac...Dan2017-10-091-2/+3
| * Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-041-6/+22
| |\
| * | Enables remove token and ensures add/remove update the list without need for ...Dan2017-10-043-8/+23
| * | Add needed iterator in tx-list and path to account in selectors.Dan2017-10-031-1/+6
| * | Hide token confirmation modal uiDan2017-10-034-3/+97
| * | Token menu ui.Dan2017-10-022-0/+56
| * | Shapeshift deposit tx modal.Dan2017-10-024-2/+54
| * | Enables the old shapeshift UI within new ui.Dan2017-10-022-2/+4
| * | Query for gas estimatesChi Kei Chan2017-09-291-2/+16
| * | Hide ShapeShift and Fix Modal StylingsChi Kei Chan2017-09-292-13/+52
| * | Always set currency to USD on app mountChi Kei Chan2017-09-294-4/+3
| * | Ensure sent token value is recognized as hex.Dan2017-09-291-1/+1
| * | 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
| * | Merge branch 'master' into mmnChi Kei Chan2017-09-281-1/+2
| |\ \
| * | | Use font-awesome icons for create and import account.Dan2017-09-281-9/+5
| * | | Makes styling fixes to account dropdown.Dan2017-09-281-7/+10
| * | | Keep privateKey out of state and clear it after closing export private key mo...Dan2017-09-281-7/+14
| * | | Adds a back button to export private key modal; connects account details to s...Dan2017-09-283-5/+41
| * | | Implement Confirm Deploy Contract screenChi Kei Chan2017-09-272-0/+350
| * | | Update the correct values in state when estimates are received.Dan2017-09-271-8/+6
| * | | Gets gas and price estimates when send components mount.Dan2017-09-271-20/+12
| * | | Return null if transaction.key is shapeshiftChi Kei Chan2017-09-271-1/+6
| * | | Connect export key modal to state and enable actions.Dan2017-09-272-14/+77
| * | | Merge branch 'NewUI-flat' into MM-57-use-gas-estimatorChi Kei Chan2017-09-262-1/+26
| |\ \ \
| | * | | Select all in to and from of send screens, instead of clearing on focus.Dan2017-09-261-1/+1
| | * | | Able to change selections in to and from fields of send and send token.Dan2017-09-261-0/+1
| | * | | Export private key modal body ui.Dan2017-09-261-0/+22
| * | | | Send token now estimates gas and price.Dan2017-09-261-8/+37
| * | | | Update send token to handle errors onBlur events and prevent clicking send un...Dan2017-09-261-12/+59
| * | | | 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-243-19/+72
| * | | Add Confirm Send token screenChi Kei Chan2017-09-234-34/+453
| * | | get identities from getState() instead of passing from caller, only set new a...Dan2017-09-231-6/+6
| * | | New account modal now allows for addition of account name.Dan2017-09-231-4/+16
| * | | Default class params to empty string in readonly-inputDan2017-09-231-2/+2
| * | | ReadOnlyInput component.Dan2017-09-232-12/+33
| * | | Open account details modal on buy -> direct deposit.Dan2017-09-231-1/+11
| * | | Refactor Confirmation Tx to render different screenChi Kei Chan2017-09-222-183/+163
| * | | Integrate Add TokenChi Kei Chan2017-09-222-6/+10
| * | | Abstract account modal.Dan2017-09-223-36/+66
| * | | Confirm screen shows amount plus gas in total fieldDan2017-09-221-6/+19
| * | | Handles errors with to field and renders warnings from backend in send token.Dan2017-09-221-11/+17
| * | | Buy Modal StylingChi Kei Chan2017-09-201-3/+4
| * | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-193-3/+3
| |\ \ \
| * \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-191-0/+9
| |\ \ \ \
| * | | | | Fix Merge Problems; update yarn lockChi Kei Chan2017-09-191-1/+7
| * | | | | Merge branch 'master' into nmChi Kei Chan2017-09-198-31/+189
| |\ \ \ \ \
| * | | | | | Handle transaction totals in WEI in tx-list, send and pending.Dan2017-09-162-0/+6
| * | | | | | Ensures that new accounts are only created from the modal, and not when click...Dan2017-09-162-5/+8
| * | | | | | Adds USD to token list.Dan2017-09-161-3/+37
| * | | | | | Show dollar sign before USD on account details page.Dan2017-09-162-4/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 05:57:19 +0800