aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* feat: add lock iconfragosti2018-11-091-0/+6
* Merge pull request #1230 from 0xProject/feature/instant/dropdown-uiFrancesco Agosti2018-11-0924-53/+314
|\
| * fix: wrong prop names usedfragosti2018-11-091-2/+2
| * chore: PR feedbackfragosti2018-11-091-9/+9
| * fix: broken features because of mergefragosti2018-11-093-1/+5
| * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0914-102/+226
| |\ | |/ |/|
* | [instant] Viewport specific errors (#1228)Steve Klebanoff2018-11-098-49/+118
* | Merge pull request #977 from 0xProject/feature/utils/prettybignumRemco Bloemen2018-11-091-0/+23
|\ \
| * | Added more commentsRemco Bloemen2018-11-091-0/+5
| * | Merge remote-tracking branch 'origin/development' into feature/utils/prettybi...Remco Bloemen2018-11-0928-247/+367
| |\ \ | |/ / |/| |
* | | Include wholeNumberSchema in sra-spec schemasFabio Berger2018-11-091-0/+2
* | | Merge pull request #1231 from 0xProject/fix/instant/default-amount-quoteBrandon Millman2018-11-094-53/+83
|\ \ \
| * | | chore(instant): fix linterBrandon Millman2018-11-091-0/+1
| * | | fix(instant): update buy quote at start up in the case of default amountBrandon Millman2018-11-084-53/+82
| | * | Merge remote-tracking branch 'origin/development' into feature/utils/prettybi...Remco Bloemen2018-11-091460-164360/+65361
| | |\ \ | | |/ / | |/| |
| | * | Fix isNodeRemco Bloemen2018-11-091-1/+1
| | * | Add upstream issueRemco Bloemen2018-08-221-0/+1
| | * | Use const require instead of importRemco Bloemen2018-08-221-1/+5
| | * | Fix tslint issuesRemco Bloemen2018-08-221-2/+3
| | * | Use detect-nodeRemco Bloemen2018-08-221-1/+2
| | * | Set curstom inspect printer in BigNumberRemco Bloemen2018-08-221-0/+11
| | | * fix: remove default props, fix lint problemsfragosti2018-11-093-8/+7
| | | * chore: convert payment method to stateless componentfragosti2018-11-091-29/+25
| | | * feat: add boxShadow on dropdown hoverfragosti2018-11-092-0/+3
| | | * fix: various style issuesfragosti2018-11-093-18/+21
| | | * fix: remove all:initial rule from all div based ui compoenntsfragosti2018-11-093-3/+0
| | | * fix: token selector scrolling container heightfragosti2018-11-092-3/+5
| | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0938-495/+688
| | | |\ | |_|_|/ |/| | |
* | | | Merge pull request #1220 from 0xProject/feature/instant/prevent-css-leakageFrancesco Agosti2018-11-0921-189/+276
|\ \ \ \
| * \ \ \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0929-337/+503
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1226 from 0xProject/fix/website/build-timeBrandon Millman2018-11-092-5/+6
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix(website): turn off production flag when building locallyBrandon Millman2018-11-082-5/+6
* | | | | Merge pull request #1221 from 0xProject/feature/instant/fallback-providerBrandon Millman2018-11-0820-316/+425
|\ \ \ \ \
| * | | | | chore(instant): increase max bundle size for bundle watchBrandon Millman2018-11-081-1/+1
| * | | | | feat(instant): add Account to the ProviderStateBrandon Millman2018-11-083-39/+97
| * | | | | feat(instant): fallback to an empty wallet provider when none is injectedBrandon Millman2018-11-0815-282/+333
| * | | | | chore(instant): update OrderState enum to follow capitalization conventionsBrandon Millman2018-11-078-43/+43
| | | * | | fix: apply css reset to overlay as wellfragosti2018-11-085-35/+41
| | | * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0822-34/+333
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | chore: linterfragosti2018-11-076-10/+6
| | | * | | fix: progress barfragosti2018-11-072-7/+9
| | | * | | fix: use fontSize prop in buttonfragosti2018-11-071-2/+1
| | | * | | feat: make instant resistant to external stylesfragosti2018-11-0716-171/+233
| | | * | | feat: add faux externall css filefragosti2018-11-072-0/+22
| | |/ / / | |/| | |
| | | | * chore: cleanupfragosti2018-11-081-2/+3
| | | | * fix: restore button to previous statefragosti2018-11-081-38/+24
| | | | * Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-087-16/+72
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #1219 from 0xProject/feature/instant/mobile-full-bleedSteve Klebanoff2018-11-087-16/+72
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Small code review tweaksSteve Klebanoff2018-11-082-2/+2
| * | | | Take out unneeded conditionalsSteve Klebanoff2018-11-071-2/+2
| * | | | remove unused dependecnySteve Klebanoff2018-11-071-1/+0
| * | | | remove unused importSteve Klebanoff2018-11-071-2/+0
| * | | | remove old commentSteve Klebanoff2018-11-071-1/+0
| * | | | Merge branch 'development' into feature/instant/mobile-full-bleedSteve Klebanoff2018-11-0726-48/+166
| |\| | |
| * | | | Hide X when smallSteve Klebanoff2018-11-072-3/+3
| * | | | Fix mobile view of selecting assetsSteve Klebanoff2018-11-071-1/+1
| * | | | Get rid of unused propertiesSteve Klebanoff2018-11-072-4/+0
| * | | | new MediaChoice approach for setting conditional css propertiesSteve Klebanoff2018-11-076-61/+19
| * | | | better function definitonSteve Klebanoff2018-11-073-17/+11
| * | | | proof of concept workingSteve Klebanoff2018-11-073-9/+22
| * | | | wip: mediachoice experimentSteve Klebanoff2018-11-073-0/+37
| * | | | feat(instant): when on mobile, show mobile specific styling that takes up who...Steve Klebanoff2018-11-075-4/+58
| * | | | Putting back in old heights as not necessary for full bleedSteve Klebanoff2018-11-072-2/+2
| * | | | wip: height 100%Steve Klebanoff2018-11-062-2/+4
| * | | | wip: full display of mobile hard codedSteve Klebanoff2018-11-066-6/+13
| * | | | fix(instant): fix provided ordersSteve Klebanoff2018-11-061-1/+1
| | | | * feat: implement copy-to-clipboardfragosti2018-11-084-0/+30
| | | | * feat: add MetaMask sign, refactor Circlefragosti2018-11-084-18/+37
| | | | * feat: create PaymentMethodDropdownfragosti2018-11-089-43/+86
| | | | * chore: remove unused propsfragosti2018-11-081-2/+2
| | | | * fix: height of token selector overflow divfragosti2018-11-082-7/+7
| | | | * feat: refactor out overlay component and use it to implement click-outsidefragosti2018-11-085-68/+89
| | | | * feat: implement basic dropdown componentfragosti2018-11-086-8/+169
| |_|_|/ |/| | |
* | | | [order_utils.py] is_signature_valid, via Exchange contract (#1216)F. Eugene Aumson2018-11-0820-33/+328
* | | | Merge pull request #1217 from 0xProject/fix/asset-buyer/lower-default-expiry-...Brandon Millman2018-11-072-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | fix(asset-buyer): lower default expiryBuffer from 5 minutes to 2 minutesBrandon Millman2018-11-072-1/+5
|/ / /
* | | Merge pull request #1210 from 0xProject/feature/instant/beta-bucketFrancesco Agosti2018-11-075-13/+72
|\ \ \
| * | | chore: move to underscoresfragosti2018-11-062-4/+4
| * | | chore: prettier and linterfragosti2018-11-032-12/+11
| * | | fix: typo in READMEfragosti2018-11-031-1/+1
| * | | feat: break up deploy into deploy-dogfood and deploy-stagingfragosti2018-11-035-13/+72
| |/ /
* | | Merge pull request #1213 from 0xProject/feature/instant/more-testnet-liquidityFrancesco Agosti2018-11-073-10/+46
|\ \ \
| * | | fix: remove unused importfragosti2018-11-061-1/+0
| * | | chore: clarify a commentfragosti2018-11-061-2/+2
| * | | feat: add GNT and MKR testnet orders, fix typofragosti2018-11-063-10/+46
| |/ /
* | | Merge pull request #1211 from 0xProject/chore/import-ui-directlySteve Klebanoff2018-11-0717-25/+50
|\ \ \
| * | | add extra spaceSteve Klebanoff2018-11-061-0/+1
| * | | remove unused importSteve Klebanoff2018-11-061-1/+0
| * | | chore(instant): import UI components directlySteve Klebanoff2018-11-0617-25/+49
| |/ /
* / / chore(instant): fix lint errorBrandon Millman2018-11-061-1/+0
|/ /
* | Merge pull request #1204 from 0xProject/feature/instant/maker-asset-datas-int...Francesco Agosti2018-11-0327-98/+454
|\ \
| * \ Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0316-104/+132
| |\ \ | |/ / |/| |
* | | Merge pull request #1206 from 0xProject/fix/instant/decimal-fields-scaling-am...Steve Klebanoff2018-11-039-70/+85
|\ \ \
| * | | lintingSteve Klebanoff2018-11-031-1/+0
| * | | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp...Steve Klebanoff2018-11-038-34/+46
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1209 from 0xProject/feature/instant/optional-providerBrandon Millman2018-11-038-34/+46
|\ \ \ \
| * | | | feat(instant): pass in provider through props, fallback to injected providerBrandon Millman2018-11-038-34/+46
| | * | | Use generic MaybeSteve Klebanoff2018-11-033-8/+9
| | * | | lintingSteve Klebanoff2018-11-032-2/+2
| | * | | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp...Steve Klebanoff2018-11-0323-59/+515
| | |\ \ \ | |_|/ / / |/| | | |
| | * | | onChange -> onAmountChangeSteve Klebanoff2018-11-032-5/+5
| | * | | Move MaybeBigNumber functions into helperSteve Klebanoff2018-11-032-17/+29
| | * | | Have ScalingAmountInput trigger onChange with MaybeBigNumber and keep string ...Steve Klebanoff2018-11-022-12/+54
| | * | | Getting rid of BigNumberInput in favor of BigNumberSteve Klebanoff2018-11-027-56/+17
| | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0323-59/+515
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge pull request #1208 from 0xProject/fix/instant/zero-NaNSteve Klebanoff2018-11-031-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | fix(instant): dont get buy quote for zero valueSteve Klebanoff2018-11-031-1/+1
* | | | | Merge pull request #1207 from 0xProject/feature/instant/affiliate-feeBrandon Millman2018-11-0313-28/+103
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | feat(instant): add affiliateInfo overrides to dev urlBrandon Millman2018-11-031-0/+10
| * | | | feat(instant): implement affiliateFeeInfo propBrandon Millman2018-11-039-15/+61
| * | | | fix(asset-buyer): fix default values being overriden and incorrect fee roundingBrandon Millman2018-11-033-13/+32
|/ / / /
* | | | Merge branch 'development' into feature/instant/simulated-progress-barSteve Klebanoff2018-11-0320-147/+426
|\| | |
* | | | Merge branch 'development' into feature/instant/simulated-progress-barSteve Klebanoff2018-11-0227-248/+485
|\ \ \ \
* | | | | linting: moving order of importsSteve Klebanoff2018-11-021-1/+1
* | | | | Better styling of estimated timeSteve Klebanoff2018-11-021-2/+15
* | | | | removing unused importsSteve Klebanoff2018-11-022-2/+2
* | | | | Move file to new file to reflect the new export nameSteve Klebanoff2018-11-022-3/+1
* | | | | Rename exportSteve Klebanoff2018-11-022-3/+3
* | | | | Move BuyOrderProgress to its own componentSteve Klebanoff2018-11-022-38/+39
* | | | | Remove old TODOSteve Klebanoff2018-11-021-1/+1
* | | | | Use new constantsSteve Klebanoff2018-11-022-3/+6
* | | | | Use primary color instead of blackSteve Klebanoff2018-11-021-1/+1
* | | | | maxWidth -> toWidth, and make from and to width consistent unitsSteve Klebanoff2018-11-022-11/+11
* | | | | Getting rid of TimedProgress stateSteve Klebanoff2018-11-021-47/+23
* | | | | Minor cleanupSteve Klebanoff2018-11-021-2/+2
* | | | | Take out old ended variableSteve Klebanoff2018-11-021-14/+6
* | | | | Fix test nameSteve Klebanoff2018-11-021-1/+1
* | | | | ended -> hasEndedSteve Klebanoff2018-11-023-9/+9
* | | | | Rename to SelectedAssetProgressSteve Klebanoff2018-11-012-4/+4
* | | | | Removing old extra paramSteve Klebanoff2018-11-011-1/+0
* | | | | Removing old simulated progress bar, and adding documentation to TimedProgres...Steve Klebanoff2018-11-014-201/+5
* | | | | WIP of new timedprogressbar using CSS animationsSteve Klebanoff2018-11-015-7/+180
* | | | | Revert "Remove default in state reducer"Steve Klebanoff2018-11-012-2/+3
* | | | | Merge branch 'development' into feature/instant/simulated-progress-barSteve Klebanoff2018-11-010-0/+0
|\ \ \ \ \
* | | | | | Remove default in state reducerSteve Klebanoff2018-11-012-3/+2
* | | | | | Explicit actions for setting different order statesSteve Klebanoff2018-11-016-51/+88
* | | | | | Remove unused importSteve Klebanoff2018-10-311-1/+0
* | | | | | Tick less often, and let CSS style the transitionSteve Klebanoff2018-10-312-4/+24
* | | | | | Nice formatting of displayed timeSteve Klebanoff2018-10-313-6/+90
* | | | | | Takeout unneeded divSteve Klebanoff2018-10-311-12/+10
* | | | | | Get rid of old demoSteve Klebanoff2018-10-315-45/+0
* | | | | | Use simulated progress bar for txnSteve Klebanoff2018-10-316-45/+108
* | | | | | Always return estimated time, just use default if not knownSteve Klebanoff2018-10-311-3/+14
* | | | | | Showing timeSteve Klebanoff2018-10-311-1/+9
* | | | | | Show estimated timeSteve Klebanoff2018-10-311-0/+9
* | | | | | Remove old filesSteve Klebanoff2018-10-317-200/+0
* | | | | | Simulated Progress component workingSteve Klebanoff2018-10-316-6/+102
* | | | | | WIP: beginning of simulated progress bar componentSteve Klebanoff2018-10-312-1/+137
* | | | | | Placeholder for estimated timeSteve Klebanoff2018-10-312-2/+15
* | | | | | Making prettierSteve Klebanoff2018-10-311-4/+8
* | | | | | Dispatching progressSteve Klebanoff2018-10-317-4/+84
* | | | | | Remove old TODOSteve Klebanoff2018-10-311-1/+0
* | | | | | Rename functions and get rid of old unused functionSteve Klebanoff2018-10-311-12/+4
* | | | | | Stall at 95 percentSteve Klebanoff2018-10-312-27/+46
* | | | | | WIP: Progress ticker with finishingSteve Klebanoff2018-10-312-0/+90
* | | | | | store estimated time in Ms on stateSteve Klebanoff2018-10-302-5/+5
* | | | | | return estimated stateSteve Klebanoff2018-10-304-9/+17
| | | | * | chore: address PR commentsfragosti2018-11-035-18/+24
| | | | * | fix: change assetdatas for OMG and REP to be all lower case, make MKR bluefragosti2018-11-033-7/+10
| | | | * | feat: reset input after token selectionfragosti2018-11-031-1/+2
| | | | * | fix: dont include assetData in render optionsfragosti2018-11-021-1/+0
| | | | * | chore: prettier and linterfragosti2018-11-022-2/+0
| | | | * | feat: add basic token search functionalityfragosti2018-11-023-11/+75
| | | | * | feat: improve position of close X in token selectorfragosti2018-11-021-1/+3
| | | | * | feat: implement search bar UIfragosti2018-11-025-5/+16
| | | | * | feat: add name param to all ERC20AssetMetaDatafragosti2018-11-024-0/+17
| | | | * | feat: implement basic token selection UIfragosti2018-11-026-9/+69
| | | | * | feat: implement panel title and closefragosti2018-11-022-5/+16
| | | | * | feat: use withTheme to use ColorOption to color Iconfragosti2018-11-025-16/+14
| | | | * | feat: use new Icon component functionalityfragosti2018-11-021-2/+2
| | | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0220-259/+404
| | | | |\ \ | | | | |/ / | | | |/| |
| | | * | | Merge pull request #1205 from 0xProject/feature/instant/render-overlayBrandon Millman2018-11-0211-137/+268
| | | |\ \ \
| | | | * | | Remove alternate hover styling from button and move into icon componentBrandon Millman2018-11-025-54/+54
| | | | * | | feat(instant): add interactive overlay presentation to umd bundleBrandon Millman2018-11-0212-120/+251
| | | |/ / / | | |/| | |
| | | * | | Merge pull request #1203 from 0xProject/feature/instant/token-selection-panelFrancesco Agosti2018-11-029-10/+158
| | |/| | |
| | | * | | fix: make maxPerPage for the SRA getAvailableMakerAssetDatasAsync call a loca...fragosti2018-11-022-3/+3
| | | * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-028-106/+118
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge pull request #1201 from 0xProject/feature/instant/basic-token-modalFrancesco Agosti2018-11-0219-142/+367
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #1197 from 0xProject/feature/instant/add-new-order-and-repFrancesco Agosti2018-11-016-37/+51
| | |\ \ \ \ \
| | | * | | | | chore: remove unused importfragosti2018-11-011-1/+1
| | | * | | | | chore: remove unused importfragosti2018-11-011-1/+0
| | | * | | | | fix: address PR commentsfragosti2018-11-016-33/+90
| | | |\ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | | * | | | | chore: add changelogfragosti2018-10-301-0/+4
| | | * | | | | feat: remove isValidProvided orders validationfragosti2018-10-303-33/+35
| | | * | | | | chore: remove console logfragosti2018-10-301-1/+0
| | | * | | | | feat(instant): add default gasPrice of 6 gwei to transactionsBrandon Millman2018-10-302-2/+5
| | | * | | | | feat: add augur provided orderfragosti2018-10-304-18/+26
| | * | | | | | Merge pull request #1199 from 0xProject/feature/website/metmask-breaking-changeBrandon Millman2018-11-012-69/+66
| |/| | | | | |
| | * | | | | | fix(website): prepare website for breaking MetaMask change for eip 1102Brandon Millman2018-10-312-69/+66
| | | | | | * | fix: remove assetData from default paramsfragosti2018-11-021-1/+0
| | | | | | * | feat: better handle errors in async fetchesfragosti2018-11-021-6/+10
| | | | | | * | chore: remove unneeded optional syntaxfragosti2018-11-021-2/+2
| | | | | | * | chore: add clarification to _generateSelectAssetClickHandlerfragosti2018-11-021-9/+10
| | | | | | * | fix: better name methodfragosti2018-11-021-4/+4
| | | | | | * | feat: add asserts for new API additionsfragosti2018-11-022-0/+6
| | | | | | * | feat: auto-close panel when a token is selectedfragosti2018-11-022-3/+11
| | | | | | * | feat: add states to the erc20 input for no assets or only 1 assetfragosti2018-11-027-24/+50
| | | | | | * | feat: implement basic erc20 token selectorfragosti2018-11-016-13/+81
| | | | | | * | feat: modify public API to allow for passing in available assets, or fetch as...fragosti2018-11-018-29/+100
| | | | | |/ /
| | | | | * | chore: add to changelogfragosti2018-11-011-0/+5
| | | | | * | feat: expose new `getAvailableAssetDatasAsync` APIfragosti2018-11-016-10/+54
| | | | | * | feat: add more asestMetaDatasfragosti2018-11-012-0/+98
| | | | |/ /
| | | | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-015-6/+61
| | | | |\ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #1198 from 0xProject/feature/instant/gas-estimateSteve Klebanoff2018-10-315-6/+61
| |\ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
* | | | | Move tslint disable lineSteve Klebanoff2018-10-301-1/+3
* | | | | Add comment and use constantSteve Klebanoff2018-10-301-2/+3
* | | | | Use polyfilled fetch from utilsSteve Klebanoff2018-10-301-2/+2
* | | | | async suffix and use polyfill fetch utilSteve Klebanoff2018-10-301-4/+4
* | | | | Introduce constants for eth gas station and coinbaseSteve Klebanoff2018-10-303-7/+9
* | | | | Comment for warming up cacheSteve Klebanoff2018-10-301-0/+2
* | | | | lintingSteve Klebanoff2018-10-302-1/+2
* | | | | Use constant that exists nowSteve Klebanoff2018-10-301-5/+4
* | | | | gas price estimatorSteve Klebanoff2018-10-303-2/+50
|/ / / /
| | * | chore: address PR feedbackfragosti2018-11-0113-43/+45
| | * | feat: implement sliding panelfragosti2018-10-319-79/+138
| | * | feat: allow for flexible position in position animation componentfragosti2018-10-313-13/+23
| | * | feat: refactor animation codefragosti2018-10-3110-74/+130
| | * | feat: add 'Select Token' UI to asset amount inputfragosti2018-10-304-17/+61
| | * | feat: add chevron icon and add it to asset amount inputfragosti2018-10-302-6/+27
| | * | feat: add basic panel component and other small improvementsfragosti2018-10-305-7/+40
| |/ / |/| |
* | | Merge pull request #1196 from 0xProject/feature/instant/default-gas-priceBrandon Millman2018-10-302-2/+5
|\ \ \ | |/ / |/| |
| * | feat(instant): add default gasPrice of 6 gwei to transactionsBrandon Millman2018-10-302-2/+5
|/ /
* | Merge pull request #1187 from 0xProject/feature/instant/fixed-orders-in-rende...Brandon Millman2018-10-3023-241/+263
|\ \
| * | fix(instant): fix spelling error and BigNumber gte operationBrandon Millman2018-10-302-4/+4
| * | Merge branch 'development' into feature/instant/fixed-orders-in-render-methodBrandon Millman2018-10-3011-69/+79
| |\ \ | |/ / |/| |
* | | Merge pull request #1193 from 0xProject/feature/not-enough-ethSteve Klebanoff2018-10-3012-32/+116
|\ \ \
| * | | Has Sufficient Funds/Balance -> Has Sufficient ETHSteve Klebanoff2018-10-304-6/+6
| * | | When transaction too low, treat as validation error. also modify callback: er...Steve Klebanoff2018-10-303-8/+13
| * | | onPendingValidation -> onValidationPendingSteve Klebanoff2018-10-293-8/+8
| * | | lintingSteve Klebanoff2018-10-273-11/+1
| * | | Simpler way of validaitng has enough ethSteve Klebanoff2018-10-276-56/+37
| * | | questionmark syntax instead of '| undefined'Steve Klebanoff2018-10-271-1/+1
| * | | Validate enough ETH when user clicks buySteve Klebanoff2018-10-273-1/+16
| * | | Merge branch 'development' into feature/not-enough-ethSteve Klebanoff2018-10-2756-212/+224
| |\ \ \
| * | | | acccount for no addressSteve Klebanoff2018-10-273-11/+19
| * | | | move funct into utilSteve Klebanoff2018-10-272-5/+32
| * | | | move importsSteve Klebanoff2018-10-271-4/+2
| * | | | yarn.lock changesSteve Klebanoff2018-10-271-2/+39
| * | | | Merge branch 'development' into feature/not-enough-ethSteve Klebanoff2018-10-2741-632/+1228
| |\ \ \ \
| * | | | | feat(instant): Show message if user doesn't have enough ETHSteve Klebanoff2018-10-274-2/+24
| * | | | | ethDecimals -> ETH_DECIMALSSteve Klebanoff2018-10-274-9/+11
| | | | * | Merge branch 'development' into feature/instant/fixed-orders-in-render-methodBrandon Millman2018-10-2966-223/+398
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #1194 from 0xProject/feature/instant/input-to-fixedSteve Klebanoff2018-10-274-2/+21
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | fix(instant): refactor some props to use isDisabled instead of disabledBrandon Millman2018-10-274-16/+16
| * | | | | feat(instant): Disable input when processingSteve Klebanoff2018-10-274-2/+21
| | |/ / / | |/| | |
* | | | | Merge pull request #1189 from 0xProject/feature/instant/txn-failureSteve Klebanoff2018-10-2711-144/+105
|\ \ \ \ \
| * | | | | linting importsSteve Klebanoff2018-10-271-2/+2
| * | | | | selected asset buy order state button -> selected asset buy order state buttonsSteve Klebanoff2018-10-272-6/+9
| * | | | | buy order state button -> buy order state buttonsSteve Klebanoff2018-10-272-3/+3
| * | | | | tsx -> tsSteve Klebanoff2018-10-271-0/+0