Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-03 | 1 | -5/+4 |
|\ | | | | | | | feature/instant/maker-asset-datas-interface | ||||
| * | Merge branch 'development' into ↵ | Steve Klebanoff | 2018-11-03 | 3 | -21/+46 |
| |\ | | | | | | | | | | fix/instant/decimal-fields-scaling-amount-input-bn | ||||
| * | | Getting rid of BigNumberInput in favor of BigNumber | Steve Klebanoff | 2018-11-02 | 1 | -5/+4 |
| | | | |||||
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-11-03 | 3 | -21/+46 |
|\ \ \ | | |/ | |/| | | | | feature/instant/maker-asset-datas-interface | ||||
| * | | Merge pull request #1208 from 0xProject/fix/instant/zero-NaN | Steve Klebanoff | 2018-11-03 | 1 | -1/+1 |
| |\ \ | | | | | | | | | [instant] Fix NaN issue with zero input | ||||
| | * | | fix(instant): dont get buy quote for zero value | Steve Klebanoff | 2018-11-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | feat(instant): implement affiliateFeeInfo prop | Brandon Millman | 2018-11-03 | 2 | -8/+24 |
| |/ / | |||||
| * | | Merge branch 'development' into feature/instant/simulated-progress-bar | Steve Klebanoff | 2018-11-02 | 3 | -6/+10 |
| |\| | |||||
| * | | removing unused imports | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| | | | |||||
| * | | Move file to new file to reflect the new export name | Steve Klebanoff | 2018-11-02 | 1 | -2/+0 |
| | | | |||||
| * | | Rename export | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| | | | |||||
| * | | Move BuyOrderProgress to its own component | Steve Klebanoff | 2018-11-02 | 1 | -38/+4 |
| | | | |||||
| * | | ended -> hasEnded | Steve Klebanoff | 2018-11-02 | 1 | -3/+3 |
| | | | |||||
| * | | Rename to SelectedAssetProgress | Steve Klebanoff | 2018-11-01 | 1 | -2/+2 |
| | | | |||||
| * | | Removing old simulated progress bar, and adding documentation to ↵ | Steve Klebanoff | 2018-11-01 | 1 | -2/+0 |
| | | | | | | | | | | | | TimedProgressBar | ||||
| * | | WIP of new timedprogressbar using CSS animations | Steve Klebanoff | 2018-11-01 | 1 | -5/+13 |
| | | | |||||
| * | | Explicit actions for setting different order states | Steve Klebanoff | 2018-11-01 | 2 | -40/+8 |
| | | | | | | | | | | | | This allows us to dispatch updates with less syntax, and allows us to not have to send in progress info when setting failure and success | ||||
| * | | Get rid of old demo | Steve Klebanoff | 2018-10-31 | 2 | -25/+0 |
| | | | |||||
| * | | Use simulated progress bar for txn | Steve Klebanoff | 2018-10-31 | 2 | -24/+72 |
| | | | |||||
| * | | Remove old files | Steve Klebanoff | 2018-10-31 | 1 | -37/+0 |
| | | | |||||
| * | | Simulated Progress component working | Steve Klebanoff | 2018-10-31 | 1 | -0/+48 |
| | | | |||||
| * | | Placeholder for estimated time | Steve Klebanoff | 2018-10-31 | 1 | -1/+1 |
| | | | |||||
| * | | Dispatching progress | Steve Klebanoff | 2018-10-31 | 1 | -0/+37 |
| | | | |||||
| * | | store estimated time in Ms on state | Steve Klebanoff | 2018-10-30 | 1 | -3/+3 |
| | | | |||||
* | | | feat: reset input after token selection | fragosti | 2018-11-03 | 1 | -1/+2 |
| | | | |||||
* | | | feat: auto-close panel when a token is selected | fragosti | 2018-11-02 | 1 | -2/+10 |
| | | | |||||
* | | | feat: add states to the erc20 input for no assets or only 1 asset | fragosti | 2018-11-02 | 2 | -11/+11 |
| | | | |||||
* | | | feat: implement basic erc20 token selector | fragosti | 2018-11-01 | 1 | -0/+36 |
| |/ |/| | |||||
* | | chore: address PR feedback | fragosti | 2018-11-01 | 2 | -2/+2 |
| | | |||||
* | | feat: implement sliding panel | fragosti | 2018-10-31 | 2 | -7/+9 |
| | | |||||
* | | feat: refactor animation code | fragosti | 2018-10-31 | 2 | -4/+6 |
|/ | |||||
* | Merge branch 'development' into feature/instant/fixed-orders-in-render-method | Brandon Millman | 2018-10-30 | 2 | -9/+17 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Has Sufficient Funds/Balance -> Has Sufficient ETH When transaction too low, treat as validation error. also modify callback: errorMessage could be AssetBuyError as well onPendingValidation -> onValidationPending linting Simpler way of validaitng has enough eth questionmark syntax instead of '| undefined' Validate enough ETH when user clicks buy acccount for no address move funct into util move imports yarn.lock changes feat(instant): Show message if user doesn't have enough ETH ethDecimals -> ETH_DECIMALS | ||||
| * | Merge pull request #1193 from 0xProject/feature/not-enough-eth | Steve Klebanoff | 2018-10-30 | 2 | -8/+13 |
| |\ | | | | | | | [instant] Not enough ETH error message | ||||
| | * | When transaction too low, treat as validation error. also modify callback: ↵ | Steve Klebanoff | 2018-10-30 | 1 | -2/+2 |
| | | | | | | | | | | | | errorMessage could be AssetBuyError as well | ||||
| | * | onPendingValidation -> onValidationPending | Steve Klebanoff | 2018-10-29 | 1 | -2/+2 |
| | | | |||||
| | * | linting | Steve Klebanoff | 2018-10-27 | 2 | -6/+1 |
| | | | |||||
| | * | Simpler way of validaitng has enough eth | Steve Klebanoff | 2018-10-27 | 2 | -13/+11 |
| | | | |||||
| | * | Validate enough ETH when user clicks buy | Steve Klebanoff | 2018-10-27 | 1 | -0/+6 |
| | | | |||||
| | * | Merge branch 'development' into feature/not-enough-eth | Steve Klebanoff | 2018-10-27 | 4 | -93/+35 |
| | |\ | |||||
| | * | | acccount for no address | Steve Klebanoff | 2018-10-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | move funct into util | Steve Klebanoff | 2018-10-27 | 1 | -5/+2 |
| | | | | |||||
| | * | | move imports | Steve Klebanoff | 2018-10-27 | 1 | -4/+2 |
| | | | | |||||
| | * | | Merge branch 'development' into feature/not-enough-eth | Steve Klebanoff | 2018-10-27 | 1 | -15/+15 |
| | |\ \ | |||||
| | * | | | feat(instant): Show message if user doesn't have enough ETH | Steve Klebanoff | 2018-10-27 | 1 | -1/+13 |
| | | | | | |||||
* | | | | | Merge branch 'development' into feature/instant/fixed-orders-in-render-method | Brandon Millman | 2018-10-29 | 5 | -93/+45 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: fix(instant): refactor some props to use isDisabled instead of disabled linting imports feat(instant): Disable input when processing Add back debounce Make doesBuyQuoteMatchState in reducer less strict fix(instant): prevent outdated quote requests from overriding the correct quote selected asset buy order state button -> selected asset buy order state buttons buy order state button -> buy order state buttons feat(order_utils.py): ERC721 asset data codec (#1186) Add note about tslint false positive tsx -> ts Get BuyOrderState one big connected component, and let user view failure Show View Transaction button on failure, and allow setting of width for Try Again button and View Txn button Added string to constants chore: Update contract-wrappers CHANGELOG.json fix(contract-wrappers): Fix tslint errors that were lingering due to misconfiguration chore: Add --format stylish to tslint | ||||
| * | | | | Merge pull request #1194 from 0xProject/feature/instant/input-to-fixed | Steve Klebanoff | 2018-10-27 | 1 | -0/+10 |
| |\ \ \ \ | | |_|_|/ | |/| | | | [instant] Disable input when processing | ||||
| | * | | | fix(instant): refactor some props to use isDisabled instead of disabled | Brandon Millman | 2018-10-27 | 1 | -6/+6 |
| | | | | | |||||
| | * | | | feat(instant): Disable input when processing | Steve Klebanoff | 2018-10-27 | 1 | -0/+10 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1189 from 0xProject/feature/instant/txn-failure | Steve Klebanoff | 2018-10-27 | 4 | -93/+35 |
| |\ \ \ | | |/ / | |/| | | [instant] View txn on failure | ||||
| | * | | selected asset buy order state button -> selected asset buy order state buttons | Steve Klebanoff | 2018-10-27 | 1 | -4/+7 |
| | | | | |||||
| | * | | buy order state button -> buy order state buttons | Steve Klebanoff | 2018-10-27 | 1 | -2/+2 |
| | | | | |||||
| | * | | tsx -> ts | Steve Klebanoff | 2018-10-27 | 1 | -0/+0 |
| | | | | |||||
| | * | | Get BuyOrderState one big connected component, and let user view failure | Steve Klebanoff | 2018-10-26 | 4 | -127/+59 |
| | | | | |||||
| | * | | Show View Transaction button on failure, and allow setting of width for Try ↵ | Steve Klebanoff | 2018-10-26 | 2 | -5/+12 |
| | |/ | | | | | | | | | | Again button and View Txn button | ||||
* | / | Refactor error handling such that errorMessage lives on the top level state | Brandon Millman | 2018-10-27 | 3 | -15/+29 |
|/ / | |||||
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-10-26 | 4 | -15/+33 |
|\| | | | | | | | feature/instant/input-fees-rounding | ||||
| * | Making failure txHash required | Steve Klebanoff | 2018-10-26 | 1 | -2/+3 |
| | | |||||
| * | txnHash -> txHash | Steve Klebanoff | 2018-10-26 | 2 | -7/+7 |
| | | |||||
| * | new try/catch pattern and new prop names per code review feedback | Steve Klebanoff | 2018-10-26 | 1 | -4/+4 |
| | | |||||
| * | take out unused imports | Steve Klebanoff | 2018-10-26 | 2 | -2/+2 |
| | | |||||
| * | feat(instant): Be able to view transaction when transaction is in progress | Steve Klebanoff | 2018-10-25 | 1 | -1/+5 |
| | | |||||
| * | Associate txnhash with processing state | Steve Klebanoff | 2018-10-25 | 1 | -3/+11 |
| | | |||||
| * | Introduce new OrderProcessState | Steve Klebanoff | 2018-10-25 | 4 | -10/+10 |
| | | |||||
| * | Merge pull request #1180 from 0xProject/feature/instant/metamask-denial | Steve Klebanoff | 2018-10-25 | 1 | -0/+5 |
| |\ | | | | | | | [instant]Message when signature denied | ||||
| | * | Message when signature denied | Steve Klebanoff | 2018-10-25 | 1 | -0/+5 |
| | | | |||||
* | | | chore: dont override toString of BigNumber and other PR feedback | fragosti | 2018-10-26 | 1 | -12/+13 |
| | | | |||||
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-10-25 | 5 | -9/+44 |
|\| | | | | | | | | | | | feature/instant/input-fees-rounding | ||||
| * | | Get rid of react-shared as a dependency, write own etherscanUtil | Steve Klebanoff | 2018-10-25 | 1 | -3/+2 |
| |/ | |||||
| * | Merge branch 'development' into feature/instant/processing-state | Steve Klebanoff | 2018-10-24 | 3 | -41/+22 |
| |\ | |||||
| * | | feat(instant): Procesing and Success states | Steve Klebanoff | 2018-10-24 | 5 | -14/+51 |
| | | | |||||
| * | | Placing order button | Steve Klebanoff | 2018-10-23 | 1 | -2/+4 |
| | | | |||||
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-10-25 | 7 | -29/+63 |
|\ \ \ | | |/ | |/| | | | | feature/instant/input-fees-rounding | ||||
| * | | rename container | Steve Klebanoff | 2018-10-24 | 1 | -3/+3 |
| | | | |||||
| * | | null -> undefined | Steve Klebanoff | 2018-10-24 | 1 | -2/+2 |
| | | | |||||
| * | | move buy order state to its own component | Steve Klebanoff | 2018-10-24 | 1 | -18/+2 |
| |/ | |||||
| * | feat(instant): Add failure state and icon | Steve Klebanoff | 2018-10-20 | 1 | -0/+5 |
| | | |||||
| * | linting | Steve Klebanoff | 2018-10-20 | 2 | -3/+0 |
| | | |||||
| * | Merge branch 'feature/instant/beta-render-et-al' into ↵ | Steve Klebanoff | 2018-10-20 | 6 | -13/+48 |
| |\ | | | | | | | | | | feature/instant/failure-state | ||||
| | * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-10-20 | 5 | -12/+15 |
| | |\ | | | | | | | | | | | | | feature/instant/beta-render-et-al | ||||
| | | * | feat(instant): Indicate that order details section is loading by having ↵ | Steve Klebanoff | 2018-10-19 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | pulsing placeholder | ||||
| | | * | Moved LatestErrorDisplay to types file and gave generic name | Steve Klebanoff | 2018-10-19 | 1 | -2/+3 |
| | | | | |||||
| | | * | Rename update function to set function since it doesnt take a parameter | Steve Klebanoff | 2018-10-19 | 1 | -3/+3 |
| | | | | |||||
| | | * | fix camel casing of updateBuyOrderState | Steve Klebanoff | 2018-10-19 | 2 | -4/+4 |
| | | | | |||||
| | | * | quoteState -> quoteRequestState | Steve Klebanoff | 2018-10-19 | 2 | -5/+5 |
| | | | | |||||
| * | | | Selected Asset button | Steve Klebanoff | 2018-10-20 | 3 | -8/+62 |
| | | | | |||||
| * | | | WIP: clear buy quote working | Steve Klebanoff | 2018-10-20 | 1 | -0/+2 |
| | | | | |||||
| * | | | wip: retry button | Steve Klebanoff | 2018-10-20 | 1 | -21/+8 |
| | | | | |||||
| * | | | Show order failed messaging when order fails | Steve Klebanoff | 2018-10-19 | 1 | -0/+2 |
| | | | | |||||
* | | | | feat: have basic scaling amount input working | fragosti | 2018-10-23 | 1 | -1/+1 |
| |/ / |/| | | |||||
* | | | feat: use color from metaData instead of default primaryColor | fragosti | 2018-10-19 | 1 | -0/+32 |
|/ / | |||||
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-10-19 | 5 | -28/+78 |
|\| | | | | | | | feature/instant/beta-render-et-al | ||||
| * | chore: change package org from 0xproject to 0x | Jacob Evans | 2018-10-18 | 4 | -7/+7 |
| | | |||||
| * | selectedAssetBuyState -> buyOrderState | Steve Klebanoff | 2018-10-18 | 2 | -5/+5 |
| | | |||||
| * | add concept of quoteState | Steve Klebanoff | 2018-10-18 | 2 | -9/+18 |
| | | |||||
| * | creating big error util file per francescos comment in PR | Steve Klebanoff | 2018-10-18 | 2 | -5/+5 |
| | | |||||
| * | latestErrorDismissed -> latestErrorDisplay enum | Steve Klebanoff | 2018-10-18 | 1 | -6/+5 |
| | | |||||
| * | feat(instant): Handle AssetBuyer errors | Steve Klebanoff | 2018-10-18 | 2 | -1/+48 |
| | | |||||
* | | feat: MVP of passing in sraApiUrl, assetData and other settings from render ↵ | fragosti | 2018-10-19 | 2 | -16/+58 |
|/ | | | | method | ||||
* | Add ts-optchain and use it instead of lodash get | fragosti | 2018-10-16 | 2 | -2/+4 |
| | |||||
* | feat: model asset meta data and add dynamic assetData state | fragosti | 2018-10-13 | 1 | -11/+20 |
| | |||||
* | feat: make redux actions type-sage | fragosti | 2018-10-13 | 2 | -15/+13 |
| | |||||
* | feat: populate order details with information from worst buy quote | fragosti | 2018-10-12 | 2 | -1/+27 |
| | |||||
* | feat: debounce the fetching of new quotes | fragosti | 2018-10-12 | 1 | -10/+14 |
| | |||||
* | feat: Move over features from zrx-buyer | fragosti | 2018-10-11 | 4 | -36/+142 |
| | |||||
* | Fix empty input bug | fragosti | 2018-10-10 | 1 | -1/+1 |
| | |||||
* | Apply linter | fragosti | 2018-10-05 | 1 | -5/+5 |
| | |||||
* | Create SelectedAssetInputAmount | fragosti | 2018-10-05 | 1 | -0/+36 |