Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Swap flow with reset #119

Merged
merged 5 commits into from
Sep 9, 2023
Merged

fix: Swap flow with reset #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
241727a
fix: Swap flow with reset
memoyil Sep 9, 2023
dd13f2b
fix: Reenable use effect
memoyil Sep 9, 2023
ce7800f
fix: Reenable use effect
memoyil Sep 9, 2023
3960f0a
fix: Lint
memoyil Sep 9, 2023
8553d85
fix: Progress
memoyil Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/src/views/Swap/V3Swap/containers/ApproveStepFlow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ const ApproveStepFlow: React.FC<React.PropsWithChildren<ApproveStepFlowProps>> =
{!hideStepIndicators && (
<>
<StepsContainer>
{pendingModalSteps.length === 4 && (
{pendingModalSteps.length === 2 && (
<Step active={confirmModalState === ConfirmModalState.RESETTING_USDT} width={stepWidth} />
)}
<Step active={confirmModalState === ConfirmModalState.APPROVING_TOKEN} width={stepWidth} />
Expand Down
33 changes: 21 additions & 12 deletions apps/web/src/views/Swap/V3Swap/containers/ConfirmSwapModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import { useCallback, memo, useState, useEffect, useMemo } from 'react'
import { Currency, TradeType, CurrencyAmount, ChainId, Token } from '@pancakeswap/sdk'
import { memo, useCallback, useEffect, useMemo, useState } from 'react'
import { ChainId, Currency, CurrencyAmount, Token, TradeType } from '@pancakeswap/sdk'
import {
Flex,
ApproveModalContent,
Box,
Link,
BscScanIcon,
Flex,
InjectedModalProps,
ApproveModalContent,
Link,
SwapPendingModalContent,
SwapTransactionReceiptModalContent,
} from '@pancakeswap/uikit'
Expand Down Expand Up @@ -67,9 +67,7 @@ interface UseConfirmModalStateProps {

function isInApprovalPhase(confirmModalState: ConfirmModalState) {
return (
confirmModalState === ConfirmModalState.RESETTING_USDT ||
confirmModalState === ConfirmModalState.APPROVING_TOKEN ||
confirmModalState === ConfirmModalState.APPROVE_PENDING
confirmModalState === ConfirmModalState.APPROVING_TOKEN || confirmModalState === ConfirmModalState.APPROVE_PENDING
)
}

Expand All @@ -87,6 +85,7 @@ const useConfirmModalState = ({
const [confirmModalState, setConfirmModalState] = useState<ConfirmModalState>(ConfirmModalState.REVIEWING)
const [pendingModalSteps, setPendingModalSteps] = useState<PendingConfirmModalState[]>([])
const [previouslyPending, setPreviouslyPending] = useState<boolean>(false)
const [resettingApproval, setResettingApproval] = useState<boolean>(false)

const generateRequiredSteps = useCallback(() => {
const steps: PendingConfirmModalState[] = []
Expand Down Expand Up @@ -116,7 +115,7 @@ const useConfirmModalState = ({
case ConfirmModalState.RESETTING_USDT:
setConfirmModalState(ConfirmModalState.RESETTING_USDT)
approveCallback(0n)
.then(() => performStep(ConfirmModalState.APPROVING_TOKEN))
.then(() => setResettingApproval(true))
.catch(() => onCancel())
break
case ConfirmModalState.APPROVING_TOKEN:
Expand Down Expand Up @@ -146,6 +145,13 @@ const useConfirmModalState = ({
performStep(steps[0])
}, [generateRequiredSteps, performStep])

useEffect(() => {
if (approval === ApprovalState.NOT_APPROVED && resettingApproval) {
startSwapFlow()
setResettingApproval(false)
}
}, [approval, resettingApproval, startSwapFlow])

const onCancel = () => {
setConfirmModalState(ConfirmModalState.REVIEWING)
setPreviouslyPending(false)
Expand Down Expand Up @@ -401,9 +407,12 @@ const ConfirmSwapModal = memo<InjectedModalProps & ConfirmSwapModalProps>(functi
handleDismiss={handleDismiss}
>
<Box>{topModal()}</Box>
{(isInApprovalPhase(confirmModalState) || attemptingTxn) && !swapErrorMessage && (
<ApproveStepFlow confirmModalState={confirmModalState} pendingModalSteps={pendingModalSteps} />
)}
{(confirmModalState === ConfirmModalState.RESETTING_USDT ||
isInApprovalPhase(confirmModalState) ||
attemptingTxn) &&
!swapErrorMessage && (
<ApproveStepFlow confirmModalState={confirmModalState} pendingModalSteps={pendingModalSteps} />
)}
</ConfirmSwapModalContainer>
)
})
Expand Down
Loading