aboutsummaryrefslogtreecommitdiffstats
path: root/ui
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4691 from MetaMask/i4404-confirm-refactorAlexander Tseung2018-07-12102-553/+4311
|\ | | | | Refactor and redesign confirm transaction views
| * Fix font sizes, colors. Include data tab for send-eth transaction ↵Alexander Tseung2018-07-124-4/+20
| | | | | | | | confirmations that have data
| * Fix multiple signature requests showing an infinite spinnerAlexander Tseung2018-07-111-2/+11
| |
| * Add unit tests for confirmTransaction duck and utilAlexander Tseung2018-07-102-0/+812
| |
| * Fix existing unit testsAlexander Tseung2018-07-081-4/+7
| |
| * Various fixes from PR commentsAlexander Tseung2018-07-0714-154/+216
| |
| * Use eth-method-registry to get method dataAlexander Tseung2018-07-078-34/+112
| |
| * Display newest transactionAlexander Tseung2018-07-073-5/+5
| |
| * Refactor data flow, signature request routingAlexander Tseung2018-07-079-117/+185
| |
| * Refactor and redesign confirm transaction viewsAlexander Tseung2018-07-0797-545/+3255
| |
* | Prevent users from submitting password multiple times on the unlock screenAlexander Tseung2018-07-113-38/+40
|/
* Merge pull request #4648 from MetaMask/update-import-from-seed-screenDan J Miller2018-07-063-152/+172
|\ | | | | Update import from seed screen on new ui.
| * Delete old restore vault file.Dan2018-07-063-341/+163
| |
| * Update import from seed screen on new ui.Dan2018-07-053-1/+199
| |
* | Merge pull request #4694 from MetaMask/i4660-improve-send-token-error-uiDan J Miller2018-07-0618-17/+320
|\ \ | | | | | | Improve send token error ux.
| * | Improve send token error ux.Dan2018-07-0518-17/+320
| | |
* | | Merge pull request #4733 from whymarrh/fix-setstate-warningsWhymarrh Whitby2018-07-063-0/+14
|\ \ \ | | | | | | | | Fix setState warnings in components using TokenTracker
| * | | Don't update token balances after tracker is stoppedWhymarrh Whitby2018-07-053-0/+10
| | | |
| * | | Remove TokenTracker listeners when unmounting componentWhymarrh Whitby2018-07-052-0/+4
| | | |
* | | | Merge pull request #4734 from whymarrh/txlistitem-setstate-warningWhymarrh Whitby2018-07-061-0/+9
|\ \ \ \ | | | | | | | | | | Prevent calling setState in TxListItem after unmount
| * | | | Prevent calling setState in TxListItem after unmountWhymarrh Whitby2018-07-051-0/+9
| |/ / /
* | | | Merge pull request #4617 from TrejGun/fix-new-lineDan J Miller2018-07-061-0/+1
|\ \ \ \ | | | | | | | | | | fix white spaces in signature
| * | | | fix white spaces in signaturetrejgun2018-06-201-0/+1
| | | | |
* | | | | Merge pull request #4686 from MetaMask/tweak-token-list-amount-styleDan J Miller2018-07-051-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | | Ensures token list amount is in its own row.
| * | | | Ensures token list amount is in its own row.Dan2018-07-051-0/+1
| | |/ / | |/| |
* | | | Merge pull request #4685 from MetaMask/estimate-gasprice-background-newuiDan J Miller2018-07-051-14/+20
|\ \ \ \ | | | | | | | | | | Use background gas price estimation method in new ui.
| * | | | Improve error and promise resolution handling in action.js updateGasData().Dan2018-07-051-13/+14
| | | | |
| * | | | Remove unnecessary anonymous function call in actions.js gas estimation.Dan2018-07-041-7/+6
| | | | |
| * | | | Use background gas price estimation method in new ui.Dan2018-06-291-8/+14
| | | | |
* | | | | fixes 4666Sara Reynolds2018-07-041-2/+5
| | | | |
* | | | | :qwSara Reynolds2018-07-041-10/+0
| |/ / / |/| | | | | | | | | | | | | | | :wq q
* | | | Merge pull request #4716 from MetaMask/i4663-clearErrorMessagesDan J Miller2018-07-042-0/+2
|\ \ \ \ | |_|_|/ |/| | | fixes #4663 - Clear Error Messages when Importing Accounts are Successful
| * | | fixes 4663Sara Reynolds2018-07-042-0/+2
| | | |
* | | | Merge pull request #4654 from TrejGun/bignumberDan J Miller2018-07-042-1/+23
|\ \ \ \ | | | | | | | | | | fixes #4307 BigNumber casting issue
| * | | | linttrejgun2018-06-291-1/+1
| | | | |
| * | | | change numberstrejgun2018-06-241-7/+6
| | | | |
| * | | | remove .onlytrejgun2018-06-241-1/+1
| | | | |
| * | | | fixes #4307 BigNumber casting issuetrejgun2018-06-242-1/+24
| | |_|/ | |/| |
* | | | Merge pull request #4633 from MetaMask/i4580-import-account-errorsAlexander Tseung2018-07-042-2/+2
|\ \ \ \ | | | | | | | | | | Show all errors on account creation screen.
| * | | | Check that error is defined in import-account error catch.Dan2018-06-292-2/+2
| | | | |
| * | | | Show all errors on account creation screen.Dan2018-06-292-2/+2
| | |_|/ | |/| |
* | | | Merge pull request #4699 from TrejGun/removeLeadingZeroesDan J Miller2018-07-043-4/+36
|\ \ \ \ | |_|_|/ |/| | | move removeLeadingZeroes to utils, add test
| * | | move removeLeadingZeroes to utils, add testtrejgun2018-07-023-4/+36
| | | |
* | | | eslint --fix .brunobar792018-07-0320-22/+22
| | | |
* | | | Merge pull request #4687 from snreynolds/i4623-getConvertedCurrencyDan J Miller2018-06-308-24/+9
|\ \ \ \ | | | | | | | | | | fixes #4623
| * | | | fixes #4623Sara Reynolds2018-06-308-24/+9
| | |/ / | |/| |
* | | | Merge pull request #4640 from weijiekoh/developDan J Miller2018-06-301-0/+3
|\ \ \ \ | | | | | | | | | | Fix for #4639: display values of EIP712 typed boolean fields in the signing prompt
| * | | | removed stray console.logKoh Wei Jie2018-06-221-1/+0
| | | | |
| * | | | fixed blank boolean field for typed signing for new UIKoh Wei Jie2018-06-221-0/+4
| | | | |
* | | | | Merge pull request #4647 from MetaMask/fix-overflow-currency-displayDan J Miller2018-06-303-2/+12
|\ \ \ \ \ | | | | | | | | | | | | Fix issues with scrollbar in currency display.
| * | | | | Improve attribute syntax in send-amount-row.component.jsDan J Miller2018-06-301-1/+1
| | | | | |
| * | | | | Remove input arrows for send screen amount row on firefox.Dan2018-06-293-0/+11
| | | | | |
| * | | | | Fix issues with scrollbar in currency display.Dan2018-06-292-2/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #4690 from MetaMask/i4662-token-gas-estimate-uxDan Finlay2018-06-293-0/+11
|\ \ \ \ \ | | | | | | | | | | | | Set base estimate for token sends to be updated once recipient address specified
| * | | | | Set based estimate for token sends to be updated once recipient address ↵Dan2018-06-293-0/+11
| |/ / / / | | | | | | | | | | | | | | | specified.
* | | | | Merge pull request #4634 from MetaMask/i4503-touch-up-shpshft-button-styleThomas Huang2018-06-292-7/+26
|\ \ \ \ \ | |/ / / / |/| | | | Fix style of shapeshift screen in deposit modal.
| * | | | Fix style of shapeshift screen in deposit modal.Dan2018-06-222-7/+26
| |/ / /
* | | | Merge pull request #4678 from MetaMask/e2e-beta-tests-upgradeDan J Miller2018-06-291-4/+8
|\ \ \ \ | | | | | | | | | | E2e beta tests upgrade
| * | | | Fix send token tests in beta ui e2e tests.Dan2018-06-271-4/+8
| | | | |
| * | | | Only show the customize gas modal if the estimateGas call is not currently ↵Dan2018-06-274-6/+79
| | | | | | | | | | | | | | | | | | | | in flight.
* | | | | Merge pull request #4674 from MetaMask/removeOnlyTestsThomas Huang2018-06-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove .only on test
| * | | | | Remove .only on testtmashuang2018-06-271-1/+1
| |/ / / /
* | | | | Merge pull request #4677 from MetaMask/customize-gas-loading-waitDan J Miller2018-06-284-6/+79
|\ \ \ \ \ | | | | | | | | | | | | Only show the customize gas modal if the estimateGas call is not currently in flight.
| * | | | | Only show the customize gas modal if the estimateGas call is not currently ↵Dan2018-06-194-6/+79
| | |_|/ / | |/| | | | | | | | | | | | | in flight.
* | | | | Merge pull request #4574 from MetaMask/i4409-i4410-ens-input-enhancementsDan J Miller2018-06-286-41/+71
|\ \ \ \ \ | |_|/ / / |/| | | | [new-ui] Improve ENS input errors and update ens validation on network change
| * | | | Remove commented out code in ens-input.Dan2018-06-221-1/+0
| | | | |
| * | | | Merge branch 'develop' into i4409-i4410-ens-input-enhancementsDan2018-06-2019-56/+205
| |\| | |
| * | | | ENS input in send form shows distinct errors for invalid addresses and ↵Dan2018-06-156-22/+43
| | | | | | | | | | | | | | | | | | | | non-existent addresses.
| * | | | ENS name revalidates on network change.Dan2018-06-131-23/+33
| | | | |
* | | | | Merge pull request #4627 from TrejGun/gas-fee-displayDan J Miller2018-06-278-57/+121
|\ \ \ \ \ | |_|_|/ / |/| | | | refactor gas-fee-display component
| * | | | fix default importtrejgun2018-06-232-2/+2
| | | | |
| * | | | linttrejgun2018-06-212-3/+13
| | | | |
| * | | | refactor gas-fee-display componenttrejgun2018-06-218-57/+111
| | |_|/ | |/| | | | | | | | | | #4622
* | | | Scroll large amounts in the send componentWhymarrh Whitby2018-06-212-4/+6
| | | |
* | | | Handle large token balances in tx list heroWhymarrh Whitby2018-06-214-5/+21
| |_|/ |/| |
* | | Merge pull request #4584 from MetaMask/fix-send-tokenkumavis2018-06-1911-19/+140
|\ \ \ | | | | | | | | Add hex-prefix to gas estimate result
| * | | On send screen amount change, updateGas call now includes current to address.Dan2018-06-196-4/+37
| | | |
| * | | Send screen returns simple gas cost if no to address specified when not ↵Dan2018-06-192-3/+8
| | | | | | | | | | | | | | | | sending token.
| * | | Remove leading zeroes from send screen amount row input.Dan2018-06-191-1/+5
| | | |
| * | | Fix currency-display.js rendering of token amounts.Dan2018-06-191-0/+1
| | | |
| * | | Revert to updating amount on blur of input change; update gas on blur of ↵Dan2018-06-192-5/+11
| | | | | | | | | | | | | | | | amount input change; validate onchange.
| * | | Fix unit testsAlexander Tseung2018-06-161-3/+8
| | | |
| * | | Estimate gas limit when the token amount changes. Fix amount inputAlexander Tseung2018-06-164-16/+18
| | | |
| * | | Update send.utils.js estimateGas tests.Dan2018-06-152-5/+20
| | | |
| * | | Add a buffer to new ui gas estimatesDan2018-06-152-2/+52
| | | |
| * | | Add hex-prefix to gas estimate resultAlexander Tseung2018-06-152-4/+4
| |/ /
* / / View address of an added token (#4591)Csaba S2018-06-192-22/+37
|/ / | | | | | | | | | | * adding menu actions for tokens * apply common style
* | Merge pull request #4566 from MetaMask/notice-phishingDan Finlay2018-06-154-14/+14
|\ \ | | | | | | Push new notice on recent phishing incidents
| * | notices - replace getLatestNotice with getNextNoticekumavis2018-06-144-14/+14
| |/
* / add help link to eth_sign warningBobby Dresser2018-06-122-1/+14
|/
* Access correct property from state in confirm screen components gatherTxMeta()Dan2018-06-082-2/+2
|
* Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0713-63/+90
|\
| * Merge pull request #4418 from MetaMask/handle-import-account-failure-in-uikumavis2018-06-074-19/+47
| |\ | | | | | | Handle errors for null selected address after Importing account (json or private key)
| | * Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0513-28/+143
| | |\
| | * \ Merge branch 'develop' into handle-import-account-failure-in-uiDan2018-06-0334-227/+366
| | |\ \
| | * | | Fix then-catch + error handling in import-accountDan2018-05-312-4/+2
| | | | |
| | * | | Importing account by json and private key shows error and does not change ↵Dan2018-05-314-16/+46
| | | | | | | | | | | | | | | | | | | | account if no selectedAddress comes after import.
| * | | | i18n - ja improvements03-262018-06-076-16/+34
| | | | |
| * | | | Render the accounts in keyring orderWhymarrh Whitby2018-06-061-3/+4
| | | | |
| * | | | Remove unused identities reducer from UIWhymarrh Whitby2018-06-062-22/+0
| | | | |
| * | | | Remove selectedIdentity prop from wallet viewWhymarrh Whitby2018-06-061-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The selectedIdentity property is computed based on the selectedAddress which means that using both the selectedAddress and the selectedIdentity is redundant. In the case of the Array#find call on the set of keyrings, we wouldn't have a situation where one is included and the other isn't. This changeset removes the selectedIdentity from the wallet view because it isn't needed.
| * | | | Ensure selectedAddress exists when render walletWhymarrh Whitby2018-06-061-0/+4
| | |_|/ | |/| |
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0515-30/+145
|\| | |
| * | | Update hide-token-confirmation-modal.js to use new modalState schema (#4482)Dan J Miller2018-06-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | * Update hide-token-confirmation-modal.js to use new modalState schema (added in 41e38fe55). * Fix modalState props
| * | | Merge pull request #4428 from MetaMask/fix-tokenlist-balance-overflowDan J Miller2018-06-052-4/+13
| |\ \ \ | | | | | | | | | | Token name is not hidden in wallet if balance is exceptionally long.
| | * | | Fix ellipsesAlexander Tseung2018-06-011-5/+6
| | | | |
| | * | | Token name is not hidden in wallet if balance is exceptionally long.Dan2018-06-012-3/+11
| | |/ /
| * | / Indicate the current selected account on the popup account view (#4445)Alexander Tseung2018-06-058-21/+127
| | |/ | |/|
| * | update helpscout links to zenhubBobby Dresser2018-06-012-2/+2
| | |
* | | Simplify recipient code check in send.utils estimateGasDan2018-06-051-4/+5
| | |
* | | Default currency-display valueToRender to empty string when not readOnly ↵Dan2018-06-021-2/+2
| | | | | | | | | | | | ('0' if readOnly).
* | | Fix calculation of data property for gas estimation on token transfers.Dan2018-06-027-47/+41
| | |
* | | Merge branch 'i3725-refactor-send-component-' into ↵Dan2018-06-0152-421/+758
|\ \ \ | | | | | | | | | | | | i3914-fix-newui-send-gas-estimation
| * | | Remove .onlyDan2018-06-011-1/+1
| | | |
| * | | Merge branch 'i3725-refactor-send-component-' of ↵Dan2018-06-016-153/+92
| |\ \ \ | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component-
| | * \ \ Merge pull request #4386 from ↵Dan J Miller2018-06-016-153/+92
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MetaMask/i4077-replace-currency-input-with-numeric-input Replace currency-input.js with NumericInput
| | | * | | Improve input width calculation in currency-display.jsDan2018-06-011-3/+2
| | | | | |
| | | * | | Fix currency display send integration tests.Dan2018-05-311-1/+1
| | | | | |
| | | * | | Delete currency-input.jsDan2018-05-302-114/+0
| | | | | |
| | | * | | Remove currency input from input-numberDan2018-05-301-4/+4
| | | | | |
| | | * | | Stop using external NumericInput component.Dan2018-05-301-8/+15
| | | | | |
| | | * | | Replaces currency-input.js with NumericInputDan2018-05-294-38/+85
| | | | | |
| * | | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-06-0145-268/+665
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | Add new alert modalsAlexander Tseung2018-06-0116-165/+287
| | | | |
| | * | | Change btn-secondary styles to btn-default. Make btn-secondary red warning ↵Alexander Tseung2018-06-0116-62/+79
| | | |/ | | |/| | | | | | | | | style buttons
| | * | Prevent loading screen from overlaying the app bar (#4417)Alexander Tseung2018-05-314-12/+4
| | | |
| | * | Fix error handling on incorrect password (#4401)Alexander Tseung2018-05-311-11/+9
| | | |
| | * | Add notification for dropped retry transactions (#4363)Alexander Tseung2018-05-3014-68/+294
| | | |
| | * | Fix add-token token list placeholder width (#4365)Alexander Tseung2018-05-301-0/+4
| | | |
| | * | Fix text field labels of first time flow. Add text fields to storybook (#4389)Alexander Tseung2018-05-292-44/+80
| | | |
| | * | newui - unlock - dont catch errors unrelated to tryUnlockMetamaskkumavis2018-05-291-2/+2
| | | |
| | * | Fix scrolling in Deposit Ether modal (#4336)Alexander Tseung2018-05-241-2/+4
| | | |
* | | | Improve efficiency of estimateGasPriceFromRecentBlocksDan2018-05-311-10/+5
| | | |
* | | | test - send-utils.test - lint fixkumavis2018-05-311-1/+1
| | | |
* | | | Gas estimation uses block gas limit as fallback if query.estimateGas returns ↵Dan2018-05-312-5/+39
| | | | | | | | | | | | | | | | an expected error.
* | | | Auto update gas estimate when to changes.Dan2018-05-3114-64/+109
| | | |
* | | | Support smaller decimals in currency-displayDan2018-05-311-1/+1
| | | |
* | | | Estimate gas using same algorithm as backend.Dan2018-05-3112-98/+153
| | | |
* | | | Simplify gas estimate actions and add local estimateGasPriceFromRecentBlocks ↵Dan2018-05-3113-55/+203
| | | | | | | | | | | | | | | | method.
* | | | getParamsForGasEstimate extracts symbol from token instead of just accepting ↵Dan2018-05-313-6/+6
| | | | | | | | | | | | | | | | symbol.
* | | | Rename gas change actions.Dan2018-05-314-22/+22
| | | |
* | | | Split out getGasEstimate logic from updateGasTotalDan2018-05-311-3/+12
|/ / /
* | | Update amount error on update of send screen.Dan2018-05-313-23/+30
| | |
* | | Fix setting of token balance on account switch in send screen from field.Dan2018-05-313-3/+3
| |/ |/|
* | Send refactor: fix error handling and form disabling in send form.Dan2018-05-268-47/+37
| |
* | Clean up for send refactor PR.Dan2018-05-255-15/+7
| |
* | Move formShouldBeDisabled from send-footer util to component.Dan2018-05-254-40/+72
| |
* | Fix order of button text in page-container-footer.Dan2018-05-252-10/+4
| |
* | Display correct titles and subtitles on send token and editing send ↵Dan2018-05-258-14/+105
| | | | | | | | transaction screens.
* | Fix display of primary currency symbol in send amount rowDan2018-05-252-2/+8
| |
* | Send refactor: fix amount max button for tokens.Dan2018-05-242-2/+13
| |
* | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-2463-1052/+1358
|\|
| * Merge pull request #4308 from MetaMask/i4232-addtokenkumavis2018-05-2345-971/+1280
| |\ | | | | | | Update designs for Add Token screen
| | * Update input field border on focusAlexander Tseung2018-05-221-1/+3
| | |
| | * Fix testsAlexander Tseung2018-05-211-11/+6
| | |
| | * Update designs for Add Token screenAlexander Tseung2018-05-2045-971/+1283
| | |
| * | Merge pull request #4295 from MetaMask/kumavis-patch-3Frankie2018-05-221-1/+2
| |\ \ | | | | | | | | ui - token-util - warn via loglevel on token lookup failure
| | * | token-util - warn via loglevel on token lookup failurekumavis2018-05-191-1/+2
| | |/
| * | Merge pull request #4316 from MetaMask/fix-signature-requestkumavis2018-05-221-2/+0
| |\ \ | | | | | | | | Fix signature request header text
| | * | Fix signature request header textAlexander Tseung2018-05-211-2/+0
| | |/
| * | Merge pull request #4273 from brunobar79/fix-new-ui-popup-headerkumavis2018-05-221-2/+0
| |\ \ | | | | | | | | Remove fix modal header height
| | * | remove fix header heightBruno2018-05-171-2/+0
| | |/
| * / Move setAccountLabel into PreferencesControllerWhymarrh Whitby2018-05-178-18/+18
| |/
| * Merge pull request #4255 from MetaMask/i4233-dropdownskumavis2018-05-175-21/+58
| |\ | | | | | | Fix account and network dropdowns in confirm screen
| | * Fix account and network dropdowns in confirm screenAlexander Tseung2018-05-155-21/+58
| | |
| * | ui - unlock - remove setNetworkEndpoints calls from new unlock screenkumavis2018-05-172-3/+0
| | |
| * | ui - remove files accidently added by bad mergekumavis2018-05-172-328/+0
| | |
| * | Merge branch 'develop' of github.com:MetaMask/metamask-extension into ↵kumavis2018-05-1745-317/+850
| |\ \ | | | | | | | | | | | | network-controller-remove-setNetworkEndpoints
| | * | Add error message when passwords don't match in first time flow. Change ↵Alexander Tseung2018-05-142-48/+54
| | |/ | | | | | | | | | input field styling in first time flow
| | * Add TextField component to storybookAlexander Tseung2018-05-123-2/+25
| | |
| | * Add new unlock screen designAlexander Tseung2018-05-1222-569/+559
| | |
| | * Merge pull request #4196 from MetaMask/i3457-fontweightThomas Huang2018-05-0911-22/+2
| | |\ | | | | | | | | Change font weight from 300 to 400
| | | * Change font weight from 300 to 400Alexander Tseung2018-05-0611-22/+2
| | | |
| | * | Add storybook integrationAlexander Tseung2018-05-045-2/+96
| | |/
| | * Merge pull request #4156 from MetaMask/i4010-spinnerkumavis2018-05-039-10/+115
| | |\ | | | | | | | | Fix styling of the app spinner
| | | * Fix styling of the app spinnerAlexander Tseung2018-05-019-10/+115
| | | |
| | * | Merge pull request #4162 from MetaMask/ui-actions-pify-importNewAccountkumavis2018-05-021-1/+1
| | |\ \ | | | | | | | | | | ui - actions - importNewAccount - rethrow err on failure
| | | * | ui - actions - importNewAccount - rethrow err on failurekumavis2018-05-021-1/+1
| | | | |
| * | | | lint - cleanup some unused variableskumavis2018-05-036-13/+0
| | | | |
| * | | | network - remove setNetworkEndpointskumavis2018-05-017-29/+1
| |/ / /
| * / / Handle Promise rejections when importing accounts (#4142)Paul Bouchon2018-05-012-0/+4
| |/ / | | | | | | | | | * Silently catch import failures since errors exist in Redux state * Add comment about no-op catch statement
| * | ui - actions - importNewAccount - use async and pify for cleaner syntaxkumavis2018-05-011-24/+20
| | |
| * | Merge pull request #4059 from MetaMask/i-4033-seed-wordskumavis2018-05-0113-329/+354
| |\ \ | | | | | | | | Use new design for Reveal Seed screen. Persist seed words only in the first time flow.
| | * | Redirect to correct seed phrase screenAlexander Tseung2018-04-271-2/+2
| | | |
| | * | Merge branch 'master' of https://github.com/MetaMask/metamask-extension into ↵Alexander Tseung2018-04-231-1/+9
| | |\ \ | | | | | | | | | | | | | | | i-4033-seed-words
| | * | | Use new design for reveal seed screen. Persist seed words only in first time ↵Alexander Tseung2018-04-2312-285/+346
| | | | | | | | | | | | | | | | | | | | flow
| | * | | Revert "Fix UI getting stuck in Reveal Seed screen"Alexander Tseung2018-04-222-27/+3
| | | | | | | | | | | | | | | | | | | | This reverts commit 2c8156ebe91941309d49e8f8f1ed8e9d740bb9de.
| * | | | Fix ShapeShift purchases on new UIbitpshr2018-04-291-6/+7
| | | | |
| * | | | Merge pull request #4113 from ↵kumavis2018-04-284-45/+43
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MetaMask/i4107-send-tokens-without-symbols-decimal-methods Wraps calls to symbol() and decimals() in try catch (Fixes #4107)
| | * | | | Simplify return of existing token in getSymbolAndDecimalsDan2018-04-281-4/+1
| | | | | |
| | * | | | Convert decimals to string in getSymbolAndDecimals; return null for symbol ↵Dan2018-04-283-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | or decimals.
| | * | | | Wraps calls to symbol() and decimals() in try catchDan2018-04-283-30/+41
| | | |_|/ | | |/| |
| * / | | Allow transactions with 0-gwei gas price (#4073)Paul Bouchon2018-04-273-12/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | * Allow transactions with 0-gwei gas price * Add tests to verify tx with 0 gas fee * Conditionally use CurrencyInput in CurrencyDisplay
| * | | i18n-helper - wrap fallback in brackets to help indicate something is wrongkumavis2018-04-261-1/+1
| | | |
| * | | Return key instead of empty string on i18n failDan Finlay2018-04-261-1/+1
| | | |
| * | | i18n-helper - abort on i18n failurekumavis2018-04-251-1/+2
| | | |
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-152-48/+54
| | | |
* | | | Import defaults in send_/Dan2018-05-1510-17/+18
| | | |
* | | | Fix Button component path in page-container footer.Dan2018-05-151-1/+1
| | | |
* | | | Add index.js files to send_ subdirectoriesDan2018-05-1513-0/+13
| | | |
* | | | Merge branch 'develop' into i3725-refactor-send-component-Dan2018-05-1463-1019/+1233
| | | |
* | | | Tests for send.duck.jsDan2018-05-144-20/+167
| | | |
* | | | Rename ducks/send.js to ducks/send.duck.jsDan2018-05-1415-14/+14
| | | |
* | | | Add missing unit tests in send_/: now 100% function test coverage in send_/Dan2018-05-144-112/+298
| | | |
* | | | Lint fixesDan2018-05-1410-31/+6
| | | |
* | | | Unit tests for account-list-item, amount-max-button and send-amount-row ↵Dan2018-05-143-0/+381
| | | | | | | | | | | | | | | | components.
* | | | Unit tests for from-dropdown; split out send-dropdown-list from from-dropdownDan2018-05-124-39/+260
| | | |
* | | | SendRowErrorMessage component test.Dan2018-05-111-0/+28
| | | |
* | | | Unit tests for send from, gas, to and wrapper row components.Dan2018-05-114-0/+403
| | | |
* | | | Fix test descriptions and remove unnecessary proptypes.Dan2018-05-105-14/+10
| | | |
* | | | Adds test for send, send-content, send-footer and send-header components.Dan2018-05-076-16/+516
| | | |
* | | | Unit tests for containers, utils and selectors in send_/Dan2018-05-0544-73/+2506
| | | |
* | | | Merge branch 'i3725-refactor-send-component-' of ↵Dan2018-05-0112-16/+137
|\ \ \ \ | | | | | | | | | | | | | | | github.com:MetaMask/metamask-extension into i3725-refactor-send-component-
| * \ \ \ Merge branch 'i3725-refactor-send-component-' into ↵Dan2018-05-01118-1513/+4604
| |\ \ \ \ | | | | | | | | | | | | | | | | | | i3725-refactor-send-component-2
| * | | | | Refactor page-container component structureAlexander Tseung2018-04-1113-75/+173
| | | | | |
* | | | | | Delete dead send code.Dan2018-05-0110-723/+2
| |/ / / / |/| | | |
* | | | | Remove 'goHome' from send_Dan2018-05-012-4/+1
| | | | |
* | | | | Move getMaxModeOn selector to amount-max-button container.Dan2018-05-013-6/+10
| | | | |
* | | | | Use constants for send screen errors messages.Dan2018-05-014-9/+29
| | | | |
* | | | | Fix send-v2__form class in send-content.componentDan2018-05-011-1/+1
| | | | |
* | | | | Fix amount max button.Dan2018-05-015-7/+7
| | | | |
* | | | | Fix close button on send screenDan2018-04-302-4/+5
| | | | |
* | | | | Further refactors; includes refactor of send-v2.js and associated containerDan2018-04-3024-155/+487
| | | | |
* | | | | Fixes to get tests passing.Dan2018-04-275-11/+11
| | | | |
* | | | | Lint fixes and alphabetization for i3725-refactor-send-componentDan2018-04-2735-365/+330
| | | | |
* | | | | Core of the refactor completeDan2018-04-2734-489/+757
| | | | |
* | | | | Merge branch 'master' into i3725-refactor-send-componentDan2018-04-2549-200/+300
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3940 from nyatla/masterDan Finlay2018-04-243-1/+3
| |\ \ \ \ | | | | | | | | | | | | Small layout and cursor problem fix.
| | * | | | Reduced button padding.nyatla2018-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Title overflowed in Japanese.
| | * | | | Expanded dropdown menu width of title.nyatla2018-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Title overflowed in Japanese.
| | * | | | Changed mouse cursor to "pointer" on the cancel text at the top left of the ↵nyatla2018-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | page.
| * | | | | Merge pull request #3968 from MetaMask/gh-3653Dan Finlay2018-04-2410-13/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | Clean up network config
| | * | | | | Clean up network configAlexander Tseung2018-04-2410-13/+17
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #4028 from MetaMask/i4016-customrpcDan Finlay2018-04-241-6/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | Fix custom RPC not redirecting to Settings page
| | * | | | Fix custom RPC not redirecting to Settings pageAlexander Tseung2018-04-191-6/+8
| | | |_|/ | | |/| |
| * | | | Merge pull request #4030 from MetaMask/i4014-metamask-versionThomas Huang2018-04-201-1/+9
| |\ \ \ \ | | | | | | | | | | | | Show correct MetaMask version number in the Info page
| | * | | | Show correct MetaMask version number in the Info pageAlexander Tseung2018-04-191-1/+9
| | |/ / /
| * / / / Fix exception thrown when revealing seed wordsAlexander Tseung2018-04-191-6/+18
| |/ / /
| * | | Merge pull request #3977 from MetaMask/i-3913-big-numberDan Finlay2018-04-194-25/+49
| |\ \ \ | | | | | | | | | | Fix BigNumber exception in confirm-send-ether
| | * | | Fix spinner layoutAlexander Tseung2018-04-184-24/+26
| | | | |
| | * | | Fix BigNumber exception in confirm-send-etherAlexander Tseung2018-04-181-3/+25
| | | | |
| * | | | Merge pull request #4004 from MetaMask/i3955-reveal-seedDan Finlay2018-04-192-3/+27
| |\ \ \ \ | | | | | | | | | | | | Fix UI getting stuck in Reveal Seed screen
| | * | | | Fix UI getting stuck in Reveal Seed screenAlexander Tseung2018-04-192-3/+27
| | | | | |
| * | | | | Merge pull request #3998 from MetaMask/i3988-checksummed-addressDan Finlay2018-04-1910-26/+44
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Show checksum addresses on UI
| | * | | | Show checksummed addresses throughout the UIbitpshr2018-04-1810-26/+44
| | |/ / /
| * | | | Merge branch 'master' into i3580-InternationalizeCurrencyDan Finlay2018-04-1824-107/+52
| |\| | |
| | * | | Fix confirmation popup not always openingAlexander Tseung2018-04-175-13/+18
| | | | |
| | * | | Merge branch 'master' into i3981-contract-ratesDan Finlay2018-04-1714-3/+14
| | |\ \ \
| | | * \ \ Merge pull request #3970 from MetaMask/i3651-removeGlobalLogDan Finlay2018-04-1713-2/+13
| | | |\ \ \ | | | | | | | | | | | | | | Remove reliance on window.log
| | | | * | | Require loglevel singleton in each module that uses itbitpshr2018-04-1413-2/+13
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-09 22:45:55 +0800