aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Implement responsive wallet balancessdtsui2017-08-111-17/+129
| * | | | | | | Add UI tweaks, including separation of overflow logic for mobile (full-height...sdtsui2017-08-111-8/+3
| * | | | | | | Improve text positioning on mobile viewsdtsui2017-08-111-11/+13
| * | | | | | | Implement widescreen layout for tx listsdtsui2017-08-111-30/+28
| * | | | | | | Move Txs list item styles into classessdtsui2017-08-111-37/+17
| * | | | | | | Cleanup txList and txView componentssdtsui2017-08-112-48/+87
| * | | | | | | 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
| * | | | | | | 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-101-3/+9
| * | | | | | | Vertically center modal in mobile view - @cjeriasdtsui2017-08-101-1/+4
| * | | | | | | Merge branch 'master' into NewUI-flatkumavis2017-08-094-75/+94
| |\ \ \ \ \ \ \
| * | | | | | | | Fix dropdown z-index valuesdtsui2017-08-091-1/+1
| * | | | | | | | Add backdrop styles and box shadow to new global modal defaultssdtsui2017-08-091-0/+7
| * | | | | | | | Add minor comments and cleanup for new componentssdtsui2017-08-092-13/+15
| * | | | | | | | Hook up 'Buy with Fiat', redirect to Coinbasesdtsui2017-08-091-7/+10
| * | | | | | | | Move buy view into its own component - BuyOptionssdtsui2017-08-091-0/+70
| * | | | | | | | Move inline styles out into explicitly named BEM classessdtsui2017-08-091-3/+12
| * | | | | | | | Implement modal content for buy flow - mobile viewsdtsui2017-08-091-0/+3
| * | | | | | | | Add note for responsive modal stylessdtsui2017-08-091-0/+1
| * | | | | | | | Hook up global modal to Tx view, Buy buttonsdtsui2017-08-091-0/+4
| * | | | | | | | Implement global modalsdtsui2017-08-091-0/+75
| * | | | | | | | refactored and added unit testSimon Liang2017-08-081-23/+26
| * | | | | | | | extracted balance component and renders to the format, also wired in the acco...Simon Liang2017-08-082-23/+115
| * | | | | | | | Opt for calculated values in absolutely positioned caretsdtsui2017-08-071-2/+5
| * | | | | | | | Improve positioning of caret and add reusable color for wallet viewsdtsui2017-08-071-21/+12
| * | | | | | | | Position account icon, name, and caretsdtsui2017-08-072-19/+64
| * | | | | | | | Move tx and wallet view styles to component classessdtsui2017-08-072-9/+2
| * | | | | | | | Merge branch 'NewUI' into feat/mm-ui-5-mergedsdtsui2017-08-076-27/+216
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Cleanup before rebase on NewUI - need new version of AccountDropdownssdtsui2017-08-071-11/+2
| * | | | | | | | | Allow clicks on account view to enable sidebar, not just burgersdtsui2017-08-071-4/+4
| * | | | | | | | | Refactor account name css - mobile viewssdtsui2017-08-072-10/+4
| * | | | | | | | | Refactor app-header css, including box shadow and z-indexsdtsui2017-08-071-1/+1
| * | | | | | | | | Add fine css tweaks to hero balance - laptopsdtsui2017-08-071-1/+1
| * | | | | | | | | Fix font size of eth display for 576-780px vwsdtsui2017-08-071-2/+0
| * | | | | | | | | Normalize sidebar dimensions and adjust hero button responsivenesssdtsui2017-08-072-6/+2
| * | | | | | | | | Implement hero balance UI, mobilesdtsui2017-08-071-51/+38
| * | | | | | | | | Position account display and burger in mobile tx viewsdtsui2017-08-072-7/+42
| * | | | | | | | | Move remaining debug, fonts, reset, and transitions into inverted trianglesdtsui2017-08-071-2/+6
| * | | | | | | | | Add rough layout for flat layout tx details, add notes for breakpointssdtsui2017-08-031-20/+39
| * | | | | | | | | Implement 'clear buttons' for tx viewsdtsui2017-08-032-45/+38
| * | | | | | | | | Isolate routing logic for isUnlocked, remove stray logssdtsui2017-08-032-3/+0
| * | | | | | | | | Finalize height for main screens, excluding sidebarsdtsui2017-08-032-6/+1
| * | | | | | | | | Implement custom sidebar, with close buttonsdtsui2017-08-032-12/+15
| * | | | | | | | | Integrate slideout menu with tx viewsdtsui2017-08-031-7/+29
| * | | | | | | | | Hook up responsive sidebarsdtsui2017-08-031-2/+2
| * | | | | | | | | Add burger icon and phone-visible media queriessdtsui2017-08-031-0/+5
| * | | | | | | | | Make wallet view visible iff vw above 575pxsdtsui2017-08-031-1/+1
| * | | | | | | | | Hook up send button to Send Token screensdtsui2017-08-011-1/+12
| * | | | | | | | | Implement mobile-friendly responsive layout with flex wrapsdtsui2017-08-012-2/+9
| * | | | | | | | | Add rough layout for tx list itemssdtsui2017-08-011-0/+60
| * | | | | | | | | Add tx-view content divider componentsdtsui2017-08-011-5/+6
| * | | | | | | | | Add hyperscript for tx-view tabssdtsui2017-08-011-9/+27
| * | | | | | | | | Add TxView, use width percentages instead of flex-grow for layoutsdtsui2017-08-012-1/+54
| * | | | | | | | | Adjust button styles to left align with wallet textsdtsui2017-08-011-7/+4
| * | | | | | | | | Adjust popup size to 545x450; refactor wallet view to fitsdtsui2017-08-012-60/+28
| * | | | | | | | | Isolate wallet-content-display componentsdtsui2017-07-312-2/+62
| * | | | | | | | | Add layout for Buy and Send buttonssdtsui2017-07-311-1/+44
| * | | | | | | | | Add hyperscript for wallet display componentsdtsui2017-07-311-4/+48
| * | | | | | | | | Center account name and dropdownssdtsui2017-07-311-5/+4
| * | | | | | | | | Add note for later on isolating componentssdtsui2017-07-311-1/+1
| * | | | | | | | | Add containers for wallet view and dropdown UIsdtsui2017-07-311-0/+81
| * | | | | | | | | Adjust button styles for Send Token screensdtsui2017-07-311-0/+1
| * | | | | | | | | Adjust copy in send token confirmation screensdtsui2017-07-301-2/+2
| * | | | | | | | | Move action buttons out of send token container, tweak stylessdtsui2017-07-301-38/+40
| * | | | | | | | | Simplify btn-green colorssdtsui2017-07-301-0/+1
| * | | | | | | | | Add rounded background to total token, with minor styling tweakssdtsui2017-07-301-21/+171
| * | | | | | | | | Add note to self, for future code cleanupsdtsui2017-07-301-1/+7
| * | | | | | | | | Add content boxes to pendingTx, prep for reusabilitysdtsui2017-07-301-330/+179
| * | | | | | | | | [WIP] Isolate form logic from rest of confirmation UIsdtsui2017-07-301-22/+27
| * | | | | | | | | Add responsive container; add send token copysdtsui2017-07-301-0/+7
* | | | | | | | | | Move etherscan link logic into moduleDan Finlay2017-10-143-3/+3
* | | | | | | | | | Merge pull request #2296 from MetaMask/precision-fixDan Finlay2017-10-101-4/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix precision to account for small wei increase.Kevin Serrano2017-10-061-4/+7
* | | | | | | | | | | More appropriate stylingSergey Ukustov2017-10-081-1/+2
* | | | | | | | | | | Merge branch 'master' into SignTypedDataDan Finlay2017-10-062-15/+25
|\| | | | | | | | | |
| * | | | | | | | | | Revert to normal balances.Kevin Serrano2017-10-051-3/+3
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | ui - tx history - simplify error+warning display codekumavis2017-10-031-12/+22
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Respect code styleSergey Ukustov2017-09-301-2/+1
* | | | | | | | | Add eth_signTypedData handlerSergey Ukustov2017-09-303-0/+147
|/ / / / / / / /
* | | | | | | | Merge branch 'master' into new-currency-testkumavis2017-09-281-3/+3
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-234-28/+43
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | |
| * | | | | | | | Merge branch 'master' into AddBalanceControllerDan Finlay2017-09-141-9/+19
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Use computed balance for tx confirmationDan Finlay2017-09-141-3/+3
* | | | | | | | | Account for undefined currencies.Kevin Serrano2017-09-271-1/+2
* | | | | | | | | Comply with current currency API and add additional styling.Kevin Serrano2017-09-191-1/+1
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' into fix-tooltipDan Finlay2017-09-191-25/+40
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Haha silly me, only when gas is estimated and not explicit.Kevin Serrano2017-09-141-1/+1
| * | | | | | | Lower warning threshold for high tx fee to account for fluctuating blockGasLi...Kevin Serrano2017-09-141-1/+2
| * | | | | | | Add warning of higher failure risk since app proposed gasLimit.Kevin Serrano2017-09-141-25/+39
| | |/ / / / / | |/| | | | |
* / | | | | | fixed position of tooltips to avoid overflow.Kevin Serrano2017-09-133-3/+3
|/ / / / / /
* | | | | | Fix typo.Kevin Serrano2017-09-121-2/+2
* | | | | | Add some styling.Kevin Serrano2017-09-121-0/+3
* | | | | | Move function as util function.Kevin Serrano2017-09-121-16/+2
* | | | | | Basic private key download file functionality.Kevin Serrano2017-09-121-9/+30
|/ / / / /
* | | | | Show reject all only when tx count is > 1Kevin Serrano2017-09-121-2/+3
* | | | | Merge github.com:MetaMask/metamask-extension into rejectallunapprovedKevin Serrano2017-09-121-3/+8
|\ \ \ \ \
| * | | | | Add cursor on hover on loading. Change some wording.Kevin Serrano2017-09-081-3/+3
| * | | | | Add caret to indicate network is dropdown.Kevin Serrano2017-09-081-0/+5
* | | | | | Convert icon to button.Kevin Serrano2017-09-081-0/+11
* | | | | | Fold submit and buy ether into one button slotKevin Serrano2017-09-081-15/+9
|/ / / / /
* | | | | Place object property retrieval inside try-catchKevin Serrano2017-09-081-2/+3
* | | | | Change expected type to array.Kevin Serrano2017-09-081-1/+1
* | | | | Merge branch 'master' into readd-looseKevin Serrano2017-09-061-2/+13
|\ \ \ \ \
| * | | | | Make eth_sign deprecation warning more usefulDan Finlay2017-09-061-2/+13
* | | | | | Resolve merge conflict from masterKevin Serrano2017-09-065-40/+36
|\| | | | |
| * | | | | Multiple tokens shows the amount when greater than 1Thomas Huang2017-08-301-1/+1
| * | | | | Remove eth-tx-viz link from tx history iconsDan Finlay2017-08-241-10/+1
| * | | | | Fix eth sign formattingDan Finlay2017-08-182-2/+5
| * | | | | Fallback to ethplorer linkDan Finlay2017-08-171-1/+18
| * | | | | Remove dead codeDan Finlay2017-08-171-14/+0
| * | | | | Remove default tokensDan Finlay2017-08-171-11/+1
| | |_|_|/ | |/| | |
| * | | | Cleanup stray logs and lintsdtsui2017-08-111-5/+1
| * | | | Fix text overflow for dropdown components flagged by @frankiebeesdtsui2017-08-111-1/+14
* | | | | Readd loose label onto accounts.Kevin Serrano2017-08-102-2/+20
|/ / / /
* | | | ui - buy eth - formatting and moved network names to configkumavis2017-08-101-23/+19
* | | | 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 branch 'master' into greenkeeper/initialkumavis2017-08-093-73/+92
|\ \ \
| * \ \ 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 branch 'master' into transactionControllerRefractorfrankiebee2017-08-0814-156/+592
| |\| |
| * | | fixed: showing tx-s as errors vs. warningfrankiebee2017-08-051-3/+12
* | | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-0814-156/+592
|\ \ \ \ | | |/ / | |/| |
| * | | Lint menu-dropposdtsui2017-08-051-31/+24
| * | | Bring menu-droppo component into project, remove as a dependencysdtsui2017-08-052-1/+138
| * | | Re-enable css transitions for dropdowns in header, needs menu-droppo library ...sdtsui2017-08-052-1/+4
| * | | ui - dropdown - use Object.assign syntax to appease coverage parserkumavis2017-08-041-3/+2
| * | | Adjust padding of accountSwitcher dropdownsdtsui2017-08-041-4/+7
| * | | Adjust top and bottom padding of accountSwitchersdtsui2017-08-041-2/+9
| * | | Lint ui/appsdtsui2017-08-042-4/+4
| * | | Allow new accounts selector to handle clickssdtsui2017-08-041-2/+2
| * | | Increase size of accountSelection dropdownsdtsui2017-08-041-8/+22
| * | | Increase size of settings dropdown and account settings dropdownsdtsui2017-08-042-2/+2
| * | | Increase size of network dropdownsdtsui2017-08-041-1/+2
| * | | Add note with previous fa-angle-down for future refactorsdtsui2017-08-041-0/+2
| * | | Position account switcher icon back in app headersdtsui2017-08-041-2/+6
| * | | Disable account selection dropdown from account detailssdtsui2017-08-041-5/+15
| * | | Fix wonky widths for notices.Kevin Serrano2017-08-041-1/+5
| * | | Add maximum width for private key revealKevin Serrano2017-08-041-1/+1
| * | | Add QR functionalityKevin Serrano2017-08-041-0/+13
| * | | lint fixkumavis2017-08-021-2/+2
| | |/ | |/|
| * | Fix dropdown toggle behavior - account dropdownssdtsui2017-07-291-2/+16
| * | Correct token pluralization for one tokenDan Finlay2017-07-281-1/+3
| * | Set min gas price to 1 gweiDan Finlay2017-07-281-1/+1
| * | Ensure loading indication is full screenDan Finlay2017-07-281-0/+1
| * | Fix loading indication placementDan Finlay2017-07-281-1/+1
| * | Remove object spread syntaxDan Finlay2017-07-271-7/+9
| * | Set initial scale for mobile.Dan Finlay2017-07-271-1/+3
| * | Re-center network dropdownsdtsui2017-07-271-1/+2
| * | Make account selection dropdown menu scrollable when too large for viewsdtsui2017-07-271-0/+2
| * | Remove Account Settings item from optionsMenu, unnecessarysdtsui2017-07-271-8/+0
| * | Lots of flex rearrangement on account detail viewDan Finlay2017-07-265-52/+58
| * | Replace ui with responsive-uiDan Finlay2017-07-257-104/+329
| * | Merge branch 'master' into NewUIDan Finlay2017-07-211-1/+1
| |\|
| | * Lowered minimum gas price to 1 gweiDan Finlay2017-07-201-1/+1
| * | Move responsive ui into its own folder for easier mergesDan Finlay2017-07-2140-0/+4069
| * | Make folder for responsive UIDan Finlay2017-07-0440-4072/+0
* | | Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkee...kumavis2017-08-041-1/+1
* | | lint fixeskumavis2017-08-042-2/+2
| |/ |/|
* | Reenable Default Token ListDan Finlay2017-07-061-2/+0
|/
* Add menu carrat next to network searching indicatorDan Finlay2017-07-041-7/+16
* Merge branch 'master' into NoPopularTOkensThomas Huang2017-07-011-0/+2
|\
| * Remove send buttonDan Finlay2017-07-011-0/+2
* | Stop loading popular tokens by defaultDan Finlay2017-07-011-1/+3
|/
* Merge pull request #1700 from MetaMask/StyleImprovementsKevin Serrano2017-06-301-0/+1
|\
| * Add padding to token messagesDan Finlay2017-06-291-0/+1
* | change “ACCEPT” to “SUBMIT”frankiebee2017-06-301-1/+1
|/
* Merge pull request #1634 from MetaMask/i784-SendTokenButtonThomas Huang2017-06-291-7/+29
|\
| * Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-281-1/+3
| |\
| * \ Merge branch 'i1616-AddTokenAdding' into i784-SendTokenButtonDan Finlay2017-06-241-7/+4
| |\ \
| * \ \ Merge branch 'master' into i784-SendTokenButtonDan Finlay2017-06-231-4/+18
| |\ \ \
| * | | | Fix propagationDan Finlay2017-06-201-1/+1
| * | | | Add send button to TokenFactoryDan Finlay2017-06-201-7/+29
* | | | | Merge pull request #1620 from MetaMask/i1616-AddTokenAddingThomas Huang2017-06-292-32/+78
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Support other network linksDan Finlay2017-06-281-1/+3
| | |_|/ | |/| |
| * | | Merge branch 'master' into i1616-AddTokenAddingDan Finlay2017-06-231-4/+18
| |\ \ \ | | | |/ | | |/|
| * | | Reduce token list clutter by only showing held tokensDan Finlay2017-06-201-7/+4
| | |/ | |/|
| * | Add ability to add tokens to token listDan Finlay2017-06-161-10/+30
| * | Merge branch 'AddTokenList' into AddingTokensDan Finlay2017-06-161-15/+7
| |\ \
| * | | Create add token button and template viewDan Finlay2017-06-151-22/+49
* | | | Merge pull request #1675 from MetaMask/warning-fixesDan Finlay2017-06-281-1/+1
|\ \ \ \
| * | | | Fix react warning for keys on ens address bookKevin Serrano2017-06-271-1/+1
| | |_|/ | |/| |
* | | | Change disabling button as state property.Kevin Serrano2017-06-271-5/+4
* | | | Prevent users from accidentally submitting two transactions by disabling button.Kevin Serrano2017-06-271-0/+3
|/ / /
* | / Add better event lifecycle management to token list.Dan Finlay2017-06-201-4/+18
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into AddTokenListDan Finlay2017-06-161-15/+7
|\ \ | |/ |/|
| * Merge pull request #1600 from MetaMask/i1554-ensSymFixKevin Serrano2017-06-141-15/+7
| |\
| | * Cleanup zero addresses.Kevin Serrano2017-06-141-5/+6
| | * Fix check icon appearing in inappropriate situations.Kevin Serrano2017-06-131-13/+4
* | | Multiple loading style improvementsDan Finlay2017-06-151-1/+4
* | | Remove excessive logDan Finlay2017-06-151-1/+0
* | | Add no tokens messageDan Finlay2017-06-151-9/+13
* | | Vertically center loading indicationDan Finlay2017-06-151-2/+10
* | | Refresh token balance on network changeDan Finlay2017-06-151-5/+22
* | | Persist selected account tabDan Finlay2017-06-151-2/+13
* | | Auto populate token list with popular token balancesDan Finlay2017-06-144-19/+59
* | | Merge branch 'master' into AddTokenListDan Finlay2017-06-1321-311/+646
|\| |
| * | only prefix ethereum addressfrankiebee2017-06-131-5/+6
| * | prefix the address with "ethereum:"frankiebee2017-06-131-2/+1
| |/
| * Merge pull request #1574 from MetaMask/internfixDan Finlay2017-06-131-1/+1
| |\
| | * Modify wording to new accept.Kevin Serrano2017-06-101-1/+1
| | * Merge branch 'master' of github.com:nihar97/metamask-plugin into internfixKevin Serrano2017-06-091-1/+1
| | |\
| | | * continue button changed to agreeNihar2017-05-171-1/+1
| * | | Merge branch 'master' into gasupdaterDan Finlay2017-06-133-13/+87
| |\| |
| | * | Fix bug that prevented publishing contractsDan Finlay2017-06-061-1/+1
| | * | Merge pull request #1545 from MetaMask/inValidAddressFixkumavis2017-06-062-3/+18
| | |\ \
| | | * | Fix for quick switch on ENS namesfrankiebee2017-06-061-0/+2
| | | * | set the ensResolution to an invalid address if an error ocurs durring look upfrankiebee2017-06-061-0/+1
| | | * | Fix linting errorfrankiebee2017-06-061-1/+0
| | | * | move address check to util.isValidAddressfrankiebee2017-06-061-2/+2
| | | * | Fix punctuationfrankiebee2017-06-061-1/+1
| | | * | Dissallow transactions to be sent to 0x0000000000000000000000000000000000000000frankiebee2017-06-062-1/+14
| | * | | Remove dead style codeDan Finlay2017-06-051-3/+0
| | * | | Move address copying into reusable componentDan Finlay2017-06-052-20/+54
| | * | | Add copy links to mini tx panelsDan Finlay2017-06-051-10/+38
| | |/ /
| * / / Update gasblocklimit params with every block.Kevin Serrano2017-06-031-2/+9
| |/ /
| * | Add max gas limit to UIKevin Serrano2017-05-251-0/+2
| * | Minor cleanup of lintKevin Serrano2017-05-251-1/+0
| * | Minor cleanupKevin Serrano2017-05-251-2/+2
| * | Fix bug where submit was enabled when invalid params were filled out.Kevin Serrano2017-05-252-5/+11
| * | Cleanup code.Kevin Serrano2017-05-251-7/+15
| * | Fix test, create new value for precision/scaleKevin Serrano2017-05-242-3/+5
| * | Merge branch 'master' into i1412-decimalizethegasKevin Serrano2017-05-243-6/+31
| |\ \
| | * | Tolerate nonces of any formatDan Finlay2017-05-231-2/+2
| | * | Render txs with no nonceDan Finlay2017-05-231-1/+1
| | * | LintDan Finlay2017-05-222-6/+3
| | * | Label the pending tx icon with a tooltipDan Finlay2017-05-221-5/+12
| | * | Add transaction number (nonce) to tx listDan Finlay2017-05-221-0/+21
| | * | Fix decimal toleranceDan Finlay2017-05-181-1/+1
| | * | Fix bug where decimals in gas inputs gave strange resultsDan Finlay2017-05-181-1/+1
| | |/
| * | Increase accuracy of our rounding schemes.Kevin Serrano2017-05-241-3/+26
| * | Modify test, replace clone package.Kevin Serrano2017-05-181-7/+4
| * | Fix merge conflicts.Kevin Serrano2017-05-1710-76/+100
| |\|
| | * Fix fiat renderingDan Finlay2017-05-175-14/+20
| | * Merge pull request #1430 from MetaMask/i1407-FixNonEditingTxFormkumavis2017-05-168-66/+84
| | |\
| | | * LintedDan Finlay2017-05-162-5/+6
| | | * Verify updating gas value updatesDan Finlay2017-05-161-2/+0
| | | * Got test failing nearly correctlyDan Finlay2017-05-161-1/+12
| | | * Skip jazzicons in unit testsDan Finlay2017-05-161-4/+9
| | | * Remove redux dependency from eth-balance and its dependent treeDan Finlay2017-05-136-22/+24
| | | * Break up pending-tx component for better unit testabilityDan Finlay2017-05-111-38/+39
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-10 00:16:59 +0800