| Commit message (Expand) | Author | Age | Files | Lines |
* | Emulate named parameters with interface | Steve Klebanoff | 2018-11-10 | 1 | -3/+6 |
* | Use existing functions instead of writing our own | Steve Klebanoff | 2018-11-10 | 1 | -3/+3 |
* | Merge branch 'development' into feature/instant/buy-quote-heartbeat | Steve Klebanoff | 2018-11-10 | 26 | -255/+611 |
|\ |
|
| * | Merge pull request #1232 from 0xProject/feature/instant/account-state-change | Brandon Millman | 2018-11-09 | 3 | -16/+22 |
| |\ |
|
| | * | Merge branch 'development' into feature/instant/account-state-change | Brandon Millman | 2018-11-09 | 21 | -215/+336 |
| | |\ |
|
| * | | | fix: wrong prop names used | fragosti | 2018-11-09 | 1 | -2/+2 |
| * | | | chore: PR feedback | fragosti | 2018-11-09 | 1 | -9/+9 |
| * | | | fix: broken features because of merge | fragosti | 2018-11-09 | 3 | -1/+5 |
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-09 | 7 | -35/+95 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | [instant] Viewport specific errors (#1228) | Steve Klebanoff | 2018-11-09 | 6 | -33/+93 |
| | * | | Merge pull request #1231 from 0xProject/fix/instant/default-amount-quote | Brandon Millman | 2018-11-09 | 1 | -2/+2 |
| | |\ \ |
|
| | | * | | chore(instant): fix linter | Brandon Millman | 2018-11-09 | 1 | -0/+1 |
| | | * | | fix(instant): update buy quote at start up in the case of default amount | Brandon Millman | 2018-11-08 | 1 | -2/+1 |
| * | | | | fix: remove default props, fix lint problems | fragosti | 2018-11-09 | 3 | -8/+7 |
| * | | | | chore: convert payment method to stateless component | fragosti | 2018-11-09 | 1 | -29/+25 |
| * | | | | feat: add boxShadow on dropdown hover | fragosti | 2018-11-09 | 2 | -0/+3 |
| * | | | | fix: various style issues | fragosti | 2018-11-09 | 3 | -18/+21 |
| * | | | | fix: remove all:initial rule from all div based ui compoennts | fragosti | 2018-11-09 | 3 | -3/+0 |
| * | | | | fix: token selector scrolling container height | fragosti | 2018-11-09 | 2 | -3/+5 |
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-09 | 17 | -232/+277 |
| |\| | | |
|
| | * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-09 | 11 | -77/+80 |
| | |\| | |
|
| | * | | | fix: apply css reset to overlay as well | fragosti | 2018-11-08 | 3 | -34/+38 |
| | * | | | chore: linter | fragosti | 2018-11-07 | 6 | -10/+6 |
| | * | | | fix: progress bar | fragosti | 2018-11-07 | 1 | -6/+8 |
| | * | | | fix: use fontSize prop in button | fragosti | 2018-11-07 | 1 | -2/+1 |
| | * | | | feat: make instant resistant to external styles | fragosti | 2018-11-07 | 14 | -169/+227 |
| * | | | | chore: cleanup | fragosti | 2018-11-08 | 1 | -2/+3 |
| * | | | | fix: restore button to previous state | fragosti | 2018-11-08 | 1 | -38/+24 |
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-08 | 6 | -16/+29 |
| |\ \ \ \ |
|
| * | | | | | feat: implement copy-to-clipboard | fragosti | 2018-11-08 | 1 | -0/+16 |
| * | | | | | feat: add MetaMask sign, refactor Circle | fragosti | 2018-11-08 | 3 | -18/+33 |
| * | | | | | feat: create PaymentMethodDropdown | fragosti | 2018-11-08 | 8 | -43/+83 |
| * | | | | | chore: remove unused props | fragosti | 2018-11-08 | 1 | -2/+2 |
| * | | | | | fix: height of token selector overflow div | fragosti | 2018-11-08 | 2 | -7/+7 |
| * | | | | | feat: refactor out overlay component and use it to implement click-outside | fragosti | 2018-11-08 | 3 | -64/+83 |
| * | | | | | feat: implement basic dropdown component | fragosti | 2018-11-08 | 5 | -7/+167 |
| | |/ / /
| |/| | | |
|
* | | | | | Remove old TODO | Steve Klebanoff | 2018-11-09 | 1 | -1/+0 |
* | | | | | move files around and rename | Steve Klebanoff | 2018-11-09 | 1 | -1/+2 |
* | | | | | wip: BuyQuote heartbeat | Steve Klebanoff | 2018-11-09 | 1 | -2/+11 |
* | | | | | Make heartbeat more generic | Steve Klebanoff | 2018-11-09 | 1 | -4/+5 |
* | | | | | feat(instant): Heartbeat for updating account info | Steve Klebanoff | 2018-11-09 | 1 | -1/+12 |
| |_|_|/
|/| | | |
|
* | | | | feat(instant): fetch balance at startup | Brandon Millman | 2018-11-08 | 2 | -6/+13 |
* | | | | feat(instant): fetch account address at startup and drive account state changes | Brandon Millman | 2018-11-08 | 3 | -15/+12 |
| |_|/
|/| | |
|
* | | | Merge pull request #1221 from 0xProject/feature/instant/fallback-provider | Brandon Millman | 2018-11-08 | 5 | -61/+51 |
|\ \ \
| |_|/
|/| | |
|
| * | | feat(instant): add Account to the ProviderState | Brandon Millman | 2018-11-08 | 1 | -25/+7 |
| * | | feat(instant): fallback to an empty wallet provider when none is injected | Brandon Millman | 2018-11-08 | 3 | -44/+52 |
| * | | chore(instant): update OrderState enum to follow capitalization conventions | Brandon Millman | 2018-11-07 | 3 | -15/+15 |
| |/ |
|
* | | Small code review tweaks | Steve Klebanoff | 2018-11-08 | 2 | -2/+2 |
* | | Take out unneeded conditionals | Steve Klebanoff | 2018-11-07 | 1 | -2/+2 |
* | | remove unused dependecny | Steve Klebanoff | 2018-11-07 | 1 | -1/+0 |
* | | remove unused import | Steve Klebanoff | 2018-11-07 | 1 | -2/+0 |
* | | remove old comment | Steve Klebanoff | 2018-11-07 | 1 | -1/+0 |
* | | Merge branch 'development' into feature/instant/mobile-full-bleed | Steve Klebanoff | 2018-11-07 | 17 | -25/+49 |
|\| |
|
| * | add extra space | Steve Klebanoff | 2018-11-06 | 1 | -0/+1 |
| * | chore(instant): import UI components directly | Steve Klebanoff | 2018-11-06 | 17 | -25/+49 |
* | | Hide X when small | Steve Klebanoff | 2018-11-07 | 2 | -3/+3 |
* | | Fix mobile view of selecting assets | Steve Klebanoff | 2018-11-07 | 1 | -1/+1 |
* | | Get rid of unused properties | Steve Klebanoff | 2018-11-07 | 2 | -4/+0 |
* | | new MediaChoice approach for setting conditional css properties | Steve Klebanoff | 2018-11-07 | 5 | -59/+18 |
* | | better function definiton | Steve Klebanoff | 2018-11-07 | 2 | -3/+2 |
* | | proof of concept working | Steve Klebanoff | 2018-11-07 | 2 | -6/+2 |
* | | wip: mediachoice experiment | Steve Klebanoff | 2018-11-07 | 2 | -0/+24 |
* | | feat(instant): when on mobile, show mobile specific styling that takes up who... | Steve Klebanoff | 2018-11-07 | 4 | -4/+39 |
* | | Putting back in old heights as not necessary for full bleed | Steve Klebanoff | 2018-11-07 | 1 | -1/+1 |
* | | wip: height 100% | Steve Klebanoff | 2018-11-06 | 2 | -2/+4 |
* | | wip: full display of mobile hard coded | Steve Klebanoff | 2018-11-06 | 5 | -5/+12 |
|/ |
|
* | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-03 | 4 | -38/+75 |
|\ |
|
| * | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp... | Steve Klebanoff | 2018-11-03 | 2 | -13/+22 |
| |\ |
|
| | * | feat(instant): pass in provider through props, fallback to injected provider | Brandon Millman | 2018-11-03 | 2 | -13/+22 |
| * | | Use generic Maybe | Steve Klebanoff | 2018-11-03 | 1 | -3/+4 |
| * | | linting | Steve Klebanoff | 2018-11-03 | 1 | -1/+1 |
| * | | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp... | Steve Klebanoff | 2018-11-03 | 7 | -13/+220 |
| |\| |
|
| * | | onChange -> onAmountChange | Steve Klebanoff | 2018-11-03 | 2 | -5/+5 |
| * | | Move MaybeBigNumber functions into helper | Steve Klebanoff | 2018-11-03 | 1 | -17/+4 |
| * | | Have ScalingAmountInput trigger onChange with MaybeBigNumber and keep string ... | Steve Klebanoff | 2018-11-02 | 1 | -12/+52 |
| * | | Getting rid of BigNumberInput in favor of BigNumber | Steve Klebanoff | 2018-11-02 | 3 | -11/+11 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-03 | 7 | -12/+219 |
|\ \ \
| | |/
| |/| |
|
| * | | feat(instant): implement affiliateFeeInfo prop | Brandon Millman | 2018-11-03 | 3 | -6/+17 |
| * | | Merge branch 'development' into feature/instant/simulated-progress-bar | Steve Klebanoff | 2018-11-03 | 6 | -128/+234 |
| |\| |
|
| * | | Merge branch 'development' into feature/instant/simulated-progress-bar | Steve Klebanoff | 2018-11-02 | 15 | -136/+353 |
| |\ \ |
|
| * | | | linting: moving order of imports | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| * | | | Better styling of estimated time | Steve Klebanoff | 2018-11-02 | 1 | -2/+15 |
| * | | | Move file to new file to reflect the new export name | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| * | | | Rename export | Steve Klebanoff | 2018-11-02 | 1 | -2/+2 |
| * | | | Move BuyOrderProgress to its own component | Steve Klebanoff | 2018-11-02 | 1 | -0/+35 |
| * | | | Remove old TODO | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| * | | | Use new constants | Steve Klebanoff | 2018-11-02 | 1 | -2/+3 |
| * | | | Use primary color instead of black | Steve Klebanoff | 2018-11-02 | 1 | -1/+1 |
| * | | | maxWidth -> toWidth, and make from and to width consistent units | Steve Klebanoff | 2018-11-02 | 1 | -10/+10 |
| * | | | Getting rid of TimedProgress state | Steve Klebanoff | 2018-11-02 | 1 | -47/+23 |
| * | | | Minor cleanup | Steve Klebanoff | 2018-11-02 | 1 | -2/+2 |
| * | | | ended -> hasEnded | Steve Klebanoff | 2018-11-02 | 2 | -6/+6 |
| * | | | Rename to SelectedAssetProgress | Steve Klebanoff | 2018-11-01 | 1 | -2/+2 |
| * | | | Removing old simulated progress bar, and adding documentation to TimedProgres... | Steve Klebanoff | 2018-11-01 | 2 | -198/+5 |
| * | | | WIP of new timedprogressbar using CSS animations | Steve Klebanoff | 2018-11-01 | 2 | -0/+165 |
| * | | | Explicit actions for setting different order states | Steve Klebanoff | 2018-11-01 | 2 | -7/+7 |
| * | | | Tick less often, and let CSS style the transition | Steve Klebanoff | 2018-10-31 | 1 | -3/+23 |
| * | | | Nice formatting of displayed time | Steve Klebanoff | 2018-10-31 | 1 | -6/+3 |
| * | | | Takeout unneeded div | Steve Klebanoff | 2018-10-31 | 1 | -12/+10 |
| * | | | Get rid of old demo | Steve Klebanoff | 2018-10-31 | 1 | -11/+0 |
| * | | | Use simulated progress bar for txn | Steve Klebanoff | 2018-10-31 | 2 | -19/+34 |
| * | | | Showing time | Steve Klebanoff | 2018-10-31 | 1 | -1/+9 |
| * | | | Show estimated time | Steve Klebanoff | 2018-10-31 | 1 | -0/+9 |
| * | | | Remove old files | Steve Klebanoff | 2018-10-31 | 2 | -37/+0 |
| * | | | Simulated Progress component working | Steve Klebanoff | 2018-10-31 | 2 | -5/+33 |
| * | | | WIP: beginning of simulated progress bar component | Steve Klebanoff | 2018-10-31 | 1 | -0/+136 |
| * | | | Placeholder for estimated time | Steve Klebanoff | 2018-10-31 | 1 | -1/+14 |
| * | | | Making prettier | Steve Klebanoff | 2018-10-31 | 1 | -4/+8 |
| * | | | Dispatching progress | Steve Klebanoff | 2018-10-31 | 2 | -1/+19 |
| * | | | store estimated time in Ms on state | Steve Klebanoff | 2018-10-30 | 1 | -2/+2 |
| * | | | return estimated state | Steve Klebanoff | 2018-10-30 | 2 | -3/+3 |
* | | | | chore: address PR comments | fragosti | 2018-11-03 | 3 | -17/+21 |
* | | | | chore: prettier and linter | fragosti | 2018-11-02 | 2 | -2/+0 |
* | | | | feat: add basic token search functionality | fragosti | 2018-11-02 | 3 | -11/+75 |
* | | | | feat: improve position of close X in token selector | fragosti | 2018-11-02 | 1 | -1/+3 |
* | | | | feat: implement search bar UI | fragosti | 2018-11-02 | 4 | -4/+13 |
* | | | | feat: add name param to all ERC20AssetMetaData | fragosti | 2018-11-02 | 1 | -0/+4 |
* | | | | feat: implement basic token selection UI | fragosti | 2018-11-02 | 6 | -9/+69 |
* | | | | feat: implement panel title and close | fragosti | 2018-11-02 | 2 | -5/+16 |
* | | | | feat: use withTheme to use ColorOption to color Icon | fragosti | 2018-11-02 | 4 | -14/+12 |
* | | | | feat: use new Icon component functionality | fragosti | 2018-11-02 | 1 | -2/+2 |
* | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-02 | 6 | -144/+251 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Remove alternate hover styling from button and move into icon component | Brandon Millman | 2018-11-02 | 4 | -52/+54 |
| * | | | feat(instant): add interactive overlay presentation to umd bundle | Brandon Millman | 2018-11-02 | 7 | -111/+215 |
| | |/
| |/| |
|
* | | | chore: remove unneeded optional syntax | fragosti | 2018-11-02 | 1 | -2/+2 |
* | | | chore: add clarification to _generateSelectAssetClickHandler | fragosti | 2018-11-02 | 1 | -9/+10 |
* | | | fix: better name method | fragosti | 2018-11-02 | 1 | -4/+4 |
* | | | feat: auto-close panel when a token is selected | fragosti | 2018-11-02 | 1 | -1/+1 |
* | | | feat: add states to the erc20 input for no assets or only 1 asset | fragosti | 2018-11-02 | 3 | -8/+34 |
* | | | feat: implement basic erc20 token selector | fragosti | 2018-11-01 | 2 | -1/+36 |
* | | | feat: modify public API to allow for passing in available assets, or fetch as... | fragosti | 2018-11-01 | 1 | -8/+20 |
|/ / |
|
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-11-01 | 2 | -3/+11 |
|\| |
|
| * | Move tslint disable line | Steve Klebanoff | 2018-10-30 | 1 | -1/+3 |
| * | Comment for warming up cache | Steve Klebanoff | 2018-10-30 | 1 | -0/+2 |
| * | linting | Steve Klebanoff | 2018-10-30 | 2 | -1/+2 |
| * | gas price estimator | Steve Klebanoff | 2018-10-30 | 2 | -2/+5 |
* | | chore: address PR feedback | fragosti | 2018-11-01 | 11 | -41/+43 |
* | | feat: implement sliding panel | fragosti | 2018-10-31 | 7 | -72/+129 |
* | | feat: allow for flexible position in position animation component | fragosti | 2018-10-31 | 3 | -13/+23 |
* | | feat: refactor animation code | fragosti | 2018-10-31 | 8 | -70/+124 |
* | | feat: add 'Select Token' UI to asset amount input | fragosti | 2018-10-30 | 4 | -17/+61 |
* | | feat: add chevron icon and add it to asset amount input | fragosti | 2018-10-30 | 2 | -6/+27 |
* | | feat: add basic panel component and other small improvements | fragosti | 2018-10-30 | 4 | -7/+35 |
|/ |
|
* | feat(instant): add default gasPrice of 6 gwei to transactions | Brandon Millman | 2018-10-30 | 1 | -2/+3 |
* | fix(instant): fix spelling error and BigNumber gte operation | Brandon Millman | 2018-10-30 | 1 | -2/+2 |
* | Merge branch 'development' into feature/instant/fixed-orders-in-render-method | Brandon Millman | 2018-10-30 | 2 | -11/+30 |
|\ |
|
| * | Merge pull request #1193 from 0xProject/feature/not-enough-eth | Steve Klebanoff | 2018-10-30 | 2 | -11/+30 |
| |\ |
|
| | * | Has Sufficient Funds/Balance -> Has Sufficient ETH | Steve Klebanoff | 2018-10-30 | 1 | -3/+3 |
| | * | When transaction too low, treat as validation error. also modify callback: er... | Steve Klebanoff | 2018-10-30 | 2 | -6/+11 |
| | * | onPendingValidation -> onValidationPending | Steve Klebanoff | 2018-10-29 | 2 | -6/+6 |
| | * | Simpler way of validaitng has enough eth | Steve Klebanoff | 2018-10-27 | 2 | -11/+14 |
| | * | questionmark syntax instead of '| undefined' | Steve Klebanoff | 2018-10-27 | 1 | -1/+1 |
| | * | Validate enough ETH when user clicks buy | Steve Klebanoff | 2018-10-27 | 2 | -1/+10 |
| | * | Merge branch 'development' into feature/not-enough-eth | Steve Klebanoff | 2018-10-27 | 7 | -51/+70 |
| | |\ |
|
| | * \ | Merge branch 'development' into feature/not-enough-eth | Steve Klebanoff | 2018-10-27 | 11 | -119/+339 |
| | |\ \ |
|
| | * | | | ethDecimals -> ETH_DECIMALS | Steve Klebanoff | 2018-10-27 | 1 | -1/+3 |
* | | | | | Merge branch 'development' into feature/instant/fixed-orders-in-render-method | Brandon Millman | 2018-10-29 | 10 | -53/+81 |
|\| | | | |
|
| * | | | | Merge pull request #1194 from 0xProject/feature/instant/input-to-fixed | Steve Klebanoff | 2018-10-27 | 3 | -2/+11 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | fix(instant): refactor some props to use isDisabled instead of disabled | Brandon Millman | 2018-10-27 | 3 | -10/+10 |
| | * | | | feat(instant): Disable input when processing | Steve Klebanoff | 2018-10-27 | 3 | -2/+11 |
| | | |/
| | |/| |
|
| * | | | Merge pull request #1189 from 0xProject/feature/instant/txn-failure | Steve Klebanoff | 2018-10-27 | 7 | -51/+70 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | linting imports | Steve Klebanoff | 2018-10-27 | 1 | -2/+2 |
| | * | | selected asset buy order state button -> selected asset buy order state buttons | Steve Klebanoff | 2018-10-27 | 1 | -2/+2 |
| | * | | buy order state button -> buy order state buttons | Steve Klebanoff | 2018-10-27 | 1 | -1/+1 |
| | * | | Get BuyOrderState one big connected component, and let user view failure | Steve Klebanoff | 2018-10-26 | 5 | -30/+37 |
| | * | | Show View Transaction button on failure, and allow setting of width for Try A... | Steve Klebanoff | 2018-10-26 | 4 | -8/+20 |
| | |/ |
|
* | | | Refactor error handling such that errorMessage lives on the top level state | Brandon Millman | 2018-10-27 | 2 | -4/+4 |
* | | | fix: init BigNumberInput not BigNumber when initializing state | fragosti | 2018-10-27 | 1 | -2/+2 |
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-27 | 11 | -119/+339 |
|\| | |
|
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-26 | 3 | -22/+49 |
| |\| |
|
| * | | chore: dont override toString of BigNumber and other PR feedback | fragosti | 2018-10-26 | 4 | -18/+23 |
| * | | chore: update comments | fragosti | 2018-10-25 | 1 | -2/+2 |
| * | | chore: use alternate syntax for styled | fragosti | 2018-10-25 | 4 | -4/+16 |
| * | | fix: weird linting error that depends on types | fragosti | 2018-10-25 | 1 | -1/+1 |
| * | | feat: change to increasing input width by a constant amount per additional ch... | fragosti | 2018-10-25 | 1 | -5/+4 |
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-25 | 9 | -25/+117 |
| |\ \ |
|
| * | | | chore: run linter | fragosti | 2018-10-25 | 1 | -1/+1 |
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-25 | 12 | -115/+327 |
| |\ \ \ |
|
| * | | | | fix: address PR feedback | fragosti | 2018-10-25 | 1 | -4/+4 |
| * | | | | feat: cover more token symbol edge cases | fragosti | 2018-10-24 | 4 | -7/+22 |
| * | | | | feat: add title attribute to label | fragosti | 2018-10-24 | 1 | -2/+2 |
| * | | | | feat: support half-written decimal numbers in BigNumberInput | fragosti | 2018-10-24 | 1 | -1/+2 |
| * | | | | fix: remove unused callback info | fragosti | 2018-10-24 | 1 | -3/+3 |
| * | | | | polish: improve scaling significantly | fragosti | 2018-10-24 | 3 | -28/+50 |
| * | | | | fix: remove the concept of initial with from scaling input and remove phase | fragosti | 2018-10-24 | 2 | -27/+21 |
| * | | | | fix: dont allow heading to change height when input size changes | fragosti | 2018-10-24 | 3 | -3/+7 |
| * | | | | chore: run linter | fragosti | 2018-10-23 | 4 | -11/+2 |
| * | | | | chore: final adjustments | fragosti | 2018-10-23 | 2 | -3/+3 |
| * | | | | chore: refactor ScalingInput | fragosti | 2018-10-23 | 1 | -9/+18 |
| * | | | | feature: reduce font size by a percentage instead of a constant | fragosti | 2018-10-23 | 3 | -39/+57 |
| * | | | | feat: have basic scaling amount input working | fragosti | 2018-10-23 | 4 | -51/+130 |
| * | | | | feat: add scaling input component | fragosti | 2018-10-20 | 2 | -4/+88 |
| * | | | | fix: animation component typing | fragosti | 2018-10-20 | 1 | -4/+1 |
| * | | | | feat: user better syntax for defining ui components | fragosti | 2018-10-20 | 4 | -18/+4 |
| * | | | | feat: upgrade to styled-components v4 | fragosti | 2018-10-20 | 1 | -3/+7 |
* | | | | | fix: justify error message left | fragosti | 2018-10-27 | 1 | -1/+1 |
* | | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-26 | 3 | -22/+49 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | cleanup code | Steve Klebanoff | 2018-10-26 | 1 | -7/+2 |
| * | | | | Added string to constants | Steve Klebanoff | 2018-10-26 | 1 | -1/+2 |
| * | | | | Making failure txHash required | Steve Klebanoff | 2018-10-26 | 1 | -1/+1 |
| * | | | | txnHash -> txHash | Steve Klebanoff | 2018-10-26 | 1 | -10/+10 |
| * | | | | new try/catch pattern and new prop names per code review feedback | Steve Klebanoff | 2018-10-26 | 1 | -9/+24 |
| * | | | | feat(instant): Be able to view transaction when transaction is in progress | Steve Klebanoff | 2018-10-25 | 2 | -3/+8 |
| * | | | | Associate txnhash with processing state | Steve Klebanoff | 2018-10-25 | 1 | -8/+11 |
| * | | | | Introduce new OrderProcessState | Steve Klebanoff | 2018-10-25 | 2 | -10/+13 |
| * | | | | Message when signature denied | Steve Klebanoff | 2018-10-25 | 1 | -2/+7 |
| | |_|/
| |/| | |
|
* | | | | feat: change network to networkId | fragosti | 2018-10-26 | 1 | -5/+5 |
* | | | | chore: add to asset-buyer changelog.json | fragosti | 2018-10-26 | 1 | -2/+3 |
* | | | | feat: support defaultAssetBuyAmount setting | fragosti | 2018-10-26 | 1 | -6/+6 |
* | | | | feat: flash an error if the wrong network is detected | fragosti | 2018-10-26 | 2 | -8/+27 |
* | | | | feat: supply render options from URL | fragosti | 2018-10-26 | 1 | -5/+16 |
|/ / / |
|
* | | | Merge branch 'development' into feature/instant/processing-state | Steve Klebanoff | 2018-10-24 | 4 | -7/+30 |
|\ \ \
| | |/
| |/| |
|
| * | | rename container | Steve Klebanoff | 2018-10-24 | 1 | -2/+2 |
| * | | move buy order state to its own component | Steve Klebanoff | 2018-10-24 | 1 | -0/+24 |
| * | | Merge branch 'development' into feature/instant/failure-state | Steve Klebanoff | 2018-10-24 | 2 | -5/+5 |
| |\ \ |
|
| | * | | chore: incorportate pr feedback | fragosti | 2018-10-24 | 2 | -5/+5 |
* | | | | feat(instant): Procesing and Success states | Steve Klebanoff | 2018-10-24 | 3 | -11/+33 |
* | | | | Make icon a bit better | Steve Klebanoff | 2018-10-23 | 1 | -1/+1 |
* | | | | Spinner: change prop names and fix svg props | Steve Klebanoff | 2018-10-23 | 1 | -9/+9 |
* | | | | Making SecondaryButton accept children instead of text prop | Steve Klebanoff | 2018-10-23 | 3 | -5/+22 |
* | | | | Spinner no longer wobbly | Steve Klebanoff | 2018-10-23 | 2 | -6/+15 |
* | | | | WIP: spinner | Steve Klebanoff | 2018-10-23 | 2 | -0/+45 |
|/ / / |
|
* | | | Remove hack fix | Steve Klebanoff | 2018-10-20 | 1 | -4/+2 |
* | | | feat(instant): Add failure state and icon | Steve Klebanoff | 2018-10-20 | 2 | -15/+30 |
* | | | linting | Steve Klebanoff | 2018-10-20 | 1 | -1/+0 |
* | | | Small refacotor of icons or amounts part | Steve Klebanoff | 2018-10-20 | 1 | -7/+3 |
* | | | Render failure icon | Steve Klebanoff | 2018-10-20 | 1 | -2/+23 |
* | | | Merge branch 'feature/instant/beta-render-et-al' into feature/instant/failure... | Steve Klebanoff | 2018-10-20 | 6 | -131/+206 |
|\| | |
|
| * | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-20 | 5 | -97/+163 |
| |\ \
| | |/
| |/| |
|
| | * | linting | Steve Klebanoff | 2018-10-20 | 1 | -2/+2 |
| | * | arrow function syntax so no need to bind | Steve Klebanoff | 2018-10-20 | 1 | -8/+6 |
| | * | dont export PlainPlaceholder | Steve Klebanoff | 2018-10-20 | 1 | -2/+2 |
| | * | Refactor to make placeholder logic more straightforward | Steve Klebanoff | 2018-10-20 | 1 | -5/+6 |
| | * | Getting rid of displayName, and rename usdSection -> _renderUsdSection | Steve Klebanoff | 2018-10-20 | 1 | -3/+2 |
| | * | undefined -> null to follow convention | Steve Klebanoff | 2018-10-19 | 1 | -2/+2 |
| | * | pulsating -> isPulsating | Steve Klebanoff | 2018-10-19 | 3 | -7/+7 |
| | * | Move USD section into helper function | Steve Klebanoff | 2018-10-19 | 1 | -46/+42 |
| | * | feat(instant): Indicate that order details section is loading by having pulsi... | Steve Klebanoff | 2018-10-19 | 3 | -16/+44 |
| | * | Pulsating holder element showing, even if amount is empty | Steve Klebanoff | 2018-10-19 | 4 | -57/+101 |
| | * | quoteState -> quoteRequestState | Steve Klebanoff | 2018-10-19 | 1 | -5/+5 |
| * | | feat: add network to state and use it where relevant | fragosti | 2018-10-19 | 1 | -14/+27 |
| * | | feat: use color from metaData instead of default primaryColor | fragosti | 2018-10-19 | 1 | -3/+3 |
| * | | fix: refactor ZeroExInstant state creation logic and fix bug | fragosti | 2018-10-19 | 1 | -3/+6 |
* | | | Selected Asset button | Steve Klebanoff | 2018-10-20 | 3 | -57/+6 |
* | | | WIP: clear buy quote working | Steve Klebanoff | 2018-10-20 | 1 | -7/+3 |
* | | | wip: retry button | Steve Klebanoff | 2018-10-20 | 3 | -9/+90 |
* | | | Icon component for Instant | Steve Klebanoff | 2018-10-20 | 1 | -0/+58 |
* | | | Show order failed messaging when order fails | Steve Klebanoff | 2018-10-19 | 1 | -27/+43 |
|/ / |
|
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f... | fragosti | 2018-10-19 | 10 | -120/+116 |
|\| |
|
| * | chore: fix imports | Fabio Berger | 2018-10-18 | 1 | -1/+1 |