aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'uat' into cb-388Chi Kei Chan2018-01-1315-309/+732
|\
| * Fix styling in initializationAlexander Tseung2018-01-132-5/+14
| * [NewUI-flat] New deposit ether modal UI. (#2642)Dan J Miller2018-01-1311-301/+711
| * Fix logging out of old UI causing infinite spinner (#2914)Alexander Tseung2018-01-122-2/+6
| * Fix padding of a hovered tx-list-item (#2859)Dan J Miller2018-01-121-1/+1
* | Fix token balance colorAlexander Tseung2018-01-121-1/+3
* | Fix lint errorsAlexander Tseung2018-01-121-1/+0
* | Change styling for network dropdownAlexander Tseung2018-01-122-58/+25
* | Update styling for buttons, font weightsAlexander Tseung2018-01-1216-125/+83
* | Update main view stylingAlexander Tseung2018-01-1111-68/+64
|/
* ui - fix font path namekumavis2018-01-091-2/+2
* Merge pull request #2848 from MetaMask/NewUI-flatAlexander Tseung2018-01-042-5/+9
|\
| * Merge branch 'NewUI-flat' into NewUI-flat-4.0.5cAlexander Tseung2018-01-04146-2909/+16765
| |\
| * | fix commentoosthuizenr2018-01-031-1/+1
| * | Fixes #2834Renier Oosthuizen2018-01-031-5/+6
| * | Add frontend validation to ensure that ether inputs are valid.Kevin Serrano2017-12-281-2/+12
| * | Add frontend validation to check if send ether input is a valid number.Kevin Serrano2017-12-281-0/+6
| * | Add backend fix for util in normalizeethstringtowei.Kevin Serrano2017-12-281-0/+3
* | | Merge pull request #2799 from MetaMask/NewUI-flatAlexander Tseung2017-12-2334-191/+1115
|\ \ \ | | |/ | |/|
| * | Track usage of old and new UI (#2794)Alexander Tseung2017-12-235-10/+63
| * | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788)Dan J Miller2017-12-223-5/+7
| * | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20Chi Kei Chan2017-12-216-74/+93
| |\ \
| | * | Clone transaction while editing instead of mutating object from state.Dan2017-12-211-6/+7
| | * | Add constanst for token transfer function signature.Dan2017-12-212-1/+5
| | * | Lint fixes.Dan2017-12-214-6/+2
| | * | Adds updateTransaction to background and used it to update after editing in s...Dan2017-12-216-95/+80
| | * | Canceled, edited transactions show edited amount.Dan2017-12-213-2/+35
| * | | Merge branch 'master' into NewUI-flatDan2017-12-213-37/+109
| |\ \ \ | | |/ / | |/| / | | |/
| | * 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
| | |/
| | * Merge pull request #2654 from abitrolly/patch-2Kevin Serrano2017-12-071-1/+1
| | |\
| | | * Download State Logs with .json extensionAnatoli Babenia2017-12-051-1/+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-072-1/+11
| | * | 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
| | |/ /
| | * | Fix retry actionDan Finlay2017-12-071-2/+2
| | * | View tx after editing state to unconfirmedDan Finlay2017-12-071-1/+9
| | * | Fix actionDan Finlay2017-12-071-2/+2
| | * | 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-072-1/+15
| | |/
| | * Prevent multiple submissions of first time formDan Finlay2017-11-211-1/+6
| * | [NewUI] Hide UI toggle in mascara (#2772)Dan J Miller2017-12-213-18/+22
| * | Hide fiat values on account details screen when eth/token value is 0.Dan2017-12-213-3/+8
| * | Hides the sidebar after the an account menu actions changes the screen behind...Dan2017-12-211-0/+6
| * | Fix edit to field bug. (#2738)Dan J Miller2017-12-131-6/+7
| * | Fix height of login screenDan2017-12-131-27/+25
| * | 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-132-13/+2
| * | Hide open in browser button on mobile (but still show on extension); adds a f...Dan2017-12-133-3/+15
| * | Adds button for opening app in main browser window in extension.Dan2017-12-132-0/+9
| * | Merge branch 'NewUI-flat' into cb-372Chi Kei Chan2017-12-0817-54/+360
| |\ \
| | * \ Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UIChi Kei Chan2017-12-087-16/+61
| | |\ \
| | | * | Update max amount behaviour to meet new specs.Dan2017-12-076-15/+55
| | | * | Merge branch 'master' into NewUI-flat-merge-with-masterDan2017-12-071-1/+6
| | * | | User is automatically added to new UI if they meet conditions at time of login.Dan2017-12-072-3/+47
| | * | | Show user notifications after switch between UIsDan2017-12-056-2/+135
| | * | | Update newUI UI for switching back to old UI.Dan2017-12-052-8/+24
| | * | | Lint fixDan2017-12-051-2/+2
| | * | | New-ui actions accomodates old-ui.Dan2017-12-052-8/+11
| | * | | Add UI selectionDan2017-12-057-29/+94
| | |/ /
| * / / Update font weights to 300, remove animation from network dropdown, fix netwo...Alexander Tseung2017-12-025-23/+28
| |/ /
| * | 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-263-7/+8
| * | fixing blockies display issuesJason Clark2017-11-262-5/+9
| * | swapped out ethereum-blockies lib for MEW blockies library, tightened up iden...Jason Clark2017-11-263-85/+413
| * | tweaking stylingJason Clark2017-11-252-9/+27
| * | incremental commit of working blockie componentJason Clark2017-11-252-15/+56
| * | toggle wired up to preferences property storeJason Clark2017-11-253-20/+30
| * | incremental commitClark, Jason (Contractor)2017-11-244-1/+42
| * | Remove unneeded type castingDan Finlay2017-11-211-1/+1
| * | Fix bug where gas param was not a stringDan Finlay2017-11-212-3/+3
* | | Merge pull request #2591 from MetaMask/NewUI-flatChi Kei Chan2017-11-1633-173/+756
|\| |
| * | Merge branch 'master' into merge-masterChi Kei Chan2017-11-163-10/+29
| |\|
| | * Use const and fix lint warningsDaijiro Wachi2017-10-311-2/+2
| | * Remove warning message when show import pageDaijiro Wachi2017-10-312-0/+2
| | * Add option to copy directly to clipboard.Kevin Serrano2017-10-271-3/+11
| | * Resolve merge conflictsKevin Serrano2017-10-2725-111/+230
| | |\
| | * \ Merge branch 'master' into version-debuggingKevin Serrano2017-10-109-12/+217
| | |\ \
| | * | | Make the function callback friendly.Kevin Serrano2017-10-102-4/+11
| | * | | Merge branch 'master' into version-debuggingKevin Serrano2017-10-062-5/+5
| | |\ \ \
| | * | | | lintKevin Serrano2017-10-051-1/+1
| | * | | | Further adjustment to maintain APIKevin Serrano2017-10-051-2/+2
| | * | | | Rename to maintain APIKevin Serrano2017-10-052-2/+8
| | * | | | Configured for callback-required function.'Kevin Serrano2017-10-052-9/+12
| | * | | | change global to windowKevin Serrano2017-10-051-1/+1
| | * | | | Include browser versionKevin Serrano2017-10-051-0/+2
| | * | | | Include OS versionKevin Serrano2017-10-051-0/+2
| * | | | | Gas customzier does not consider amount when sending tokens.Dan2017-11-161-1/+1
| * | | | | Use currency input component in input number, to improve input behaviour in g...Dan2017-11-161-4/+7
| * | | | | Show tokens with zero balanceAlexander Tseung2017-11-151-4/+1
| * | | | | Create single action for updating all of send in redux state.Dan2017-11-155-13/+38
| * | | | | Allow editing of token transactions.Dan2017-11-152-11/+91
| * | | | | Fix lint errors.Dan2017-11-154-18/+15
| * | | | | Allow editing of send ether.Dan2017-11-155-23/+131
| * | | | | Improve variable name.Dan2017-11-141-2/+2
| * | | | | Deposit button shows link to faucet on testnet networks.Dan2017-11-141-15/+23
| * | | | | Cursor pointer and hover background on from and to dropdown items.Dan2017-11-114-0/+15
| * | | | | Focus amount input when click anywhere in amount field containerDan2017-11-112-0/+4
| * | | | | Rounding of vals < 0.01 in currency display consistent with master.Dan2017-11-112-2/+3
| * | | | | LintingThomas Huang2017-11-115-9/+9
| * | | | | Network loading does not block network loading.Dan2017-11-105-16/+27
| * | | | | darker backdrop style for modalcjeria2017-11-101-1/+1
| * | | | | Calculate max amount for send ether based on minimum gas total.Dan2017-11-082-10/+1
| * | | | | Fix amount max for sending token.Dan2017-11-082-10/+28
| * | | | | Add currency-input component to correct send amount behaviour and move curren...Dan2017-11-083-32/+103
| * | | | | Lint fixes.Dan2017-11-075-15/+3
| * | | | | Allow sending 0 eth or tokensDan2017-11-071-3/+3
| * | | | | Set gas price allows for WEI precision.Dan2017-11-074-10/+30
| * | | | | Insufficient balance warning in gas customizer works for send tokenDan2017-11-071-3/+1
| * | | | | Adds max amount feature for send tokenDan2017-11-071-5/+12
| * | | | | Adds max amount feature for send-etherDan2017-11-075-2/+65
| * | | | | Token balance in send state; validating sufficient tokens, validation updates...Dan2017-11-0711-33/+191
| * | | | | Merge pull request #2530 from MetaMask/uatChi Kei Chan2017-11-0344-841/+812
| |\ \ \ \ \
| * | | | | | Fixes width of from and to dropdowns in extension and on mobile views.Dan2017-11-032-2/+3
* | | | | | | Merge remote-tracking branch 'origin/uat' into mascara-first-screenfrankiebee2017-11-0855-984/+1157
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | More lint fixesDan2017-11-0232-115/+107
| * | | | | | Lint fixes for NewUI-flat.Dan2017-11-0234-724/+703
| |/ / / / /
| * | | | | Add utility for getting token data; get token data in tx-list even if token h...Dan2017-10-284-29/+89
| * | | | | Provide default new account nameAlexander Tseung2017-10-271-63/+78
| * | | | | Fix Settings/Info screen being visible on logout (#2490)Alexander Tseung2017-10-272-6/+43
| * | | | | Correct rendering of conversions when conversion rate is a token. (#2498)Dan J Miller2017-10-273-20/+52
| * | | | | Clear import error state on logout.Dan2017-10-272-0/+5
| * | | | | eth_sign warning colorDan2017-10-272-3/+18
| * | | | | Change min gas price to 0.1 GWEIDan2017-10-277-31/+68
| * | | | | Fix input border rendering on mobileAlexander Tseung2017-10-271-0/+1
* | | | | | ui - allow optional size for mascotfrankiebee2017-11-011-3/+3
|/ / / / /
* | | | | Add Token styling fixChi Kei Chan2017-10-262-5/+29
* | | | | 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
| | * | | | Remove css build bundle from uatDan Finlay2017-10-261-4491/+0
| | * | | | Resolve merge conflict.Kevin Serrano2017-10-252-1/+4492
| | |\ \ \ \
| | | * | | | Reduce minimum gas price to 100 MWEIDan Finlay2017-10-252-7/+4498
| | * | | | | Fix for gas price to be lowered.Kevin Serrano2017-10-252-11/+13
| | |/ / / /
* | | | | | Allow editing account name in account details modalAlexander Tseung2017-10-267-64/+149
* | | | | | Sign Typed Request styling fixesChi Kei Chan2017-10-262-9/+17
* | | | | | Signature request fixes.Dan2017-10-263-25/+29
* | | | | | Fix Import an Account link not working in Create Account modalAlexander Tseung2017-10-261-6/+10
* | | | | | Signature RequestDan2017-10-267-60/+613
* | | | | | Fix send token bug.Dan2017-10-261-1/+2
* | | | | | Adds revert feature to customize gas modal.Dan2017-10-261-8/+15
* | | | | | Add Info sectionAlexander Tseung2017-10-264-6/+173
* | | | | | Add GWEI to gas price unitChi Kei Chan2017-10-252-2/+1
* | | | | | From and To field cannot be the sameChi Kei Chan2017-10-251-2/+8
* | | | | | Fix gas input styling on mobile viewChi Kei Chan2017-10-254-14/+34
* | | | | | Update Import Account Help LinkChi Kei Chan2017-10-251-1/+1
* | | | | | Show home page when metafox is clickedChi Kei Chan2017-10-252-4/+12
* | | | | | Fix alignment on right arrow of confirm tx screensChi Kei Chan2017-10-255-4/+12
* | | | | | Fix styling on notification viewChi Kei Chan2017-10-252-1/+10
* | | | | | 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
* | | | | | 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-255-9/+7
|\| | | | |
| * | | | | Merge pull request #2422 from watilde/fixes-lintKevin Serrano2017-10-256-11/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix lint warningsDaijiro Wachi2017-10-226-11/+9
* | | | | | Hide sidebar on add tokenChi Kei Chan2017-10-252-2/+5
* | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-2514-51/+238
|\| | | | |
| * | | | | Add error messages when importing an accounttmashuang2017-10-241-1/+2
| * | | | | Merge branch 'firsttimeflow' of https://github.com/chikeichan/metamask-plugin...tmashuang2017-10-2412-52/+200
| |\ \ \ \ \
| | * | | | | Add Import With Seed PhraseChi Kei Chan2017-10-211-4/+14
| | * | | | | Fix linterChi Kei Chan2017-10-217-1/+17
| | * | | | | ShapeShift IntegrationChi Kei Chan2017-10-213-4/+42
| | * | | | | Fix merge conflict; separate onboarding buy screenChi Kei Chan2017-10-213-7/+28
| | * | | | | Shuffle tokensJacky Chan2017-10-211-3/+3
| | * | | | | Add Go to Coinbase; Show Buy Ether after signupJacky Chan2017-10-213-7/+21
| | * | | | | Implement Import Account ScreenJacky Chan2017-10-211-10/+17
| | * | | | | Add BackupPhraseScreenJacky Chan2017-10-211-7/+11
| | * | | | | Add NoticeScreenJacky Chan2017-10-211-13/+15
| | * | | | | Add UniqueImageScreenJacky Chan2017-10-212-21/+30
| | * | | | | CreatePasswordScreenJacky Chan2017-10-211-0/+1
| | * | | | | Adding CreatePasswordScreenJacky Chan2017-10-212-0/+26
| | |/ / / /
| * / / / / Add support for alternative ENS TLDsDan Finlay2017-10-231-1/+1
| |/ / / /
* | | | | Merge pull request #2435 from danjm/NewUI-flat-disable-send-next-in-errorChi Kei Chan2017-10-251-8/+3
|\ \ \ \ \
| * \ \ \ \ Merge branch 'NewUI-flat' into NewUI-flat-disable-send-next-in-errorDaniel Tsui2017-10-2427-180/+469
| |\ \ \ \ \
| * | | | | | 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-244-8/+20
* | | | | | 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-242-2/+5
|/ / / / /
* | | | | Merge pull request #2433 from danjm/NewUI-flat-precision-improvementsChi Kei Chan2017-10-242-3/+5
|\ \ \ \ \
| * | | | | Improve precision in send and confirm.Dan2017-10-242-3/+5
* | | | | | Merge pull request #2434 from danjm/NewUI-flat-clear-send-stateChi Kei Chan2017-10-244-7/+31
|\ \ \ \ \ \
| * | | | | | Clear send state on cancelling and signing.Dan2017-10-244-7/+31
| |/ / / / /
* | | | | | Merge pull request #2431 from alextsg/nu-2406Chi Kei Chan2017-10-243-4/+4
|\ \ \ \ \ \
| * | | | | | Change all "Buy" to "Deposit"Alexander Tseung2017-10-233-4/+4
| |/ / / / /
* / / / / / Update settings screen to new UIAlexander Tseung2017-10-2310-287/+596
|/ / / / /
* | | | | Fix Conversions bugs; Fiat value bugsChi Kei Chan2017-10-215-9/+24
* | | | | Add resiliency to confirm-send-tokenChi Kei Chan2017-10-211-5/+5
* | | | | Merge pull request #2410 from alextsg/nu-2280Chi Kei Chan2017-10-214-46/+38
|\ \ \ \ \
| * | | | | Fix loading animation not showing on network changeAlexander Tseung2017-10-204-46/+38
* | | | | | Merge pull request #2413 from danjm/NewUI-flat-fix-addtoken-searchChi Kei Chan2017-10-211-1/+4
|\ \ \ \ \ \
| * | | | | | Only show erc20 tokens in add token search.Dan2017-10-201-1/+3
| * | | | | | Fixes add token search.Dan2017-10-201-0/+1
| |/ / / / /
* | | | | | Fixes regression in confirm-send-tokenDan2017-10-211-2/+4
* | | | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-211-1/+6
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Fix bug that breaks ui dev modeDan Finlay2017-10-191-1/+6
* | | | | 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-204-8/+6
* | | | | 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 master to NewUI-flatChi Kei Chan2017-10-191-0/+26
* | | | | Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-19120-2327/+12714
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 18:24:09 +0800