aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2399 from danjm/MM-128-get-currentCurrency-from-stateChi Kei Chan2017-10-2014-67/+90
|\
| * 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 pull request #2402 from chikeichan/mergeChi Kei Chan2017-10-1937-161/+965
|\
| * Merge master to NewUI-flatChi Kei Chan2017-10-191-0/+26
| * Merge branch 'NewUI-flat' into mergeChi Kei Chan2017-10-19182-2367/+23624
| |\ | |/ |/|
* | 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
* | Fix cursor on unclickable transactions (#2356)Alexander Tseung2017-10-141-3/+9
* | Fix exception thrown when tokens is null (#2355)Alexander Tseung2017-10-141-1/+2
* | Fix Localhost 8545 option in network dropdown (#2357)Alexander Tseung2017-10-141-1/+1
* | Fix styling for Accept buttons in notices (#2358)Alexander Tseung2017-10-141-1/+1
* | Fix SELECT TYPE dropdown changing sizes based on error message (#2359)Alexander Tseung2017-10-141-2/+4
* | Fix click to copy for private key not working (#2360)Alexander Tseung2017-10-143-7/+11
* | [NewUI] SendV2-#8: Send container handles tokens; gas info dynamic from state...Dan J Miller2017-10-1422-132/+915
* | Adding Account Dropdown V2Chi Kei Chan2017-10-1311-25/+256
* | Various styling fixesChi Kei Chan2017-10-1316-85/+170
* | Refactor amount input: dynamic input width with vanilla js.Dan2017-10-132-42/+32
* | Send v2 amount unit moves correctly.Dan2017-10-131-1/+19
* | Adds amount and gas field to sendV2.Dan2017-10-136-8/+187
* | Send v2 to autocomplete.Dan2017-10-113-2/+94
* | Token menu ellipsis alignmentChi Kei Chan2017-10-111-3/+8
* | Reduce header shadow on mobileChi Kei Chan2017-10-112-1/+5
* | Fix recipient on send tokenChi Kei Chan2017-10-112-2/+5
* | Confirm Token and Confirm Contract v2Chi Kei Chan2017-10-113-38/+43
* | Confirm eth v2Chi Kei Chan2017-10-116-200/+184
* | Refactor 'rendersingleidentity' to a stand alone account-list-item component.Dan2017-10-105-92/+105
* | UI for readonly from component. From dropdown opening and closing. Mockdata.Dan2017-10-104-1/+226
* | Conversion util can invert conversion rateDan2017-10-092-9/+18
* | Adds checkFeatureToggle util.Dan2017-10-092-4/+13
* | UI for send screen container without form rows.Dan2017-10-095-2/+218
* | Edit account modal shows and allows editing of name from props, not just plac...Dan2017-10-091-2/+3
* | Clear selected token when changing network.Dan2017-10-091-4/+11
* | Removes old/second setProviderType method from before merge (commit bd99bc2e)Dan2017-10-051-9/+0
* | Merge branch 'master' into NewUI-flatChi Kei Chan2017-10-0420-232/+238
|\ \
* | | Enables remove token and ensures add/remove update the list without need for ...Dan2017-10-047-14/+72
* | | Add needed iterator in tx-list and path to account in selectors.Dan2017-10-032-2/+7
* | | Hide token confirmation modal uiDan2017-10-035-3/+170
* | | Token menu ui.Dan2017-10-023-0/+103
* | | Shapeshift deposit tx modal.Dan2017-10-027-43/+65
* | | Enables the old shapeshift UI within new ui.Dan2017-10-023-3/+9
* | | Query for gas estimatesChi Kei Chan2017-09-295-8/+35
* | | Hide ShapeShift and Fix Modal StylingsChi Kei Chan2017-09-292-13/+52
* | | Always set currency to USD on app mountChi Kei Chan2017-09-298-4/+21
* | | Ensure sent token value is recognized as hex.Dan2017-09-291-1/+1
* | | Fix send of USD and backspacing amount to 0Dan2017-09-292-3/+7
* | | Close sidebar on token selection.Dan2017-09-292-4/+20
* | | Close mobile sidebar when selecting 'Add token' from account options dropdown.Dan2017-09-291-0/+2
* | | Update yarn.lockChi Kei Chan2017-09-291-116/+249
* | | Merge pull request #2201 from chikeichan/mergeChi Kei Chan2017-09-2849-1911/+2200
|\ \ \
| * | | Merge branch 'mmn' into mergeChi Kei Chan2017-09-2849-1911/+2200
|/| | |
| * | | Merge branch 'master' into mmnChi Kei Chan2017-09-2849-1911/+2200
|/| | |
* | | | Use font-awesome icons for create and import account.Dan2017-09-281-9/+5
* | | | Makes styling fixes to account dropdown.Dan2017-09-282-10/+12
* | | | Keep privateKey out of state and clear it after closing export private key mo...Dan2017-09-282-20/+40
* | | | Adds a back button to export private key modal; connects account details to s...Dan2017-09-285-6/+62
* | | | Implement Confirm Deploy Contract screenChi Kei Chan2017-09-274-2/+357
* | | | Update the correct values in state when estimates are received.Dan2017-09-272-18/+15
* | | | Gets gas and price estimates when send components mount.Dan2017-09-273-42/+27
* | | | Restore notification functionalityDan2017-09-272-0/+14
* | | | Return null if transaction.key is shapeshiftChi Kei Chan2017-09-272-53/+18
* | | | Connect export key modal to state and enable actions.Dan2017-09-273-15/+104
* | | | Merge pull request #2157 from danjm/MM-57-use-gas-estimatorChi Kei Chan2017-09-263-29/+183
|\ \ \ \
| * \ \ \ Merge branch 'NewUI-flat' into MM-57-use-gas-estimatorChi Kei Chan2017-09-265-4/+104
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Remove unnecessary trailing comma.Dan2017-09-261-1/+1
* | | | | Select all in to and from of send screens, instead of clearing on focus.Dan2017-09-262-15/+5
* | | | | Able to change selections in to and from fields of send and send token.Dan2017-09-262-2/+19
* | | | | Export private key modal body ui.Dan2017-09-263-1/+92
| * | | | Send token now estimates gas and price.Dan2017-09-261-8/+37
| * | | | Refactor to store estimated gas and price in local state, return promise from...Dan2017-09-263-81/+38
| * | | | Estimate gasPrice and gasLimit in send screen.Dan2017-09-263-7/+126
| * | | | Update send token to handle errors onBlur events and prevent clicking send un...Dan2017-09-261-12/+59
| * | | | Handles errors with to field and renders warnings from backend in send token.Dan2017-09-261-1/+1
|/ / / /
* | | | Exports private key modal opens from dropdown.Dan2017-09-244-54/+110
* | | | Add Confirm Send token screenChi Kei Chan2017-09-236-64/+489
* | | | get identities from getState() instead of passing from caller, only set new a...Dan2017-09-232-8/+9
* | | | New account modal now allows for addition of account name.Dan2017-09-233-7/+35
* | | | Default class params to empty string in readonly-inputDan2017-09-231-2/+2
* | | | ReadOnlyInput component.Dan2017-09-233-13/+34
* | | | Open account details modal on buy -> direct deposit.Dan2017-09-231-1/+11
* | | | Client side error handling for from, to and amount fields in send.jsDan2017-09-234-44/+184
* | | | Refactor Confirmation Tx to render different screenChi Kei Chan2017-09-222-183/+163
* | | | Integrate Add TokenChi Kei Chan2017-09-226-255/+333
* | | | Abstract account modal.Dan2017-09-224-63/+96
* | | | Confirm screen shows amount plus gas in total fieldDan2017-09-222-6/+29
* | | | Clean up code in send.jsDan2017-09-221-234/+193
* | | | Handles errors with to field and renders warnings from backend in send token.Dan2017-09-221-11/+17
* | | | Add Token UI - hover/select state; fetch token addressChi Kei Chan2017-09-213-19/+82
* | | | Add Add Token UI; Add Fuzzy search for tokensChi Kei Chan2017-09-205-140/+458
* | | | Buy Modal StylingChi Kei Chan2017-09-202-10/+17
* | | | Ensure conversion util does not return insignificant trailing zeroes.Dan2017-09-201-1/+1
* | | | Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-1925-241/+150
|\ \ \ \
* \ \ \ \ Merge branch 'master' into NewUI-flatChi Kei Chan2017-09-192-0/+10
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #2116 from chikeichan/nmChi Kei Chan2017-09-1962-640/+5027
|\ \ \ \ \ \
| * | | | | | Fix Merge Problems; update yarn lockChi Kei Chan2017-09-192-49/+558
| * | | | | | Merge branch 'master' into nmChi Kei Chan2017-09-1961-591/+4469
|/| | | | | |
* | | | | | | 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
|\ \ \ \ \ \ \
* | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-07 06:04:32 +0800