Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix styling on confirm-send-ether and confirm-send-token (#3600) | Alexander Tseung | 2018-03-17 | 3 | -225/+231 |
| | |||||
* | Update Confirm Contract screen (#3597) | Alexander Tseung | 2018-03-17 | 8 | -322/+432 |
| | |||||
* | Update margins for consistency in first time flow (#3588) | Alexander Tseung | 2018-03-16 | 1 | -6/+8 |
| | |||||
* | Update Deposit Eth icon (#3569) | Alexander Tseung | 2018-03-16 | 2 | -14/+6 |
| | |||||
* | Merge pull request #3558 from MetaMask/fix-two-translations | Thomas Huang | 2018-03-15 | 2 | -2/+2 |
|\ | | | | | Fix translations whose substitutions params were not in arrays. | ||||
| * | Fix translations whose substitutions params were not in arrays. | Dan | 2018-03-14 | 2 | -2/+2 |
| | | |||||
* | | Grammar correction | Dan Finlay | 2018-03-15 | 1 | -1/+1 |
|/ | |||||
* | ui - lint fix | kumavis | 2018-03-14 | 1 | -1/+1 |
| | |||||
* | Merge pull request #3445 from TheCriw/i3440-seed-restore-trim-invalid-characters | kumavis | 2018-03-14 | 1 | -0/+13 |
|\ | | | | | improved verification of restore from seed phrase | ||||
| * | FIX #3440 improved verification of restore from seed phrase | criw | 2018-03-06 | 1 | -0/+13 |
| | | |||||
* | | Remove windows.h from i18n.js | Thomas | 2018-03-14 | 1 | -1/+0 |
| | | |||||
* | | Add closing parens to appName | Thomas | 2018-03-14 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-14 | 11 | -105/+245 |
|\ \ | |||||
| * \ | Merge branch 'master' into i3033-responsive-newui-onboarding | kumavis | 2018-03-14 | 19 | -331/+469 |
| |\ \ | |||||
| | * \ | Merge pull request #3470 from danjm/newui-onboarding-fonts | kumavis | 2018-03-14 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Change fonts in new-ui onboarding to Roboto, with weight 400. | ||||
| | | * | | Update first time flow button fonts, and first-time-flow default font, to ↵ | Dan | 2018-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Roboto. | ||||
| | * | | | Merge pull request #3495 from alextsg/cb-290 | kumavis | 2018-03-14 | 5 | -99/+93 |
| | |\ \ \ | | | | | | | | | | | | | Increase tap areas for menu buttons on mobile | ||||
| | | * | | | Increase tap areas for menu buttons on mobile | Alexander Tseung | 2018-03-10 | 5 | -99/+93 |
| | | | | | | |||||
| * | | | | | Left align create password. | Dan | 2018-03-13 | 1 | -0/+12 |
| | | | | | | |||||
| * | | | | | Styling fixes to welcome; hide network component on create password; shown ↵ | Dan | 2018-03-13 | 3 | -8/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | welcoem in popup. | ||||
| * | | | | | Add welcome screen to new-ui browser first time flow. | Dan | 2018-03-09 | 6 | -3/+139 |
| | | | | | | |||||
| * | | | | | Make new-ui create password screen responsive. | Dan | 2018-03-08 | 1 | -24/+0 |
| | |_|/ / | |/| | | | |||||
* | | | | | Add missing opening parens to pag-container__subtitle | Thomas | 2018-03-14 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-14 | 5 | -83/+122 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Update deposit ether styling (#3510) | Alexander Tseung | 2018-03-13 | 5 | -82/+125 |
| | |/ / | |/| | | |||||
* | | | | Add loglevel and window.log to i18n.js | Thomas | 2018-03-13 | 1 | -0/+2 |
| | | | | |||||
* | | | | Add i18n back into JsonImportSubview | Thomas | 2018-03-12 | 1 | -7/+7 |
| | | | | |||||
* | | | | Merge branch 'master' into i18n | Thomas Huang | 2018-03-12 | 10 | -150/+228 |
|\| | | | |||||
| * | | | Remove de-selected token from selectedTokens hash instead of setting to null ↵ | Alexander Tseung | 2018-03-09 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | (#3494) | ||||
| * | | | Add empty object default value for tokenData (#3493) | Alexander Tseung | 2018-03-09 | 1 | -2/+2 |
| | | | | |||||
| * | | | Explicitly define state in import account from json component (#3491) | Alexander Tseung | 2018-03-09 | 2 | -79/+103 |
| | | | | |||||
| * | | | Fix flashing to Log in screen after logging in or restoring from seed phrase ↵ | Alexander Tseung | 2018-03-08 | 4 | -65/+104 |
| | | | | | | | | | | | | | | | | (#3466) | ||||
| * | | | Merge pull request #3409 from scsaba/seed-phrase-verification | Dan Finlay | 2018-03-08 | 1 | -0/+7 |
| |\ \ \ | | | | | | | | | | | Add seed phrase verification script into background process | ||||
| | * | | | verify seedwords on log in | Csaba Solya | 2018-03-04 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Update network colours for better accessibility. (#3469) | Dan J Miller | 2018-03-08 | 2 | -4/+8 |
| | |/ / | |/| | | |||||
* | | | | Correct caps of Send button on main screen. | Dan | 2018-03-08 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' into i18n | Dan Finlay | 2018-03-07 | 5 | -20/+30 |
|\| | | | |||||
| * | | | Merge branch 'master' into ImportAccountMessageV2 | kumavis | 2018-03-07 | 8 | -12/+41 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #3455 from MetaMask/i2475-UnifyLogInWording | kumavis | 2018-03-07 | 1 | -2/+2 |
| | |\ \ \ | | | | | | | | | | | | | Replace Lock wording with Log Out / Log In | ||||
| | | * \ \ | Merge branch 'master' into i2475-UnifyLogInWording | Dan Finlay | 2018-03-07 | 3 | -9/+8 |
| | | |\ \ \ | |||||
| | | * | | | | Replace Lock wording with Log Out / Log In | Dan Finlay | 2018-03-07 | 1 | -2/+2 |
| | | | |_|/ | | | |/| | | | | | | | | | | | | | | Fixes #2475 | ||||
| * | | | | | Merge branch 'master' into ImportAccountMessageV2 | Dan Finlay | 2018-03-07 | 3 | -14/+14 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' into ImportAccountMessageV2 | Thomas Huang | 2018-03-03 | 15 | -35/+463 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Import Account disclaimer | Thomas | 2018-03-03 | 2 | -9/+12 |
| | | | | | | | | |||||
| * | | | | | | | Swap color scheme for import account label | Thomas | 2018-03-03 | 1 | -2/+3 |
| | | | | | | | | |||||
| * | | | | | | | Remove committed out merge code | Thomas | 2018-02-28 | 1 | -16/+0 |
| | | | | | | | | |||||
| * | | | | | | | Change Loose label to Imported | Thomas | 2018-02-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Add import account disclaimer | Thomas | 2018-02-28 | 1 | -0/+22 |
| | | | | | | | | |||||
* | | | | | | | | Correct merge conflict resolution errors. | Dan | 2018-03-07 | 2 | -9/+0 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' into i18n | Dan | 2018-03-07 | 59 | -297/+1265 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #3433 from danjm/i3087-shapeshift-split-undefined | Dan Finlay | 2018-03-07 | 5 | -4/+28 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Shapeshift form handles 'market info unavailable' errors. | ||||
| | * | | | | | | | Shapeshift form handles market info unavailable errors. | Dan | 2018-03-07 | 5 | -4/+28 |
| | | |_|/ / / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #3446 from danjm/NewUI-handle-token-balance-on-edit | Dan Finlay | 2018-03-07 | 1 | -3/+7 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Gracefully handle null token balance in new ui send. | ||||
| | * | | | | | | | Gracefully handle null token balance in new ui send. | Dan | 2018-03-06 | 1 | -3/+7 |
| | | |_|_|/ / / | | |/| | | | | | |||||
| * | | | | | | | Merge pull request #3444 from danjm/i3348-minus-not-a-number | Dan Finlay | 2018-03-07 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | Prevent user from selecting max amount until gas is estimated. | ||||
| | * | | | | | | Prevent user from selecting max amount until there is an estimated gas total. | Dan | 2018-03-06 | 1 | -2/+3 |
| | |/ / / / / | |||||
| * | / / / / | Default add-token decimal value to string (#3451) | Dan J Miller | 2018-03-07 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Fix seed phrase validation clearing form (#3417) | Alexander Tseung | 2018-03-07 | 2 | -8/+7 |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix seed phrase validation clearing form * Make new ui import seed error feedback live, and allow newlines with and without carriage returns. | ||||
| * | / / | Fixes shapeshift coin selection dropdown. (#3416) | Dan J Miller | 2018-03-06 | 2 | -6/+7 |
| | |/ / | |/| | | |||||
| * | | | Fix NewUI reveal seed flow. (#3410) | Dan J Miller | 2018-03-03 | 4 | -8/+22 |
| | | | | |||||
| * | | | Allow adding 0 balance tokens in old ui and editing custom token info in new ↵ | Dan J Miller | 2018-03-03 | 1 | -5/+21 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | (#3395) * Shows tokens with 0 balance in old ui; goHome after adding tokens. * Allow users to edit custom token info when not autofilled. (New UI add token screen). | ||||
| * | | Fix network menu for custom URLs (#3366) | Alexander Tseung | 2018-03-02 | 2 | -14/+31 |
| | | | |||||
| * | | Fix exception thrown when styleOverride is not present (#3364) | Alexander Tseung | 2018-03-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #3356 from MetaMask/cdn-minimization | Kevin Serrano | 2018-03-02 | 1 | -2/+336 |
| |\ \ | | | | | | | | | Check in all font files locally. | ||||
| | * | | Correct ttf format name to 'truetype' | Dan | 2018-03-02 | 1 | -42/+42 |
| | | | | |||||
| | * | | Check in all font files locally. | Kevin Serrano | 2018-03-01 | 1 | -2/+336 |
| | |/ | |||||
| * | | Merge pull request #3359 from MetaMask/token-check-url | kumavis | 2018-03-01 | 1 | -1/+1 |
| |\ \ | | | | | | | | | [new-ui] add token - check for logo url before trying to use | ||||
| | * | | add token - check for logo url before trying to use | kumavis | 2018-03-01 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #3332 from danjm/MM-onboarding-flow-style-improvements | kumavis | 2018-03-01 | 3 | -0/+47 |
| |\ \ \ | | | | | | | | | | | [NewUI] Onboarding flow style improvements | ||||
| | * | | | Adds beta label to Metamask name in full screen app bar. | Dan | 2018-02-28 | 2 | -0/+17 |
| | | | | | |||||
| | * | | | Move beta warning to app header. | Dan | 2018-02-28 | 1 | -0/+6 |
| | | | | | |||||
| | * | | | Body width container in first time flow is consistent with app bar. | Dan | 2018-02-28 | 1 | -0/+24 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #3340 from danjm/i3338-contract-published-terminology | kumavis | 2018-03-01 | 2 | -2/+2 |
| |\ \ \ | | |_|/ | |/| | | [NewUI] Replace 'Contract Published' label with 'Contract Deployment' | ||||
| | * | | Replace 'Contract Published' with 'Contract Deployment' for clearer ↵ | Dan | 2018-02-28 | 2 | -2/+2 |
| | |/ | | | | | | | | | | indication of contract tx state. | ||||
| * / | Define event locally in onClickOutside method in account-dropdowns.js | Dan | 2018-03-01 | 2 | -2/+2 |
| |/ | |||||
| * | fix feature flags being undefined | frankiebee | 2018-02-27 | 1 | -0/+1 |
| | | |||||
| * | Use same logic for downloading state logs in the old/uat | Thomas Huang | 2018-02-21 | 1 | -1/+7 |
| | | |||||
| * | Render loading inside notice screen, and don't set isLoading from ↵ | Dan | 2018-02-21 | 1 | -1/+0 |
| | | | | | | | | unMarkPasswordForgotten. | ||||
| * | Try fixing notice screen synchronous state call | Dan Finlay | 2018-02-21 | 1 | -2/+1 |
| | | |||||
| * | Fix Import Existing DEN in popup New UI first time flow. | Dan | 2018-02-20 | 2 | -2/+24 |
| | | |||||
| * | Ensures that mascara initialize screen is not shown in popup. (#3279) | Dan J Miller | 2018-02-17 | 1 | -1/+4 |
| | | |||||
| * | Merge pull request #3200 from alextsg/cb-703 | kumavis | 2018-02-17 | 6 | -6/+6 |
| |\ | | | | | | | [NewUI] Remove accessing PropTypes from main React package | ||||
| | * | Remove accessing PropTypes from main React package | Alexander Tseung | 2018-02-07 | 6 | -6/+6 |
| | | | |||||
| * | | [NewUI] Adds the mascara first time flow to betaUI extension (#3257) | Dan J Miller | 2018-02-16 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | | | * Adds the mascara first time flow to the extension when opened in browser. * Fix tests after addition of mascara first time flow to new ui. | ||||
| * | | Merge pull request #3231 from danjm/MM-744-restore-from-seed-fix | Dan J Miller | 2018-02-14 | 2 | -3/+4 |
| |\ \ | | | | | | | | | [NewUI] Only open a new window on restore from seed if in extension view. | ||||
| | * | | Remove isInBrowser method and use environment-type.js | Dan | 2018-02-14 | 1 | -6/+4 |
| | | | | |||||
| | * | | Only open a new window on restore from seed if in extension view. | Dan | 2018-02-14 | 2 | -3/+6 |
| | | | | |||||
| * | | | Merge pull request #3209 from danjm/MM-634-newui-reset-account | Dan Finlay | 2018-02-14 | 5 | -35/+157 |
| |\ \ \ | | |/ / | |/| | | [NewUI] Add reset account button to new UI. | ||||
| | * | | Add reset account button to new UI. | Dan | 2018-02-09 | 5 | -35/+157 |
| | | | | |||||
| * | | | Merge pull request #3216 from danjm/MM-666-try-beta-link-unlock-privacy-screens | Dan Finlay | 2018-02-14 | 1 | -0/+17 |
| |\ \ \ | | | | | | | | | | | [NewUI] Try beta link on unlock and privacy screens. | ||||
| | * | | | Try beta link on unlock and privacy screens. | Dan | 2018-02-09 | 1 | -0/+17 |
| | |/ / | |||||
| * | | | Updates the styling of confirm send ether and token screens. (#3235) | Dan J Miller | 2018-02-13 | 3 | -26/+20 |
| | | | | |||||
| * | | | Send screen style updates. (#3234) | Dan J Miller | 2018-02-13 | 4 | -9/+52 |
| | | | | |||||
| * | | | Remove chrome focus outline for mouse users. (#3230) | Dan J Miller | 2018-02-13 | 4 | -1/+40 |
| | | | | |||||
| * | | | Fix exception thrown in selected token tx list with shapeshift txs (#3215) | Alexander Tseung | 2018-02-09 | 1 | -3/+3 |
| | | | | |||||
| * | | | Fixes shapeshift txs so that they render in tx list. (#3208) | Dan J Miller | 2018-02-09 | 2 | -36/+28 |
| |/ / | |||||
| * | | Merge pull request #3206 from danjm/merge-uat-to-uatnext-feb072019 | Dan J Miller | 2018-02-08 | 2 | -0/+22 |
| |\ \ | | | | | | | | | [NewUI] Merge uat to uatnext feb072019 | ||||
| | * \ | Merge branch 'uat' into uat-next | Dan | 2018-02-08 | 2 | -0/+22 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' into uat | Dan | 2018-02-08 | 2 | -0/+22 |
| | | |\ \ | |||||
| | | | * | | Scrollable Settings screen for Firefox | Thomas | 2018-02-02 | 1 | -1/+6 |
| | | | | | | |||||
| | | | * | | Merge pull request #3161 from MetaMask/AddResetExplanation | Frankie | 2018-02-01 | 2 | -59/+20 |
| | | | |\ \ | | | | | | | | | | | | | | | Add reset explanation | ||||
| | | | | * | | Add explanation of account resetting | Dan Finlay | 2018-02-01 | 1 | -0/+20 |
| | | | | | | | |||||
| | | | | * | | Remove unused file | Dan Finlay | 2018-02-01 | 1 | -59/+0 |
| | | | | | | | |||||
| | | | * | | | Merge pull request #3146 from MetaMask/i3082-AddTokenValidateInputs | Frankie | 2018-02-01 | 1 | -2/+2 |
| | | | |\ \ \ | | | | | |/ / | | | | |/| | | Set address to default with empty string, add test validation. | ||||
| | | | | * | | Set address to default with empty string, add test validation. | Thomas | 2018-01-31 | 1 | -2/+2 |
| | | | | | | | |||||
| | | | * | | | added reset account feature | Bruno Barbieri | 2018-01-31 | 2 | -0/+35 |
| | | | | | | | |||||
| | | | * | | | Add warning when importing no valid file | Dan Finlay | 2018-01-31 | 1 | -0/+6 |
| | | | |/ / | | | | | | | | | | | | | | | | | | | Fixes #3089 | ||||
| * | | / / | Make blockies icon round to match identicons (#3205) | Alexander Tseung | 2018-02-08 | 2 | -5/+5 |
| |/ / / / | |||||
| * | | | | [NewUI] Opens to full screen when restoring from seed. (#3201) | Dan J Miller | 2018-02-08 | 5 | -24/+39 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Opens to full screen when restoring from seed. * Remove redundant parameter in actions.markPasswordForgotten call. | ||||
| * | | | | Update modal header design on send screen (#3196) | Alexander Tseung | 2018-02-07 | 3 | -55/+126 |
| | | | | | |||||
| * | | | | Fix alignment of ellipsis and address in wallet view. (#3198) | Dan J Miller | 2018-02-07 | 3 | -2/+3 |
| | |_|/ | |/| | | |||||
| * | | | Remove duplicate token balance on uat next. (#3195) | Dan J Miller | 2018-02-07 | 1 | -2/+0 |
| | | | | |||||
| * | | | Add functional integration testing to Add Token flow (#3189) | Alexander Tseung | 2018-02-06 | 1 | -3/+4 |
| | | | | |||||
| * | | | Wallet view supports screen sizes between 576px and 667px (#3193) | Dan J Miller | 2018-02-06 | 5 | -24/+70 |
| | | | | |||||
| * | | | [NewUI] Use tooltip for copy to clipboard helper text on main screen. (#3120) | Dan J Miller | 2018-02-01 | 5 | -11/+76 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
| * | | | [NewUI] Updates capitalization and alignment for the import account screen. ↵ | Dan J Miller | 2018-02-01 | 3 | -11/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#3122) * Updates capitalization and alignment for the import account screen. * Align elements in import form. | ||||
| * | | | [NewUI] Set default new account name as placeholder, but not value (#3121) | Dan J Miller | 2018-02-01 | 1 | -5/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Set default new account name as placehold, and not value, in new account create screen. * Set new account number in create-form.js in constructor. | ||||
| * | | | Fix bug stemming from erroneously persistant unlock failure error message. ↵ | Dan J Miller | 2018-01-30 | 2 | -0/+15 |
| |/ / | | | | | | | | | | (#3123) | ||||
| * | | Merge branch 'master' into uat | Thomas Huang | 2018-01-24 | 1 | -1/+0 |
| |\| | |||||
| | * | add a `x` close button to gas calc loding screen on conf-tx | frankiebee | 2018-01-18 | 2 | -2/+16 |
| | | | |||||
| * | | String interpolate version in settings | Thomas | 2018-01-23 | 1 | -1/+1 |
| | | | |||||
* | | | Implemented feedback to make i18n work on mac | Dan Finlay | 2018-03-07 | 3 | -8/+11 |
| | | | |||||
* | | | complete i18n across new UI | Nick Doiron | 2018-01-30 | 32 | -96/+115 |
| | | | |||||
* | | | pass linter, update ui test | Nick Doiron | 2018-01-28 | 1 | -8/+10 |
| | | | |||||
* | | | get t imported in all files currently using i18n | Nick Doiron | 2018-01-25 | 30 | -1/+30 |
| | | | |||||
* | | | separate out cross-browser i18n for extensions | Nick Doiron | 2018-01-25 | 24 | -7/+41 |
| | | | |||||
* | | | better organization of locale file; i18n in more view files | Nick Doiron | 2018-01-24 | 25 | -135/+123 |
| | | | |||||
* | | | first steps to i18n | Nick Doiron | 2018-01-23 | 31 | -153/+148 |
|/ / | |||||
* | | Merge pull request #3049 from chikeichan/newmaster | Chi Kei Chan | 2018-01-20 | 1 | -1/+1 |
|\ \ | | | | | | | Merge master to uat | ||||
| * \ | Merge branch 'uat' into newmaster | Chi Kei Chan | 2018-01-20 | 152 | -3280/+17901 |
| |\ \ | | |/ | |/| | |||||
| * | | Add network-indicator classname to network loading spinner | Thomas | 2018-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | Get version from manifest instead of hard coding in New UI info page. | Dan | 2018-01-20 | 1 | -1/+3 |
| |/ |/| | |||||
* | | Fix transaction list font sizes, padding | Alexander Tseung | 2018-01-19 | 2 | -17/+7 |
| | | |||||
* | | Merge pull request #3024 from alextsg/cb-529 | Kevin Serrano | 2018-01-19 | 3 | -3/+5 |
|\ \ | | | | | | | [NewUI] Update popout to fullscreen icon | ||||
| * | | Fix lint errors | Alexander Tseung | 2018-01-18 | 1 | -1/+1 |
| | | | |||||
| * | | Update popout to fullscreen icon | Alexander Tseung | 2018-01-18 | 2 | -2/+4 |
| | | | |||||
* | | | [NewUI] Send screen gas loading fixes (#3027) | Dan J Miller | 2018-01-18 | 3 | -27/+25 |
|/ / | | | | | | | | | | | * Allow entering amount, but disable validation of amount, opening of gas customizer or clicking of next, when gas loading in send. * Fix variable name. | ||||
* | | Show now tokens by default and improve search on add token screen. | Dan | 2018-01-18 | 1 | -5/+10 |
| | | |||||
* | | Fix tx-list, confirmation screen styling | Alexander Tseung | 2018-01-18 | 4 | -13/+18 |
| | | |||||
* | | Merge pull request #3005 from alextsg/cb-385 | Chi Kei Chan | 2018-01-18 | 1 | -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 button | Alexander Tseung | 2018-01-17 | 1 | -1/+3 |
| | | | |||||
* | | | Merge pull request #3007 from alextsg/uat-master-011618 | Chi Kei Chan | 2018-01-18 | 3 | -5/+7 |
|\ \ \ | | | | | | | | | [NewUI] Merge master into uat branch | ||||
| * | | | Merge branch 'uat' into uat-master-011618 | Alexander Tseung | 2018-01-17 | 152 | -3280/+17868 |
| |\| | | | |/ | |/| | |||||
| * | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight | Dan Finlay | 2018-01-17 | 2 | -1/+7 |
| |\ \ | |||||
| | * \ | Merge pull request #2984 from MetaMask/RenameLockToLogout | Thomas Huang | 2018-01-17 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | Rename lock to log out | ||||
| | | * | | Rename lock to log out | Dan Finlay | 2018-01-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes #2475 | ||||
| | * | | | Merge branch 'master' into open-popup | Frankie | 2018-01-16 | 1 | -3/+3 |
| | |\| | | |||||
| | * | | | add a loading spinner to conf-tx view | frankiebee | 2018-01-15 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Merge branch 'master' into i2779-FirefoxSpecifyAccountDetailHeight | Dan Finlay | 2018-01-16 | 1 | -3/+3 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Use https | Dan Finlay | 2018-01-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Update support links for helpscout | Dan Finlay | 2018-01-10 | 1 | -3/+3 |
| | |/ / | |||||
| * | | | Add max height for Firefox addon overflow and hide horizontal scroll | tmashuang | 2018-01-11 | 1 | -0/+2 |
| | | | | |||||
| * | | | Add one px to address for Firefox clipping | tmashuang | 2018-01-11 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge pull request #2855 from abitrolly/patch-2 | kumavis | 2018-01-09 | 1 | -1/+0 |
| |\ \ | | | | | | | | | info.js Remove width element to fix email layout | ||||
| | * | | info.js Remove width element to fix email layout | Anatoli Babenia | 2018-01-04 | 1 | -1/+0 |
| | | | | |||||
| * | | | Merge pull request #2851 from MetaMask/i2812-seedworderrorfix | Kevin Serrano | 2018-01-09 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |/| | | Fix condition where failing seed word checks would infinite-spin future attempts. | ||||
| | * | | Add fix for infinite spinner for incorrect seed phrase. | Kevin Serrano | 2018-01-04 | 1 | -0/+4 |
| | | | | |||||
* | | | | Readjust gas fees when switching networks on the send screen | Alexander Tseung | 2018-01-17 | 2 | -22/+44 |
| | | | | |||||
* | | | | Vertically centers the text of the new ui modal header. (#2987) | Dan J Miller | 2018-01-17 | 1 | -0/+1 |
| | | | | |||||
* | | | | Adding one or more tokens sets the selected token before returning the user ↵ | Dan J Miller | 2018-01-17 | 2 | -0/+8 |
| |_|/ |/| | | | | | | | | to the main screen. (#2995) | ||||
* | | | Restore display of all unconfirmed transactions. | Dan | 2018-01-16 | 1 | -34/+34 |
| | | | |||||
* | | | Fix send screen value input | Alexander Tseung | 2018-01-16 | 1 | -3/+11 |
| | | | |||||
* | | | Fix Hide Token modal styling, popup positioning | Alexander Tseung | 2018-01-16 | 4 | -25/+15 |
| | | | |||||
* | | | Merge pull request #2964 from alextsg/cb-505c | Dan Finlay | 2018-01-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | [NewUI] Move blockies option to the bottom of Settings | ||||
| * | | | Move blockies option to the bottom of Settings | Alexander Tseung | 2018-01-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | [NewUI] Place all users of extension into old UI (disable auto adding). (#2946) | Dan J Miller | 2018-01-16 | 1 | -23/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | * Place all users of extension into old UI (disable auto adding). * Fix lint errors. | ||||
* | | | | Fix confirm Add Token button order | Alexander Tseung | 2018-01-13 | 1 | -4/+4 |
| | | | | |||||
* | | | | Fix Add Token button order, styling | Alexander Tseung | 2018-01-13 | 2 | -14/+16 |
| | | | | |||||
* | | | | Fix input box padding and select highlight in new account create and import ↵ | Dan | 2018-01-13 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | page. | ||||
* | | | | New add account page with create and import options. | Dan | 2018-01-13 | 13 | -95/+475 |
| | | | | |||||
* | | | | Merge branch 'uat' into cb-388 | Chi Kei Chan | 2018-01-13 | 15 | -309/+732 |
|\ \ \ \ | |||||
| * | | | | Fix styling in initialization | Alexander Tseung | 2018-01-13 | 2 | -5/+14 |
| |/ / / | |||||
| * | | | [NewUI-flat] New deposit ether modal UI. (#2642) | Dan J Miller | 2018-01-13 | 11 | -301/+711 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 Tseung | 2018-01-12 | 2 | -2/+6 |
| | | | | |||||
| * | | | Fix padding of a hovered tx-list-item (#2859) | Dan J Miller | 2018-01-12 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix token balance color | Alexander Tseung | 2018-01-12 | 1 | -1/+3 |
| | | | | |||||
* | | | | Fix lint errors | Alexander Tseung | 2018-01-12 | 1 | -1/+0 |
| | | | | |||||
* | | | | Change styling for network dropdown | Alexander Tseung | 2018-01-12 | 2 | -58/+25 |
| | | | | |||||
* | | | | Update styling for buttons, font weights | Alexander Tseung | 2018-01-12 | 16 | -125/+83 |
| | | | | |||||
* | | | | Update main view styling | Alexander Tseung | 2018-01-11 | 11 | -68/+64 |
|/ / / | |||||
* | | | ui - fix font path name | kumavis | 2018-01-09 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #2848 from MetaMask/NewUI-flat | Alexander Tseung | 2018-01-04 | 2 | -5/+9 |
|\ \ \ | | | | | | | | | [NewUI] Merge NewUI-flat into uat | ||||
| * \ \ | Merge branch 'NewUI-flat' into NewUI-flat-4.0.5c | Alexander Tseung | 2018-01-04 | 146 | -2909/+16765 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | fix comment | oosthuizenr | 2018-01-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixes #2834 | Renier Oosthuizen | 2018-01-03 | 1 | -5/+6 |
| | |/ | |/| | |||||
| * | | Add frontend validation to ensure that ether inputs are valid. | Kevin Serrano | 2017-12-28 | 1 | -2/+12 |
| | | | |||||
| * | | Add frontend validation to check if send ether input is a valid number. | Kevin Serrano | 2017-12-28 | 1 | -0/+6 |
| | | | |||||
| * | | Add backend fix for util in normalizeethstringtowei. | Kevin Serrano | 2017-12-28 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #2799 from MetaMask/NewUI-flat | Alexander Tseung | 2017-12-23 | 34 | -191/+1115 |
|\ \ \ | | |/ | |/| | Update UAT to version 4.0.5 | ||||
| * | | Track usage of old and new UI (#2794) | Alexander Tseung | 2017-12-23 | 5 | -10/+63 |
| | | | | | | | | | [NewUI] Track usage of old and new UI | ||||
| * | | [NewUI] Fixes tests and sends user to NewUI after registering. (#2788) | Dan J Miller | 2017-12-22 | 3 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes tests and sends user to NewUI after registering. * Karma config? * Empty commit * Remove unneeded json state mock file. | ||||
| * | | Merge branch 'NewUI-flat' into merge-master-to-newUI-flat-dec20 | Chi Kei Chan | 2017-12-21 | 6 | -74/+93 |
| |\ \ | |||||
| | * | | Clone transaction while editing instead of mutating object from state. | Dan | 2017-12-21 | 1 | -6/+7 |
| | | | | |||||
| | * | | Add constanst for token transfer function signature. | Dan | 2017-12-21 | 2 | -1/+5 |
| | | | | |||||
| | * | | Lint fixes. | Dan | 2017-12-21 | 4 | -6/+2 |
| | | | | |||||
| | * | | Adds updateTransaction to background and used it to update after editing in ↵ | Dan | 2017-12-21 | 6 | -95/+80 |
| | | | | | | | | | | | | | | | | send-v2. | ||||
| | * | | Canceled, edited transactions show edited amount. | Dan | 2017-12-21 | 3 | -2/+35 |
| | | | | |||||
| * | | | Merge branch 'master' into NewUI-flat | Dan | 2017-12-21 | 3 | -37/+109 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Merge pull request #2706 from danjm/MM-fix-buy-cancel-button | Thomas Huang | 2017-12-15 | 1 | -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. | Dan | 2017-12-09 | 1 | -1/+1 |
| | | | | |||||
| | * | | Show watched tokens with no balance | Dan Finlay | 2017-12-13 | 1 | -4/+1 |
| | |/ | |||||
| | * | Merge pull request #2654 from abitrolly/patch-2 | Kevin Serrano | 2017-12-07 | 1 | -1/+1 |
| | |\ | | | | | | | | | Download State Logs with .json extension | ||||
| | | * | Download State Logs with .json extension | Anatoli Babenia | 2017-12-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | That doesn't fix #2095, but at least makes downloaded files syntax-highlighted when opened in editors | ||||
| | * | | Add 10% price bump to retry attempts. | Dan Finlay | 2017-12-07 | 1 | -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 Tseung | 2017-12-07 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | hover styling | ||||
| | * | | Merge branch 'RetryTransaction' of github.com:MetaMask/metamask-plugin into ↵ | Dan Finlay | 2017-12-07 | 1 | -4/+4 |
| | |\ \ | | | | | | | | | | | | | | | | RetryTransaction | ||||
| | | * | | Fix styling of Retry buton | Alexander Tseung | 2017-12-07 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Enforce retry tx at minimum gas of previous tx | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| | |/ / | |||||
| | * | | Fix retry action | Dan Finlay | 2017-12-07 | 1 | -2/+2 |
| | | | | |||||
| | * | | View tx after editing state to unconfirmed | Dan Finlay | 2017-12-07 | 1 | -1/+9 |
| | | | | |||||
| | * | | Fix action | Dan Finlay | 2017-12-07 | 1 | -2/+2 |
| | | | | |||||
| | * | | Connect to redux for retryTransaction | Alexander Tseung | 2017-12-07 | 1 | -2/+10 |
| | | | | |||||
| | * | | Add button to retry transaction | Alexander Tseung | 2017-12-07 | 1 | -34/+69 |
| | | | | |||||
| | * | | Add retry background method and action | Dan Finlay | 2017-12-07 | 2 | -1/+15 |
| | |/ | |||||
| | * | Prevent multiple submissions of first time form | Dan Finlay | 2017-11-21 | 1 | -1/+6 |
| | | | |||||
| * | | [NewUI] Hide UI toggle in mascara (#2772) | Dan J Miller | 2017-12-21 | 3 | -18/+22 |
| | | | | | | | | | | | | | | | | | | * Hides old-UI on mascara. * Improve code clarity in select-app.js | ||||
| * | | Hide fiat values on account details screen when eth/token value is 0. | Dan | 2017-12-21 | 3 | -3/+8 |
| | | | |||||
| * | | Hides the sidebar after the an account menu actions changes the screen ↵ | Dan | 2017-12-21 | 1 | -0/+6 |
| | | | | | | | | | | | | behind the sidebar. | ||||
| * | | Fix edit to field bug. (#2738) | Dan J Miller | 2017-12-13 | 1 | -6/+7 |
| | | | |||||
| * | | Fix height of login screen | Dan | 2017-12-13 | 1 | -27/+25 |
| | | | |||||
| * | | Fix isMascara and update yarn.lock | Chi Kei Chan | 2017-12-13 | 1 | -2/+2 |
| | | | |||||
| * | | Substitute isMascara check for explicit check if user is on mobile browser. | Dan | 2017-12-13 | 2 | -13/+2 |
| | | | |||||
| * | | Hide open in browser button on mobile (but still show on extension); adds a ↵ | Dan | 2017-12-13 | 3 | -3/+15 |
| | | | | | | | | | | | | function to detect if viewing with mobile browser. | ||||
| * | | Adds button for opening app in main browser window in extension. | Dan | 2017-12-13 | 2 | -0/+9 |
| | | | |||||
| * | | Merge branch 'NewUI-flat' into cb-372 | Chi Kei Chan | 2017-12-08 | 17 | -54/+360 |
| |\ \ | |||||
| | * \ | Merge branch 'NewUI-flat' into MM-333-auto-add-users-to-new-UI | Chi Kei Chan | 2017-12-08 | 7 | -16/+61 |
| | |\ \ | |||||
| | | * | | Update max amount behaviour to meet new specs. | Dan | 2017-12-07 | 6 | -15/+55 |
| | | | | | |||||
| | | * | | Merge branch 'master' into NewUI-flat-merge-with-master | Dan | 2017-12-07 | 1 | -1/+6 |
| | | | | | |||||
| | * | | | User is automatically added to new UI if they meet conditions at time of login. | Dan | 2017-12-07 | 2 | -3/+47 |
| | | | | | |||||
| | * | | | Show user notifications after switch between UIs | Dan | 2017-12-05 | 6 | -2/+135 |
| | | | | | |||||
| | * | | | Update newUI UI for switching back to old UI. | Dan | 2017-12-05 | 2 | -8/+24 |
| | | | | | |||||
| | * | | | Lint fix | Dan | 2017-12-05 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | New-ui actions accomodates old-ui. | Dan | 2017-12-05 | 2 | -8/+11 |
| | | | | | |||||
| | * | | | Add UI selection | Dan | 2017-12-05 | 7 | -29/+94 |
| | |/ / | |||||
| * / / | Update font weights to 300, remove animation from network dropdown, fix ↵ | Alexander Tseung | 2017-12-02 | 5 | -23/+28 |
| |/ / | | | | | | | | | | network dropdown not closing from certain click-areas | ||||
| * | | Remove useBlockie in props for render | Thomas Huang | 2017-11-29 | 1 | -1/+1 |
| | | | | | | | | | Removed unused useBlock for Lint validation. | ||||
| * | | Fixes changes requested in pullrequestreview-79088534 | Jason Clark | 2017-11-27 | 1 | -2/+2 |
| | | | |||||
| * | | making eslint happy | Jason Clark | 2017-11-26 | 3 | -7/+8 |
| | | | |||||
| * | | fixing blockies display issues | Jason Clark | 2017-11-26 | 2 | -5/+9 |
| | | | |||||
| * | | swapped out ethereum-blockies lib for MEW blockies library, tightened up ↵ | Jason Clark | 2017-11-26 | 3 | -85/+413 |
| | | | | | | | | | | | | identicon.js code | ||||
| * | | tweaking styling | Jason Clark | 2017-11-25 | 2 | -9/+27 |
| | | | |||||
| * | | incremental commit of working blockie component | Jason Clark | 2017-11-25 | 2 | -15/+56 |
| | | | |||||
| * | | toggle wired up to preferences property store | Jason Clark | 2017-11-25 | 3 | -20/+30 |
| | | | |||||
| * | | incremental commit | Clark, Jason (Contractor) | 2017-11-24 | 4 | -1/+42 |
| | | | |||||
| * | | Remove unneeded type casting | Dan Finlay | 2017-11-21 | 1 | -1/+1 |
| | | | |||||
| * | | Fix bug where gas param was not a string | Dan Finlay | 2017-11-21 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | Prevented sending transactions. Fixes #2598 | ||||
* | | | Merge pull request #2591 from MetaMask/NewUI-flat | Chi Kei Chan | 2017-11-16 | 33 | -173/+756 |
|\| | | | | | | | | Release 4.0.4 | ||||
| * | | Merge branch 'master' into merge-master | Chi Kei Chan | 2017-11-16 | 3 | -10/+29 |
| |\| | |||||
| | * | Use const and fix lint warnings | Daijiro Wachi | 2017-10-31 | 1 | -2/+2 |
| | | | |||||
| | * | Remove warning message when show import page | Daijiro Wachi | 2017-10-31 | 2 | -0/+2 |
| | | | | | | | | | | | | Fixes: https://github.com/MetaMask/metamask-extension/issues/1192 |