aboutsummaryrefslogtreecommitdiffstats
path: root/packages/instant/src/components
Commit message (Expand)AuthorAgeFilesLines
* fix(instant): Progress bar background color should be 10% primary colorSteve Klebanoff2018-11-292-5/+25
* Merge branch 'development' into feature/instant/dropdown-analyticsSteve Klebanoff2018-11-283-3/+16
|\
| * 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-281-0/+8
| |\ \
| | * | Merge branch 'development' into feature/instant/events-buyBrandon Millman2018-11-283-8/+18
| | |\|
| | * | Merge branch 'development' into feature/instant/events-buyBrandon Millman2018-11-276-11/+25
| | |\ \
| | * | | feat(instant): add expectedEndTimeUnix and actualEndTimeUnix to buy eventsBrandon Millman2018-11-271-3/+3
| | * | | feat(instant): add buyQuote properties to buy eventsBrandon Millman2018-11-271-7/+7
| | * | | feat(instant): add txHash to relevant buy eventsBrandon Millman2018-11-271-3/+3
| | * | | feat(instant): implement buy events without associated propertiesBrandon Millman2018-11-271-0/+8
| * | | | Merge branch 'development' into feature/instant/stable-css-classesSteve Klebanoff2018-11-283-8/+18
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Use constantsSteve Klebanoff2018-11-281-2/+3
| * | | | Add stable CSS classesSteve Klebanoff2018-11-271-2/+6
| | |_|/ | |/| |
* | | | Merge branch 'development' into feature/instant/dropdown-analyticsSteve Klebanoff2018-11-283-8/+18
|\ \ \ \ | | |/ / | |/| |
| * | | 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
| * | | Track numberAvailableAssets, selectedAssetName, selectedAssetData event prope...Steve Klebanoff2018-11-271-0/+1
| * | | Merge branch 'development' into feature/instant/token-picker-eventsSteve Klebanoff2018-11-271-8/+9
| |\ \ \
| * | | | feat(instant): Event tracking for token selectorSteve Klebanoff2018-11-271-5/+12
| * | | | Token selector searchedSteve Klebanoff2018-11-271-0/+2
| * | | | Token Selector open, closed, choseSteve Klebanoff2018-11-271-0/+3
| | |_|/ | |/| |
* | | | feat(instant): Add analytics events for payment dropdownSteve Klebanoff2018-11-282-2/+20
| |_|/ |/| |
* | | Merge pull request #1294 from 0xProject/feature/header-tweaksSteve Klebanoff2018-11-275-3/+16
|\ \ \ | |_|/ |/| |
| * | 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-222-7/+8
| |\|
| * | Merge branch 'development' into feature/header-tweaksSteve Klebanoff2018-11-212-0/+27
| |\ \
| * | | 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-272-7/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | 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-211-5/+7
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | isDisabled -> isInputDisabledSteve Klebanoff2018-11-211-3/+4
| | * | | Allow user to select other token on successSteve Klebanoff2018-11-211-3/+3
| | * | | fix(instant): Don't allow changing of assets when order processingSteve Klebanoff2018-11-201-2/+3
| | | |/ | | |/|
* | | | Send in explicit propsSteve Klebanoff2018-11-221-1/+9
* | | | Move out generating of event properties, and send in orderSourceSteve Klebanoff2018-11-211-8/+1
|/ / /
* | | Merge pull request #1272 from 0xProject/feature/instant/heapSteve Klebanoff2018-11-211-0/+14
|\ \ \
| * | | Merge branch 'development' into feature/instant/heapSteve Klebanoff2018-11-201-5/+26
| |\| |
| * | | Change disabled analytics name, add assertion, and always setSteve Klebanoff2018-11-201-4/+2
| * | | Add way to disable via propsSteve Klebanoff2018-11-171-1/+5
| * | | Widget -> InstantSteve Klebanoff2018-11-171-1/+1
| * | | Getting rid of unused function, and using track prefixSteve Klebanoff2018-11-171-1/+1
| * | | Merge branch 'development' into feature/instant/heapSteve Klebanoff2018-11-175-83/+31
| |\ \ \ | | | |/ | | |/|
| * | | Report on git sha and npm version of buildSteve Klebanoff2018-11-171-0/+2
| * | | Remove unused importSteve Klebanoff2018-11-171-1/+0
| * | | Typesafe analytic actionsSteve Klebanoff2018-11-171-1/+2
| * | | LintingSteve Klebanoff2018-11-162-2/+1
| * | | Move where we track widget opened, and report on networkId and providerNameSteve Klebanoff2018-11-162-4/+10
| * | | feat(instant): Heap middleware and first tracking eventsSteve Klebanoff2018-11-161-0/+5
* | | | Import via TSSteve Klebanoff2018-11-201-1/+1
* | | | 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-201-0/+15
| |_|/ |/| |
* | | feat(instant): support custom iconUrlsBrandon Millman2018-11-201-9/+25
* | | feat(instant): add icons to token selectorBrandon Millman2018-11-161-5/+10
| |/ |/|
* | 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-161-1/+2
|\ \
| * | Have heartbeat update not trigger errorsSteve Klebanoff2018-11-161-1/+2
| |/
* | fix: remove redundant handlerfragosti2018-11-161-21/+1
* | feat: make onUnlockWalletClick different based on ONfragosti2018-11-162-33/+33
* | chore: remove wallet panel content for mobilefragosti2018-11-161-51/+1
* | feat: use blue for wallet prompt on mobilefragosti2018-11-163-6/+28
|/
* 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
* | 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-147-39/+36
|\|
| * Merge branch 'feature/instant/metamask-connect-flow' of https://github.com/0x...fragosti2018-11-143-20/+8
| |\
| | * lintingSteve Klebanoff2018-11-141-1/+2
| | * Remove ConnectedZeroExInstantContainer, introduce ConnectedBuyOrderProgressOr...Steve Klebanoff2018-11-143-20/+7
| * | Merge https://github.com/0xProject/0x-monorepo into feature/instant/metamask-...fragosti2018-11-144-19/+28
| |\ \ | | |/ | |/|
| | * chore(instant): update selectedAssetAmount in the redux state to be named sel...Brandon Millman2018-11-144-24/+26
| | * feat(instant): calculate per unit eth amount to populate OrderDetails componentBrandon Millman2018-11-131-6/+13
* | | feat: display the correct provider type and change unlock / install prompt co...fragosti2018-11-144-37/+46
* | | feat: change install wallet panel content based on browser and osfragosti2018-11-144-28/+146
|/ /
* | chore: PR feedbackfragosti2018-11-142-6/+5
* | chore: remove unused constantfragosti2018-11-131-1/+0
* | fix: rename handler creator namefragosti2018-11-132-2/+2
* | feat: make all button fontsizes 16px by defaultfragosti2018-11-136-7/+3
* | fix: remove requirement of default case in all switch statementsfragosti2018-11-133-7/+1
* | feat: integrate wallet flow with heartbeat and other branchesfragosti2018-11-133-11/+10
* | 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-101-4/+29
|\|
| * feat(instant): handle privacy mode in walletsBrandon Millman2018-11-101-2/+0
| * Merge pull request #1237 from 0xProject/feature/instant/buy-quote-heartbeatSteve Klebanoff2018-11-101-4/+31
| |\
| | * lintingSteve Klebanoff2018-11-101-1/+1
| | * Don't start heartbeat if no accountSteve Klebanoff2018-11-101-6/+8
| | * Linting and renaming variablesSteve Klebanoff2018-11-101-4/+7
| | * Emulate named parameters with interfaceSteve Klebanoff2018-11-101-3/+6
| | * Use existing functions instead of writing our ownSteve Klebanoff2018-11-101-3/+3
| | * Merge branch 'development' into feature/instant/buy-quote-heartbeatSteve Klebanoff2018-11-1026-255/+611
| | |\
| | * | Remove old TODOSteve Klebanoff2018-11-091-1/+0
| | * | move files around and renameSteve Klebanoff2018-11-091-1/+2
| | * | wip: BuyQuote heartbeatSteve Klebanoff2018-11-091-2/+11
| | * | Make heartbeat more genericSteve Klebanoff2018-11-091-4/+5
| | * | feat(instant): Heartbeat for updating account infoSteve Klebanoff2018-11-091-1/+12
* | | | 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-101-2/+10
|\| | |
| * | | feat(instant): Dismissible overlay error messagesSteve Klebanoff2018-11-101-2/+10
| | |/ | |/|
* | | feat: toggle wallet connection colorfragosti2018-11-101-10/+25
* | | feat: refactor button styles and add href to Textfragosti2018-11-104-20/+23
* | | feat: add more info section to the metamask panelfragosti2018-11-102-4/+8
* | | feat: allow href prop on buttonfragosti2018-11-103-8/+31
* | | feat: implement basic StandardModalContent with accompanying InstallWalletPan...fragosti2018-11-105-4/+87
* | | feat: add padding to close icon to increase tap areafragosti2018-11-101-1/+1
* | | feat: open metamask sliding panel if locked on clickfragosti2018-11-101-20/+33
* | | feat: create connect metamaskfragosti2018-11-101-2/+20
* | | feat: connect payment method to state and display different content based on ...fragosti2018-11-101-31/+75
* | | feat: add account payment method containerfragosti2018-11-102-31/+36
* | | 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-105-5/+36
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-093-16/+22
|\| |
| * | Merge pull request #1232 from 0xProject/feature/instant/account-state-changeBrandon Millman2018-11-093-16/+22
| |\ \
| | * \ Merge branch 'development' into feature/instant/account-state-changeBrandon Millman2018-11-0921-215/+336
| | |\ \ | | | |/ | | |/|
| | * | feat(instant): fetch balance at startupBrandon Millman2018-11-082-6/+13
| | * | feat(instant): fetch account address at startup and drive account state changesBrandon Millman2018-11-083-15/+12
* | | | 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-097-35/+95
|\ \ \ | | |/ | |/|
| * | [instant] Viewport specific errors (#1228)Steve Klebanoff2018-11-096-33/+93
| * | Merge pull request #1231 from 0xProject/fix/instant/default-amount-quoteBrandon Millman2018-11-091-2/+2
| |\ \
| | * | 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-081-2/+1
| | |/
* | | 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-0917-232/+277
|\| |
| * | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-0911-77/+80
| |\|
| | * Merge pull request #1221 from 0xProject/feature/instant/fallback-providerBrandon Millman2018-11-085-61/+51
| | |\
| | | * feat(instant): add Account to the ProviderStateBrandon Millman2018-11-081-25/+7
| | | * feat(instant): fallback to an empty wallet provider when none is injectedBrandon Millman2018-11-083-44/+52
| | | * chore(instant): update OrderState enum to follow capitalization conventionsBrandon Millman2018-11-073-15/+15
| * | | fix: apply css reset to overlay as wellfragosti2018-11-083-34/+38
| * | | 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-0714-169/+227
| | |/ | |/|
* | | 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-086-16/+29
|\ \ \ | | |/ | |/|
| * | 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-0717-25/+49
| |\|
| * | 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-075-59/+18
| * | better function definitonSteve Klebanoff2018-11-072-3/+2
| * | proof of concept workingSteve Klebanoff2018-11-072-6/+2
| * | wip: mediachoice experimentSteve Klebanoff2018-11-072-0/+24
| * | feat(instant): when on mobile, show mobile specific styling that takes up who...Steve Klebanoff2018-11-074-4/+39
| * | Putting back in old heights as not necessary for full bleedSteve Klebanoff2018-11-071-1/+1
| * | wip: height 100%Steve Klebanoff2018-11-062-2/+4
| * | wip: full display of mobile hard codedSteve Klebanoff2018-11-065-5/+12
* | | feat: implement copy-to-clipboardfragosti2018-11-081-0/+16
* | | feat: add MetaMask sign, refactor Circlefragosti2018-11-083-18/+33
* | | feat: create PaymentMethodDropdownfragosti2018-11-088-43/+83
* | | 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-083-64/+83
* | | feat: implement basic dropdown componentfragosti2018-11-085-7/+167
| |/ |/|
* | add extra spaceSteve Klebanoff2018-11-061-0/+1
* | chore(instant): import UI components directlySteve Klebanoff2018-11-0617-25/+49
|/
* Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-034-38/+75
|\
| * Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp...Steve Klebanoff2018-11-032-13/+22
| |\
| | * feat(instant): pass in provider through props, fallback to injected providerBrandon Millman2018-11-032-13/+22
| * | Use generic MaybeSteve Klebanoff2018-11-031-3/+4
| * | lintingSteve Klebanoff2018-11-031-1/+1
| * | Merge branch 'development' into fix/instant/decimal-fields-scaling-amount-inp...Steve Klebanoff2018-11-037-13/+220
| |\|
| * | onChange -> onAmountChangeSteve Klebanoff2018-11-032-5/+5
| * | Move MaybeBigNumber functions into helperSteve Klebanoff2018-11-031-17/+4
| * | Have ScalingAmountInput trigger onChange with MaybeBigNumber and keep string ...Steve Klebanoff2018-11-021-12/+52
| * | Getting rid of BigNumberInput in favor of BigNumberSteve Klebanoff2018-11-023-11/+11
* | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-037-12/+219
|\ \ \ | | |/ | |/|
| * | feat(instant): implement affiliateFeeInfo propBrandon Millman2018-11-033-6/+17
| * | Merge branch 'development' into feature/instant/simulated-progress-barSteve Klebanoff2018-11-036-128/+234
| |\|
| * | Merge branch 'development' into feature/instant/simulated-progress-barSteve Klebanoff2018-11-0215-136/+353
| |\ \
| * | | linting: moving order of importsSteve Klebanoff2018-11-021-1/+1
| * | | Better styling of estimated timeSteve Klebanoff2018-11-021-2/+15
| * | | Move file to new file to reflect the new export nameSteve Klebanoff2018-11-021-1/+1
| * | | Rename exportSteve Klebanoff2018-11-021-2/+2
| * | | Move BuyOrderProgress to its own componentSteve Klebanoff2018-11-021-0/+35
| * | | Remove old TODOSteve Klebanoff2018-11-021-1/+1
| * | | Use new constantsSteve Klebanoff2018-11-021-2/+3
| * | | Use primary color instead of blackSteve Klebanoff2018-11-021-1/+1
| * | | maxWidth -> toWidth, and make from and to width consistent unitsSteve Klebanoff2018-11-021-10/+10
| * | | Getting rid of TimedProgress stateSteve Klebanoff2018-11-021-47/+23
| * | | Minor cleanupSteve Klebanoff2018-11-021-2/+2
| * | | ended -> hasEndedSteve Klebanoff2018-11-022-6/+6
| * | | Rename to SelectedAssetProgressSteve Klebanoff2018-11-011-2/+2
| * | | Removing old simulated progress bar, and adding documentation to TimedProgres...Steve Klebanoff2018-11-012-198/+5
| * | | WIP of new timedprogressbar using CSS animationsSteve Klebanoff2018-11-012-0/+165
| * | | Explicit actions for setting different order statesSteve Klebanoff2018-11-012-7/+7
| * | | Tick less often, and let CSS style the transitionSteve Klebanoff2018-10-311-3/+23
| * | | Nice formatting of displayed timeSteve Klebanoff2018-10-311-6/+3
| * | | Takeout unneeded divSteve Klebanoff2018-10-311-12/+10
| * | | Get rid of old demoSteve Klebanoff2018-10-311-11/+0
| * | | Use simulated progress bar for txnSteve Klebanoff2018-10-312-19/+34
| * | | Showing timeSteve Klebanoff2018-10-311-1/+9
| * | | Show estimated timeSteve Klebanoff2018-10-311-0/+9
| * | | Remove old filesSteve Klebanoff2018-10-312-37/+0
| * | | Simulated Progress component workingSteve Klebanoff2018-10-312-5/+33
| * | | WIP: beginning of simulated progress bar componentSteve Klebanoff2018-10-311-0/+136
| * | | Placeholder for estimated timeSteve Klebanoff2018-10-311-1/+14
| * | | Making prettierSteve Klebanoff2018-10-311-4/+8
| * | | Dispatching progressSteve Klebanoff2018-10-312-1/+19
| * | | store estimated time in Ms on stateSteve Klebanoff2018-10-301-2/+2
| * | | return estimated stateSteve Klebanoff2018-10-302-3/+3
* | | | chore: address PR commentsfragosti2018-11-033-17/+21
* | | | 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-024-4/+13
* | | | feat: add name param to all ERC20AssetMetaDatafragosti2018-11-021-0/+4
* | | | 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-024-14/+12
* | | | feat: use new Icon component functionalityfragosti2018-11-021-2/+2
* | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into f...fragosti2018-11-026-144/+251
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove alternate hover styling from button and move into icon componentBrandon Millman2018-11-024-52/+54
| * | | feat(instant): add interactive overlay presentation to umd bundleBrandon Millman2018-11-027-111/+215
| | |/ | |/|
* | | 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: auto-close panel when a token is selectedfragosti2018-11-021-1/+1