aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src
Commit message (Expand)AuthorAgeFilesLines
* add missing import from mergeSteve Klebanoff2018-12-011-0/+1
* Merge branch 'development' into feature/instant/misc-close-analyticsSteve Klebanoff2018-11-3017-46/+181
|\
| * Merge pull request #1343 from 0xProject/feature/instant/quote-analyticsSteve Klebanoff2018-11-307-12/+62
| |\
| | * assetAmount -> assetBuyAmountSteve Klebanoff2018-11-301-2/+2
| | * Merge branch 'development' into feature/instant/quote-analyticsSteve Klebanoff2018-11-296-20/+81
| | |\
| | * | Use base unit valueSteve Klebanoff2018-11-291-1/+1
| | * | Move fetch origin out of optionsSteve Klebanoff2018-11-295-17/+16
| | * | fetchedVia -> fetchOriginSteve Klebanoff2018-11-296-12/+16
| | * | QuoteFetchedVia -> QuoteFetchOriginSteve Klebanoff2018-11-297-14/+14
| | * | Take out asset name and data as we can use the selected event propertiesSteve Klebanoff2018-11-292-16/+2
| | * | Tracking quote errorsSteve Klebanoff2018-11-282-0/+23
| | * | feat(instant): Quote fetch trackingSteve Klebanoff2018-11-287-9/+39
| * | | Merge pull request #1345 from 0xProject/fix/instant/progress-bar-bgSteve Klebanoff2018-11-303-7/+35
| |\ \ \
| | * | | fix(instant): Progress bar background color should be 10% primary colorSteve Klebanoff2018-11-293-7/+35
| | |/ /
| * | | Merge pull request #1346 from 0xProject/fix/instant/token-selector-hoverSteve Klebanoff2018-11-301-4/+2
| |\ \ \
| | * | | LintingSteve Klebanoff2018-11-291-1/+0
| | * | | fix(instant): Half opacity instead of darkening on hover for clickable textSteve Klebanoff2018-11-291-3/+2
| | |/ /
| * | | Merge pull request #1347 from 0xProject/fix/instant/input-react-warningSteve Klebanoff2018-11-301-4/+4
| |\ \ \
| | * | | fix(instant): Fix uncontrolled input warning for token selectorSteve Klebanoff2018-11-291-4/+4
| | |/ /
| * | | Merge pull request #1352 from 0xProject/fix/instant/token-symbol-sizeFrancesco Agosti2018-11-291-0/+6
| |\ \ \ | | |_|/ | |/| |
| | * | fix: notify of the used font size for re-renders of scaling inputfragosti2018-11-291-0/+6
| | |/
| * | Merge branch 'development' into feature/instant/install-analyticsSteve Klebanoff2018-11-283-2/+26
| |\|
| * | feat(instant): Install Wallet analyticsSteve Klebanoff2018-11-284-3/+43
| * | Track install wallet clickedSteve Klebanoff2018-11-283-17/+30
* | | feat(instant): Close and View Transaction analytics eventsSteve Klebanoff2018-11-283-1/+11
| |/ |/|
* | Merge branch 'development' into feature/instant/dropdown-analyticsSteve Klebanoff2018-11-285-3/+73
|\|
| * Merge pull request #1336 from 0xProject/fix/instant/clipboardSteve Klebanoff2018-11-281-1/+1
| |\
| | * fix(instant): Fix copy to clipboardSteve Klebanoff2018-11-281-1/+1
| * | Merge pull request #1327 from 0xProject/feature/instant/events-buyBrandon Millman2018-11-282-0/+63
| |\ \
| | * | Merge branch 'development' into feature/instant/events-buyBrandon Millman2018-11-285-11/+67
| | |\|
| | * | feat(instant): change event properties to ms times instead of unix timestampsBrandon Millman2018-11-281-8/+5
| | * | Merge branch 'development' into feature/instant/events-buyBrandon Millman2018-11-277-11/+52
| | |\ \
| | * | | feat(instant): add expectedEndTimeUnix and actualEndTimeUnix to buy eventsBrandon Millman2018-11-272-11/+26
| | * | | feat(instant): add buyQuote properties to buy eventsBrandon Millman2018-11-272-14/+43
| | * | | feat(instant): add txHash to relevant buy eventsBrandon Millman2018-11-272-6/+6
| | * | | feat(instant): implement buy events without associated propertiesBrandon Millman2018-11-272-0/+22
| * | | | Merge branch 'development' into feature/instant/stable-css-classesSteve Klebanoff2018-11-285-11/+67
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use constantsSteve Klebanoff2018-11-282-2/+5
| * | | | Add stable CSS classesSteve Klebanoff2018-11-271-2/+6
| | |_|/ | |/| |
* | | | Merge branch 'development' into feature/instant/dropdown-analyticsSteve Klebanoff2018-11-285-11/+67
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'development' into feature/instant/token-picker-eventsSteve Klebanoff2018-11-285-3/+16
| |\| |
| * | | Make explicit functionsSteve Klebanoff2018-11-281-7/+6
| * | | LintingSteve Klebanoff2018-11-281-3/+3
| * | | Fix propsSteve Klebanoff2018-11-271-5/+3
| * | | Set selected asset to noneSteve Klebanoff2018-11-271-6/+2
| * | | Track numberAvailableAssets, selectedAssetName, selectedAssetData event prope...Steve Klebanoff2018-11-273-5/+33
| * | | Fix dupe merge issueSteve Klebanoff2018-11-271-1/+0
| * | | Merge branch 'development' into feature/instant/token-picker-eventsSteve Klebanoff2018-11-272-8/+36
| |\ \ \
| * | | | feat(instant): Event tracking for token selectorSteve Klebanoff2018-11-272-6/+18
| * | | | Token selector searchedSteve Klebanoff2018-11-272-0/+5
| * | | | Token Selector open, closed, choseSteve Klebanoff2018-11-273-0/+19
| | |_|/ | |/| |
* | | | feat(instant): Add analytics events for payment dropdownSteve Klebanoff2018-11-283-2/+26
| |_|/ |/| |
* | | Merge pull request #1294 from 0xProject/feature/header-tweaksSteve Klebanoff2018-11-275-3/+16
|\ \ \ | |_|/ |/| |
| * | Merge branch 'development' into feature/header-tweaksSteve Klebanoff2018-11-276-62/+129
| |\|
| * | Add commentSteve Klebanoff2018-11-221-0/+1
| * | Force scaling input component to rerender when a different asset is chosenSteve Klebanoff2018-11-221-0/+1
| * | Merge branch 'development' into feature/header-tweaksSteve Klebanoff2018-11-224-38/+37
| |\ \
| * \ \ Merge branch 'development' into feature/header-tweaksSteve Klebanoff2018-11-2112-4/+308
| |\ \ \
| * | | | autofocus -> hasAutoFocusSteve Klebanoff2018-11-213-8/+8
| * | | | fix(instant): Right align amountsSteve Klebanoff2018-11-212-2/+6
| * | | | fix(instant): Autofocus text amount inputSteve Klebanoff2018-11-213-1/+8
* | | | | Merge branch 'development' into feature/instant/open-close-eventsSteve Klebanoff2018-11-2710-100/+166
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge pull request #1281 from 0xProject/feature/instant/push-to-historyFrancesco Agosti2018-11-221-29/+82
| |\ \ \ \
| | * | | | fix: multiple render and closes edge case for onpopstate renderfragosti2018-11-221-25/+27
| | * | | | chore: clean up index.umd.ts a bitfragosti2018-11-221-32/+38
| | * | | | feat: add more to instant dev envfragosti2018-11-221-4/+3
| | * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-2114-16/+319
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-2033-8/+174
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | feat: add isInstantRendered check to safeguard against double renders and dou...fragosti2018-11-171-5/+13
| | * | | | chore: use lodash where relevantfragosti2018-11-171-1/+1
| | * | | | fix: bug where we did not call onClose configfragosti2018-11-171-6/+8
| | * | | | feat: add assert for shouldDisablePushToHistoryfragosti2018-11-171-7/+10
| | * | | | feat: be more specific with callback namefragosti2018-11-171-7/+7
| | * | | | feat: allow integrator to disable pushstate logicfragosti2018-11-171-25/+29
| | * | | | feat: rename props to configfragosti2018-11-171-23/+27
| | * | | | feat: close and open instant based on history changesfragosti2018-11-171-13/+38
| * | | | | Merge pull request #1300 from 0xProject/feature/instant/events-accountBrandon Millman2018-11-225-33/+47
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | chore(instant): revert usage of event propertiesBrandon Millman2018-11-222-12/+5
| | * | | | chore(instant): refactor usage of event properties in heapBrandon Millman2018-11-223-22/+26
| | * | | | chore(instant): refactor account tracking logic in middleware to be more read...Brandon Millman2018-11-221-8/+8
| | * | | | feat(instant): implement account related eventsBrandon Millman2018-11-214-20/+37
| * | | | | Merge pull request #1283 from 0xProject/feature/instant/make-instant-public-a...Francesco Agosti2018-11-211-2/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | fix: do not use document on importfragosti2018-11-201-2/+1
| | |/ / /
| * | | | Merge pull request #1290 from 0xProject/fix/instant/disable-token-pickerSteve Klebanoff2018-11-212-10/+20
| |\ \ \ \
| | * | | | isDisabled -> isInputDisabledSteve Klebanoff2018-11-212-9/+10
| | * | | | Allow user to select other token on successSteve Klebanoff2018-11-212-3/+11
| | * | | | fix(instant): Don't allow changing of assets when order processingSteve Klebanoff2018-11-201-2/+3
| | | |/ / | | |/| |
| * | | | fix(instant): Use new valid svg image for instantSteve Klebanoff2018-11-211-26/+16
| | |_|/ | |/| |
* | | | Send in explicit propsSteve Klebanoff2018-11-222-17/+23
* | | | feat(instant): Add more event properties to heapSteve Klebanoff2018-11-211-0/+6
* | | | Move out generating of event properties, and send in orderSourceSteve Klebanoff2018-11-212-8/+24
|/ / /
* | | Merge pull request #1272 from 0xProject/feature/instant/heapSteve Klebanoff2018-11-219-4/+261
|\ \ \
| * | | Merge branch 'development' into feature/instant/heapSteve Klebanoff2018-11-2033-8/+174
| |\| |
| * | | Linting: rename variableSteve Klebanoff2018-11-201-2/+2
| * | | Get heap analytics id from ENV variableSteve Klebanoff2018-11-202-13/+9
| * | | Change disabled analytics name, add assertion, and always setSteve Klebanoff2018-11-203-8/+9
| * | | Add way to disable via propsSteve Klebanoff2018-11-172-4/+25
| * | | Better way of reporting Fallback providerSteve Klebanoff2018-11-173-7/+1
| * | | Specify fallback web3 provider in analyticsSteve Klebanoff2018-11-174-0/+8
| * | | Remove old functionSteve Klebanoff2018-11-171-2/+0
| * | | Widget -> InstantSteve Klebanoff2018-11-172-1/+3
| * | | Trigger Wallet Ready when address changedSteve Klebanoff2018-11-171-2/+16
| * | | Getting rid of unused function, and using track prefixSteve Klebanoff2018-11-173-6/+4
| * | | Merge branch 'development' into feature/instant/heapSteve Klebanoff2018-11-1711-118/+99
| |\ \ \ | | | |/ | | |/|
| * | | Disable tslint for unused function so we can include this for future tracking...Steve Klebanoff2018-11-171-0/+1
| * | | Report on git sha and npm version of buildSteve Klebanoff2018-11-172-2/+6
| * | | null -> undefinedSteve Klebanoff2018-11-171-2/+2
| * | | Add initials to TODO noteSteve Klebanoff2018-11-171-1/+1
| * | | Take out old TODOSteve Klebanoff2018-11-171-1/+0
| * | | Remove unused importSteve Klebanoff2018-11-171-1/+0
| * | | Switch heap id on environment, and make sure app id is what we expectSteve Klebanoff2018-11-172-3/+16
| * | | We may not know num available assets available when wallet ready, so not trac...Steve Klebanoff2018-11-172-4/+2
| * | | Make user and event properties more specificSteve Klebanoff2018-11-172-5/+16
| * | | Typesafe analytic actionsSteve Klebanoff2018-11-174-28/+50
| * | | Move variable assignments around to be more clearSteve Klebanoff2018-11-161-3/+5
| * | | LintingSteve Klebanoff2018-11-165-5/+2
| * | | Take out console.logsSteve Klebanoff2018-11-161-3/+0
| * | | Move where we track widget opened, and report on networkId and providerNameSteve Klebanoff2018-11-162-4/+10
| * | | Introduce ANALYTICS_ENABLED constantSteve Klebanoff2018-11-162-0/+7
| * | | Report ETH in unitsSteve Klebanoff2018-11-161-3/+9
| * | | Use pure functions instead of classSteve Klebanoff2018-11-161-27/+24
| * | | feat(instant): Heap middleware and first tracking eventsSteve Klebanoff2018-11-165-10/+88
| * | | First pass on widget version of heapSteve Klebanoff2018-11-162-0/+88
* | | | Import via TSSteve Klebanoff2018-11-201-1/+1
* | | | Add ability to import SVGs in TSSteve Klebanoff2018-11-201-0/+6
* | | | Fix lintingSteve Klebanoff2018-11-201-2/+1
* | | | Use anchor instead of TextSteve Klebanoff2018-11-201-4/+3
* | | | feat(instant): Add powered by 0x imageSteve Klebanoff2018-11-203-0/+43
| |_|/ |/| |
* | | feat(instant): support custom iconUrlsBrandon Millman2018-11-202-9/+26
* | | feat(instant): add icons to token selectorBrandon Millman2018-11-1632-8/+157
| |/ |/|
* | chore(instant): fix lint errorBrandon Millman2018-11-161-1/+1
* | fix: remove unused varsfragosti2018-11-161-6/+1
* | Merge pull request #1273 from 0xProject/fix/instant/heartbeat-errorsSteve Klebanoff2018-11-165-28/+37
|\ \
| * | Send in affiliate info as optionSteve Klebanoff2018-11-163-12/+7
| * | Have heartbeat update not trigger errorsSteve Klebanoff2018-11-165-25/+39
| |/
* | fix: remove redundant handlerfragosti2018-11-162-26/+6
* | feat: make onUnlockWalletClick different based on ONfragosti2018-11-163-35/+58
* | chore: remove wallet panel content for mobilefragosti2018-11-161-51/+1
* | feat: use blue for wallet prompt on mobilefragosti2018-11-164-8/+32
|/
* feat: use capital values for enumsfragosti2018-11-153-38/+43
* Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-155-11/+10
|\
| * fix(instant): fix tabIndex attribute errorBrandon Millman2018-11-152-2/+2
| * fix(instant): match token search on prefixBrandon Millman2018-11-151-2/+4
| * fix(instant): border radiusBrandon Millman2018-11-153-9/+4
| * fix(instant): fix tabbing into erc20 token selectorBrandon Millman2018-11-152-0/+2
* | fix: do not remove payment dropdown when confirmation pendingfragosti2018-11-141-2/+1
* | refactor: move wallet panel content os switching logic into two methodsfragosti2018-11-141-78/+79
* | feat: dont show payment dropdown content on mobilefragosti2018-11-141-0/+4
* | feat: center title label with circlefragosti2018-11-141-3/+3
* | chore: remove unused importfragosti2018-11-141-1/+1
* | feat: add coinbase wallet app logo to wallet promptfragosti2018-11-143-7/+24
* | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-1417-87/+102
|\|
| * Merge branch 'feature/instant/metamask-connect-flow' of https://github.com/0x...fragosti2018-11-145-41/+44
| |\
| | * lintingSteve Klebanoff2018-11-141-1/+2
| | * Remove ConnectedZeroExInstantContainer, introduce ConnectedBuyOrderProgressOr...Steve Klebanoff2018-11-145-41/+43
| * | Merge https://github.com/0xProject/0x-monorepo into feature/instant/metamask-...fragosti2018-11-1412-46/+58
| |\ \ | | |/ | |/|
| | * chore(instant): fix prettierBrandon Millman2018-11-141-1/+7
| | * Merge branch 'development' into fix/asset-buyer/price-per-tokenBrandon Millman2018-11-141-22/+141
| | |\
| | * | chore(instant): update selectedAssetAmount in the redux state to be named sel...Brandon Millman2018-11-1412-53/+56
| | * | feat(instant): calculate per unit eth amount to populate OrderDetails componentBrandon Millman2018-11-132-6/+15
* | | | feat: display the correct provider type and change unlock / install prompt co...fragosti2018-11-148-55/+103
* | | | feat: change install wallet panel content based on browser and osfragosti2018-11-148-28/+214
|/ / /
* | | chore: PR feedbackfragosti2018-11-142-6/+5
* | | chore: run linterfragosti2018-11-131-1/+1
* | | feat: use Omit type to improve type defitions in some containersfragosti2018-11-132-17/+6
* | | chore: remove unused constantfragosti2018-11-132-2/+0
* | | fix: rename handler creator namefragosti2018-11-133-3/+3
* | | feat: make all button fontsizes 16px by defaultfragosti2018-11-136-7/+3
* | | fix: remove requirement of default case in all switch statementsfragosti2018-11-137-21/+10
* | | feat: prevent eth balance blinkfragosti2018-11-132-6/+11
* | | Merge branch 'feature/instant/asset-data-map' of https://github.com/0xProject...fragosti2018-11-131-22/+141
|\ \ \ | | |/ | |/|
| * | feat(instant): add extra asset metadataBrandon Millman2018-11-131-22/+141
| |/
* | feat: integrate wallet flow with heartbeat and other branchesfragosti2018-11-136-48/+81
* | fix: no longer refer to error account statefragosti2018-11-101-1/+0
* | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-1010-27/+115
|\|
| * feat(instant): handle privacy mode in walletsBrandon Millman2018-11-106-16/+11
| * Merge pull request #1237 from 0xProject/feature/instant/buy-quote-heartbeatSteve Klebanoff2018-11-107-13/+106
| |\
| | * lintingSteve Klebanoff2018-11-102-1/+2
| | * Don't start heartbeat if no accountSteve Klebanoff2018-11-101-6/+8
| | * Lodash noopSteve Klebanoff2018-11-101-1/+1
| | * Using built in intervalUtils instead of rolling ownSteve Klebanoff2018-11-101-20/+5
| | * Update account more frequentlySteve Klebanoff2018-11-101-1/+1
| | * Linting and renaming variablesSteve Klebanoff2018-11-105-21/+23
| | * Use interface like named parameters hereSteve Klebanoff2018-11-102-3/+4
| | * Emulate named parameters with interfaceSteve Klebanoff2018-11-103-7/+17
| | * Make sure we only update price when they are not in the middle of an orderSteve Klebanoff2018-11-101-2/+3
| | * Use existing functions instead of writing our ownSteve Klebanoff2018-11-107-94/+28
| | * Merge branch 'development' into feature/instant/buy-quote-heartbeatSteve Klebanoff2018-11-1040-300/+761
| | |\
| | * | Variable name cleanupSteve Klebanoff2018-11-091-9/+9
| | * | Remove unneeded Promise.resolveSteve Klebanoff2018-11-091-1/+0
| | * | Remove old TODOSteve Klebanoff2018-11-091-1/+0
| | * | move files around and renameSteve Klebanoff2018-11-093-24/+20
| | * | wip: BuyQuote heartbeatSteve Klebanoff2018-11-094-5/+45
| | * | Make heartbeat more genericSteve Klebanoff2018-11-092-23/+29
| | * | wip: abstract out updating buy quoteSteve Klebanoff2018-11-092-39/+59
| | * | lintingSteve Klebanoff2018-11-091-0/+1
| | * | feat(instant): Heartbeat for updating account infoSteve Klebanoff2018-11-094-3/+62
* | | | fix: set all button font sizes in buy flow to 16pxfragosti2018-11-101-2/+2
* | | | fix: remove unused ProgressBar from BuyOrderProgress and fix issue where paym...fragosti2018-11-102-17/+4
* | | | fix: minimize height difference between different statesfragosti2018-11-101-2/+3
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-106-12/+50
|\| | |
| * | | feat(instant): Dismissible overlay error messagesSteve Klebanoff2018-11-106-12/+50
| | |/ | |/|
* | | feat: toggle wallet connection colorfragosti2018-11-102-10/+26
* | | feat: refactor button styles and add href to Textfragosti2018-11-105-20/+24
* | | feat: add more info section to the metamask panelfragosti2018-11-103-5/+10
* | | feat: allow href prop on buttonfragosti2018-11-104-8/+33
* | | feat: implement basic StandardModalContent with accompanying InstallWalletPan...fragosti2018-11-106-5/+88
* | | feat: add padding to close icon to increase tap areafragosti2018-11-101-1/+1
* | | feat: open metamask sliding panel if locked on clickfragosti2018-11-102-23/+50
* | | feat: create connect metamaskfragosti2018-11-101-2/+20
* | | feat: connect payment method to state and display different content based on ...fragosti2018-11-102-32/+78
* | | feat: add account payment method containerfragosti2018-11-103-31/+57
* | | feat: make zero ex instant container switch between progress and paymentfragosti2018-11-101-0/+21
* | | feat: refactor progress bar code to expose static progress barfragosti2018-11-105-26/+73
* | | feat: implement CurrentStandardSlidingPanel and put it in the main containerfragosti2018-11-1010-8/+109
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0911-42/+148
|\| |
| * | Merge pull request #1232 from 0xProject/feature/instant/account-state-changeBrandon Millman2018-11-0911-42/+148
| |\ \
| | * | fix(instant): fix bug where we potentially fetch balance for the wrong accountBrandon Millman2018-11-094-9/+18
| | * | Merge branch 'development' into feature/instant/account-state-changeBrandon Millman2018-11-0929-286/+447
| | |\ \ | | | |/ | | |/|
| | * | chore(instant): fix lint errorsBrandon Millman2018-11-081-1/+1
| | * | feat(instant): fetch balance at startupBrandon Millman2018-11-087-20/+53
| | * | feat(instant): fetch account address at startup and drive account state changesBrandon Millman2018-11-089-25/+88
* | | | feat: allow panel children to fill entire content / remove title from panel c...fragosti2018-11-093-16/+10
* | | | feat: add metamask logofragosti2018-11-091-0/+78
* | | | feat: add lock iconfragosti2018-11-091-0/+6
|/ / /
* | | 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-0912-102/+201
|\ \ \ | | |/ | |/|
| * | [instant] Viewport specific errors (#1228)Steve Klebanoff2018-11-098-49/+118
| * | 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
| | |/
* | | 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-0931-450/+652
|\| |
| * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0924-292/+493
| |\|
| | * Merge pull request #1221 from 0xProject/feature/instant/fallback-providerBrandon Millman2018-11-0817-276/+421
| | |\
| | | * 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-0813-243/+330
| | | * 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
| * | | chore: linterfragosti2018-11-076-10/+6
| * | | fix: progress barfragosti2018-11-071-6/+8
| * | | fix: use fontSize prop in buttonfragosti2018-11-071-2/+1
| * | | feat: make instant resistant to external stylesfragosti2018-11-0715-171/+229
| | |/ | |/|