aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | Move mock txs to tx mocking classDan Finlay2017-08-222-35/+48
| | | * | | break out network nonce calc.frankiebee2017-08-191-17/+21
| | | * | | fix 0x0 nonce calc.frankiebee2017-08-191-8/+18
| | | * | | include pendingTxs in localNoncefrankiebee2017-08-191-10/+9
| | | * | | use "localNonce" when the network returns a nonce that is lower then a known ...frankiebee2017-08-192-3/+27
| | | * | | add test for using localNoncefrankiebee2017-08-191-4/+42
| | |/ / / | |/| | |
| * | | | Merge pull request #1941 from MetaMask/i1912-TokenPrecisionFixKevin Serrano2017-08-192-1/+3
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into i1912-TokenPrecisionFixKevin Serrano2017-08-193-2/+8
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #1942 from MetaMask/i1903-EthSignFormatThomas Huang2017-08-183-2/+7
| |\ \ \ \ \
| | * | | | | Bump changelogDan Finlay2017-08-181-0/+2
| | * | | | | Fix eth sign formattingDan Finlay2017-08-182-2/+5
| |/ / / / /
| | * / / / Fix token balance precision renderingDan Finlay2017-08-182-1/+2
| |/ / / /
| * | | | Merge pull request #1935 from MetaMask/i1091-ShowTxErrorsFrankie2017-08-183-104/+8
| |\ \ \ \
| | * | | | Remove dead testsDan Finlay2017-08-171-86/+1
| | * | | | Bump changelogDan Finlay2017-08-171-0/+2
| | * | | | Transition to home view after tx errorDan Finlay2017-08-171-18/+5
| * | | | | Merge pull request #1933 from MetaMask/Version-3.9.8Thomas Huang2017-08-172-1/+3
| |\| | | |
| | * | | | Version 3.9.8v3.9.8Dan Finlay2017-08-172-1/+3
| |/ / / /
| * | | | Merge pull request #1928 from MetaMask/RemoveDefaultTokensKevin Serrano2017-08-173-52/+31
| |\ \ \ \
| | * | | | Fallback to ethplorer linkDan Finlay2017-08-171-1/+18
| | * | | | Remove dead codeDan Finlay2017-08-171-14/+0
| | * | | | Bump changelogDan Finlay2017-08-171-0/+3
| | * | | | Remove default tokensDan Finlay2017-08-171-11/+1
| | * | | | ReEnable Token ListDan Finlay2017-08-171-26/+9
| |/ / / /
| * | | | Merge pull request #1921 from MetaMask/v3.9.7Kevin Serrano2017-08-162-1/+3
| |\ \ \ \
| | * | | | v3.9.7 update changelogv3.9.7kumavis2017-08-161-0/+2
| | * | | | v3.9.7kumavis2017-08-161-1/+1
| * | | | | Merge pull request #1916 from MetaMask/fix/account-name-scrollKevin Serrano2017-08-161-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Fix overflow issue on QubesOS, flagged by @kumavissdtsui2017-08-151-1/+1
| | |/ / /
| * | | | Merge pull request #1918 from MetaMask/token-hotfixKevin Serrano2017-08-162-9/+27
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Change cursor type to indicate link.Kevin Serrano2017-08-161-0/+1
| | * | | fix spellingfrankiebee2017-08-161-4/+3
| | * | | Add to CHANGELOGfrankiebee2017-08-161-0/+1
| | * | | Disable token listfrankiebee2017-08-161-9/+26
| |/ / /
* | | | Handle transaction totals in WEI in tx-list, send and pending.Dan2017-09-164-2/+15
* | | | Ensures that new accounts are only created from the modal, and not when click...Dan2017-09-163-5/+9
* | | | Clear token selection when changing account.Dan2017-09-161-0/+1
* | | | Adds USD to token list.Dan2017-09-162-3/+41
* | | | Show dollar sign before USD on account details page.Dan2017-09-162-4/+6
* | | | Show loading on conf-tx until the pending tx is available.Dan2017-09-151-0/+1
* | | | Make send token responsive; fix desktop send modal heightChi Kei Chan2017-09-152-5/+25
* | | | Add responsive UI to send ether modalChi Kei Chan2017-09-156-13/+39
* | | | Style send ether screenChi Kei Chan2017-09-142-340/+93
* | | | Show token tx properlyChi Kei Chan2017-09-144-38/+104
* | | | Update yarn.lock; Fix tx-list-item overflow; Fix gas exchange rateChi Kei Chan2017-09-146-56/+331
* | | | Fix send and pending.Dan2017-09-142-2/+2
* | | | Stop setting 'currentCurrency' and use local state for active currency in sen...Dan2017-09-145-27/+25
* | | | Enables Cancel button in confirmation screen.Dan2017-09-142-2/+12
* | | | Send user to most recent pending transaction after sending a transaction.Dan2017-09-141-2/+6
* | | | Fix saving/sending of amounts in USDDan2017-09-141-3/+9
* | | | Fixes the saving of transactions in send and display in tx-list with conversi...Dan2017-09-143-9/+39
* | | | Reapply conversion utility changes and fix calls to utility in pending-tx.Dan2017-09-143-50/+123
* | | | Add token exchange ratesChi Kei Chan2017-09-138-14/+100
* | | | Improve styling in Confirmation Screen; Show decoded send token dataChi Kei Chan2017-09-135-213/+234
* | | | Revert "Overhaul currency conversion utility and update calls to utility in p...Chi Kei Chan2017-09-133-122/+51
* | | | Overhaul currency conversion utility and update calls to utility in pending-tx.Dan2017-09-133-51/+122
* | | | [NewUI] Color tx-list-item text depending on transaction status. (#2050)Dan J Miller2017-09-133-5/+33
* | | | Added signTokenTx; Adding token confirmation screenChi Kei Chan2017-09-126-15/+65
* | | | Add frontend validation to send-tokenChi Kei Chan2017-09-127-14/+119
* | | | [New-UI] Confirm Screen restyle and connect to state (#2042)Dan J Miller2017-09-126-197/+429
* | | | Add buttons; handle back; add yarn.lockChi Kei Chan2017-09-129-42/+9862
* | | | Use transparent border for consistent size with and without border.Dan2017-09-121-1/+1
* | | | Cleaner css for circle icon.Dan2017-09-123-24/+28
* | | | Replace checkmark with font-awesome equivalent.Dan2017-09-121-6/+6
* | | | Adds title, divider and descriptive text to network dropdown.Dan2017-09-122-0/+45
* | | | Highlighted circle icons for the network menu.Dan2017-09-125-10/+99
* | | | Style send token screenChi Kei Chan2017-09-117-31/+57
* | | | Use width 100 and margin for the new modal input.Dan2017-09-091-1/+2
* | | | New account modal top right close button working.Dan2017-09-091-1/+3
* | | | Tweak styles in new-account-modal.Dan2017-09-092-9/+18
* | | | Fix .filter token txChi Kei Chan2017-09-081-1/+2
* | | | Re-enable Contract tx list itemChi Kei Chan2017-09-082-19/+8
* | | | Fix css merge conflictsChi Kei Chan2017-09-082-2/+2
* | | | Modify readonly value in for input in qr-code.Dan2017-09-081-1/+1
* | | | Account-detail address is a readonly input.Dan2017-09-082-2/+7
* | | | Close button in account-details-modal working.Dan2017-09-081-1/+3
* | | | Remove highlight on modalDan2017-09-081-0/+4
* | | | Touch up style of account-details-modal.Dan2017-09-083-12/+27
* | | | Modify status copy for status === 'unapproved'Dan2017-09-081-0/+1
* | | | Link user from transaction list to etherscan if they have a transaction hash.Dan2017-09-083-4/+34
* | | | Use ternary operator instead of two conditionals.Dan2017-09-081-1/+1
* | | | Improve tx-list item hover scss.Dan2017-09-081-3/+3
* | | | Create tx-list-item component.Dan2017-09-083-74/+123
* | | | Show confirm transaction screen when clicking a pending transaction in the list.Dan2017-09-084-7/+20
* | | | Remove default to confirm screen on login.Dan2017-09-082-10/+0
* | | | Fix font sizes on Send TokenChi Kei Chan2017-09-071-3/+3
* | | | Send Token screen partial UIChi Kei Chan2017-09-077-3/+283
* | | | Add Contract Tx List Item; Update Token Tx on selectChi Kei Chan2017-09-078-58/+96
* | | | Show token balance and identiconChi Kei Chan2017-09-077-57/+90
* | | | Adding Token transaction detail screenChi Kei Chan2017-09-0611-81/+256
* | | | Fix token listChi Kei Chan2017-09-062-15/+24
* | | | Fix html heightChi Kei Chan2017-09-061-2/+2
* | | | Implement tokens list UIChi Kei Chan2017-09-0610-107/+122
* | | | Use .entries() instead of .keys(), and use more destructuring, for simpler code.Dan2017-09-061-9/+8
* | | | Send tx working; user is taken to confirm page with correct transaction infor...Dan2017-09-062-38/+66
* | | | Remove wallet-view scrollbars.Dan2017-09-051-0/+6
* | | | Touch up transaction list item styles, remove main-content scroll bars, align...Dan2017-09-055-51/+76
* | | | Fix styling of buy and send buttons on main screen.Dan2017-09-051-5/+4
* | | | Capitalizations via text-transform for main screen transactions.Dan2017-09-052-2/+7
* | | | Adjust left margin in main container.Dan2017-09-054-5/+12
* | | | Fix header style; Address commentsChi Kei Chan2017-09-0510-59/+75
* | | | Fix merge conflictChi Kei Chan2017-09-051-6/+0
* | | | Fix menu styleJacky Chan2017-09-057-42/+114
* | | | Use flex to ensure network name does not wrap.Dan2017-09-011-0/+1
* | | | Adjust z-index of header so that it stays in place when scrolling.Dan2017-09-011-1/+1
* | | | Fix margin, padding, height for header.Dan2017-09-013-45/+58
* | | | Fixed network fontDan2017-09-011-0/+2
* | | | Fixes lint errors and adds stylelint-config-standard to package.jsonDan2017-08-318-59/+58
* | | | Lint fixesDan2017-08-3134-265/+212
* | | | Refactor gas-fee-display to include usd and eth fee displays as separate comp...Dan2017-08-313-30/+93
* | | | Move gas fee to a separate component.Dan2017-08-312-26/+59
* | | | Move currency toggle to its own component.Dan2017-08-313-13/+33
* | | | Clean up send.js and eth-balance.js with es6.Dan2017-08-313-76/+87
* | | | Merge pull request #1982 from danjm/send-gas-tooltipChi Kei Chan2017-08-3021-50/+568
|\ \ \ \
| * | | | Minor clean up.Dan2017-08-303-17/+12
| * | | | Replace Avenir Next with alternative.Dan2017-08-3013-1/+101
| * | | | Center tooltip on small screen size by using flexboxDan2017-08-303-20/+23
| * | | | Use hex values only in send.js to handle limit and price; GasTooltip accepts ...Dan2017-08-293-17/+24
| * | | | Move getTaxBN and bnMultiplyByFraction to util.jsDan2017-08-292-25/+29
| * | | | Using eth balance component to ensure proper rounding.Dan2017-08-293-32/+56
| * | | | Bind SendTransactionScreen methods to this in constructor.Dan2017-08-291-9/+20
| * | | | Remove unused dependency.Dan2017-08-291-1/+0
| * | | | Refactor for clean handling of tooltip close.Dan2017-08-293-94/+64
| * | | | Styles and behaviour correctDan2017-08-294-18/+58
| * | | | Final styling improvements for tooltip; plus a few for send form.Dan2017-08-261-6/+12
| * | | | Fully connect gas data in send form and tooltip to state; final styling impro...Dan2017-08-263-18/+30
| * | | | Updating current currency from send form.Dan2017-08-262-1/+23
| * | | | Tooltip closing on click outside.Dan2017-08-262-11/+62
| * | | | Refactor tooltip to remove external lib; tooltip now updating gas fee in parent.Dan2017-08-265-72/+242
| * | | | Toggling tooltip.Dan2017-08-264-1/+91
| * | | | Add 'customize' text to gas input.Dan2017-08-262-1/+15
|/ / / /
* | | | Patch 3 new account modal (#1962)Dan J Miller2017-08-254-16/+105
* | | | Patch 2 account details modal (#1957)Dan J Miller2017-08-255-19/+55
* | | | Modify buy and send buttons color, border-radius and various size properties....Dan J Miller2017-08-233-5/+11
* | | | Hook up showAddToken to dropdown menu item in account options dropdownsdtsui2017-08-232-3/+5
* | | | Render TxListItem component from real data: address, identicon, status, ETH v...sdtsui2017-08-232-9/+18
* | | | Remove fake transactions and balances from tx-list and wallet-view, respectivelysdtsui2017-08-232-70/+10
* | | | Add data field to send token screensdtsui2017-08-231-1/+34
* | | | [WIP] Successfully sign a hardcoded transaction, hook up remaining inputs and...sdtsui2017-08-231-12/+19
* | | | [WIP] Use hardcoded values for dispatching from signTxsdtsui2017-08-231-17/+80
* | | | Remove border and apply background color to gas inputsdtsui2017-08-233-2/+20
* | | | Add layout and props for send screen inputssdtsui2017-08-233-21/+89
* | | | Add bolt and info icon vector imagessdtsui2017-08-232-0/+22
* | | | [WIP] - Styling Send Screen - Need to bring in data contract for signTxsdtsui2017-08-232-141/+39
* | | | Tweak z-indiciessdtsui2017-08-223-6/+7
* | | | Adjust zIndex and width for send screensdtsui2017-08-223-10/+17
* | | | [WIP] Tweak Send Screen Stylessdtsui2017-08-224-22/+37
* | | | Hook up send screen action to Send Button in TxViewsdtsui2017-08-222-1/+5
* | | | Hook up identicon and buttons to AccountDetailsModal, clean up colorssdtsui2017-08-228-39/+37
* | | | Integrate old QR component with new modal layoutsdtsui2017-08-224-32/+37
* | | | [WIP] Render a QR code in AccountDetailsModalsdtsui2017-08-222-8/+6
* | | | [WIP] Aggregate data for QRViewsdtsui2017-08-222-3/+18
* | | | Add wrapper CSS for NewAccountModalsdtsui2017-08-212-40/+39
* | | | Add wrapper CSS for AccountDetailsModalsdtsui2017-08-213-32/+45
* | | | Hook up hideModal action to close icon in EditAccountNameModalsdtsui2017-08-211-1/+5
* | | | Hook up selected account label display to main wallet viewsdtsui2017-08-211-4/+3
* | | | Hook up actions to EditAccountNameModalsdtsui2017-08-218-111/+150
* | | | Enhance global modal to accept styles from different componentssdtsui2017-08-211-45/+62
* | | | Implement new dropdown design, integrate account balancessdtsui2017-08-215-27/+83
* | | | Hook up edit account name modalsdtsui2017-08-211-26/+42
* | | | Remove old design - 'Show QR Code' dropdown menu item from account selection ...sdtsui2017-08-211-16/+0
* | | | Hook up template for New Account Modalsdtsui2017-08-213-1/+95
* | | | Enhance global modal to handle Buy, Edit, and Details Modalssdtsui2017-08-217-52/+169
* | | | Extend modal implementation and state management to accomodate multiple modal...sdtsui2017-08-215-11/+40
* | | | Add 'Account Details' dropdown menu item to account options dropdownsdtsui2017-08-211-0/+14
* | | | Add 'Add Token' dropdown menu item to account options dropdownsdtsui2017-08-211-0/+15
* | | | [WiP] Add comments for multiple modalssdtsui2017-08-151-0/+20
* | | | Merge remote-tracking branch 'mm/master' into NewUI-flatsdtsui2017-08-1410-56/+271
|\| | |
| * | | Merge pull request #1904 from MetaMask/web3-depreciationkumavis2017-08-132-1/+6
| |\ \ \
| | * | | fix wordingfrankiebee2017-08-121-1/+1
| | * | | Add to CHANGELOGfrankiebee2017-08-121-0/+2
| | * | | add deprecation warning for web3frankiebee2017-08-121-1/+4
| | |/ /
| * | | Merge pull request #1899 from sdtsui/fix/acct-name-lengthsFrankie2017-08-123-4/+22
| |\ \ \ | | |/ / | |/| |
| | * | Cleanup stray logs and lintsdtsui2017-08-112-6/+1
| | * | Add overflow support for all account names in account detailssdtsui2017-08-111-2/+11
| | * | Fix logic for dropdown components attaching checkmark to correct accountsdtsui2017-08-111-1/+2
| | * | Fix text overflow for dropdown components flagged by @frankiebeesdtsui2017-08-111-1/+14
| |/ /
| * | Merge pull request #1894 from MetaMask/3.9.6v3.9.6Thomas Huang2017-08-102-3/+5
| |\ \
| | * | 3.9.6kumavis2017-08-102-3/+5
| |/ /
| * | Merge pull request #1892 from MetaMask/deps-queryThomas Huang2017-08-101-1/+1
| |\ \ | | |/ | |/|
| | * deps - bump ethjs-querykumavis2017-08-101-1/+1
| |/
| * Merge pull request #1883 from MetaMask/estimateGas-fixThomas Huang2017-08-101-3/+11
| |\
| | * tx utils - detect estimateGas err and set simulationFailedkumavis2017-08-091-3/+11
| * | Merge pull request #1885 from MetaMask/dharmakumavis2017-08-102-46/+115
| |\ \
| | * | ui - buy eth - formatting and moved network names to configkumavis2017-08-102-23/+24
| | * | lint fixkumavis2017-08-091-1/+1
| | * | ui - buy eth - add dharma beta to kovankumavis2017-08-091-12/+22
| | * | ui - buy button view - refactorkumavis2017-08-091-46/+104
| | |/
| * | Merge pull request #1884 from MetaMask/waffle-badgeFrankie2017-08-091-1/+2
| |\ \ | | |/ | |/|
| | * readme - add waffle.io badgekumavis2017-08-091-1/+2
| |/
* | Lint and cleanup all scsssdtsui2017-08-1421-248/+331
* | [WIP] Add packages and tasks for linting scsssdtsui2017-08-144-4/+88
* | Center account selection dropdown and specify useCssTransition propsdtsui2017-08-142-5/+8
* | Remove unnecessary imports, and account-detail.jssdtsui2017-08-142-283/+0
* | Reconfigure AccoutSelector dropdown to use new fa-caret-down instead of old iconsdtsui2017-08-141-1/+3
* | Extract dropdown component into components/dropdowns, hook up to appsdtsui2017-08-146-16/+73
* | Fix odd relative position conflict so main icon is rounded - See flyswatter/j...sdtsui2017-08-141-22/+19
* | Remove unused code - network dropdown components in appsdtsui2017-08-142-214/+2
* | Remove deprecated feature: main app settings dropdownsdtsui2017-08-141-48/+0
* | [WIP] Extract network dropdown into own componentsdtsui2017-08-145-32/+95
* | [WIP] Extract network dropdown out of main app render functionsdtsui2017-08-144-6/+279
* | Move global modals into own pod, inside components/modalssdtsui2017-08-144-6/+44
* | Implement infinite scrolls (no lazy loading) for wallet viewsdtsui2017-08-123-155/+44
* | [WIP] Begin fixing responsive layout with many walletssdtsui2017-08-112-2/+57
* | Allow fullscreen scrolling on mobile view, while retaining in-window scroll f...sdtsui2017-08-111-2/+4
* | Implement responsive wallet balancessdtsui2017-08-115-18/+213
* | Cleanup SCSS and improve organization of color varssdtsui2017-08-119-54/+45
* | Add UI tweaks, including separation of overflow logic for mobile (full-height...sdtsui2017-08-113-16/+45
* | Improve text positioning on mobile viewsdtsui2017-08-113-37/+63
* | Extract scss breakpoints into variablessdtsui2017-08-111-0/+4
* | Implement widescreen layout for tx listsdtsui2017-08-114-40/+72
* | Move Txs list item styles into classessdtsui2017-08-112-37/+61
* | Add new color for txs - dusty-graysdtsui2017-08-111-2/+4
* | Add Tx List and selectorsDaniel Tsui2017-08-115-137/+244
|\ \
| * | Cleanup txList and txView componentssdtsui2017-08-112-48/+87
| * | Add selectors for txsToRender and conversionRatesdtsui2017-08-111-0/+18
| * | added logging for account balanceSimon Liang2017-08-101-1/+3
| * | reverted my changesSimon Liang2017-08-101-17/+17
| * | connected wallet view dropdown button with real dataSimon Liang2017-08-101-17/+17
| * | redid tx-view and balance-component mapStateToProps logicSimon Liang2017-08-102-23/+27
| * | moved the props initialization steps into mapStateToPropsSimon Liang2017-08-101-14/+13
| * | extracted transaction listSimon Liang2017-08-102-102/+151
| * | removing styling commentsSimon Liang2017-08-101-4/+0
|/ /
* | [WIP] Position account potions dropdown correctly and hook up to action creatorssdtsui2017-08-103-42/+73
* | Add new selectors for addresses, identities, and accountssdtsui2017-08-101-0/+27
* | Adjust modal styles to match new modal size, from cancel button tweaksdtsui2017-08-101-1/+1
* | Switch buy modal 'cancel' from text to button for accessibilitysdtsui2017-08-102-3/+19
* | Vertically center modal in mobile view - @cjeriasdtsui2017-08-101-1/+4
* | Improve layout of buy buttons by tweaking text stylessdtsui2017-08-101-1/+10
* | Merge branch 'master' into NewUI-flatkumavis2017-08-0922-446/+767
|\|
| * Merge pull request #1882 from MetaMask/tx-cont-fixesFrankie2017-08-092-4/+12
| |\
| | * tx controller - fix error serializationkumavis2017-08-091-2/+5
| | * tx controller - fix getBalance fnkumavis2017-08-091-1/+1
| | * util - sufficientBalance - validate inputkumavis2017-08-091-1/+6
| |/
| * Merge pull request #1880 from MetaMask/pendingFixFrankie2017-08-092-3/+4
| |\
| | * filter by network for pending txsfrankiebee2017-08-091-0/+2
| | * fix getPendingTransactions function for pendingTxTrackerfrankiebee2017-08-092-3/+2
| * | Merge pull request #1879 from MetaMask/build-err-fixThomas Huang2017-08-092-19/+28
| |\ \
| | * | build - factor watcify into bundler generationkumavis2017-08-091-17/+11
| | * | build - fix error swallowing on devkumavis2017-08-091-1/+16
| | * | deps - bump watchifykumavis2017-08-091-2/+2
| |/ /
| * | Merge pull request #1854 from MetaMask/greenkeeper/initialThomas Huang2017-08-099-46/+49
| |\ \
| | * \ Merge branch 'master' into greenkeeper/initialkumavis2017-08-0914-380/+680
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1877 from MetaMask/hotfix/mobile-buy-layoutkumavis2017-08-092-70/+80
| |\ \ \ | | |_|/ | |/| |
| | * | Fix layout issues flagged by @tmashuangsdtsui2017-08-091-69/+79
| | * | Make buy ui more central to the screensdtsui2017-08-091-1/+1
| * | | Merge pull request #1861 from MetaMask/transactionControllerRefractorkumavis2017-08-0912-310/+600
| |\ \ \ | | |/ / | |/| |
| | * | add json-rpc-engine && eth-json-rpc-middleware to devDependenciesfrankiebee2017-08-091-0/+2
| | * | fix class namesfrankiebee2017-08-093-18/+25
| | * | use provider stubfrankiebee2017-08-092-88/+65
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-11 23:36:24 +0800