diff --git a/src/app/components/mint-unmint/components/mint/mint.tsx b/src/app/components/mint-unmint/components/mint/mint.tsx index bfb9f09e..89368527 100644 --- a/src/app/components/mint-unmint/components/mint/mint.tsx +++ b/src/app/components/mint-unmint/components/mint/mint.tsx @@ -1,6 +1,6 @@ import { useSelector } from 'react-redux'; -import { HStack, Text } from '@chakra-ui/react'; +import { HStack } from '@chakra-ui/react'; import { RootState } from '@store/index'; import { LockScreen } from '../lock-screen/lock-screen'; @@ -20,7 +20,9 @@ export function Mint(): React.JSX.Element { {[0].includes(mintStep[0]) && } {[1].includes(mintStep[0]) && } - {[2].includes(mintStep[0]) && Wait 24 hours} + {[2].includes(mintStep[0]) && ( + + )} {[3].includes(mintStep[0]) && ( )} diff --git a/src/app/components/mint-unmint/components/progress-timeline/progress-timeline.tsx b/src/app/components/mint-unmint/components/progress-timeline/progress-timeline.tsx index c3d29303..088221f6 100644 --- a/src/app/components/mint-unmint/components/progress-timeline/progress-timeline.tsx +++ b/src/app/components/mint-unmint/components/progress-timeline/progress-timeline.tsx @@ -28,7 +28,7 @@ export function ProgressTimeline({ width={'34%'} isFirstStep /> - + - + vault.uuid === currentStep[1]); const showProcessing = - (flow === 'mint' && currentStep[0] === 3) || (flow === 'unmint' && currentStep[0] === 2); + (flow === 'mint' && currentStep[0] === 2) || (flow === 'unmint' && currentStep[0] === 2); return ( @@ -61,17 +61,17 @@ export function TransactionSummary({ {flowPropertyMap[flow][currentStep[0]].title}: - {showProcessing && ( - <> - - b) {flowPropertyMap[flow][currentStep[0]].subtitle}: - - - - )} + + {/* <> + + b) {flowPropertyMap[flow][currentStep[0]].subtitle}: + + + */} + View vault statuses in the My Vaults tab. diff --git a/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx b/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx index ae19a57a..3515c545 100644 --- a/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx +++ b/src/app/components/mint-unmint/components/walkthrough/walkthrough.tsx @@ -72,11 +72,20 @@ export function Walkthrough({ flow, currentStep }: WalkthroughProps): React.JSX. - Waiting....... + Wait until Bitcoin is locked on-chain and all other validation checks have been + processed.{' '} + + (~1 hour) + ); @@ -85,20 +94,12 @@ export function Walkthrough({ flow, currentStep }: WalkthroughProps): React.JSX. - Wait for Bitcoin to get locked on chain{' '} - - (~1 hour) - - . After 6 confirmations, dlcBTC tokens will appear in your Ethereum Wallet. + Your request is validated and you have successfully minted a{' '} + dlcBTC token. To ensure your dlcBTC tokens @@ -146,7 +147,7 @@ export function Walkthrough({ flow, currentStep }: WalkthroughProps): React.JSX. diff --git a/src/app/hooks/use-observer.ts b/src/app/hooks/use-observer.ts index 0b3bb9d0..6f4532d7 100644 --- a/src/app/hooks/use-observer.ts +++ b/src/app/hooks/use-observer.ts @@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { VaultState } from '@models/vault'; import { RootState } from '@store/index'; import { mintUnmintActions } from '@store/slices/mintunmint/mintunmint.actions'; -import { modalActions } from '@store/slices/modal/modal.actions'; +//import { modalActions } from '@store/slices/modal/modal.actions'; import { UseEthereumReturnType } from './use-ethereum'; @@ -58,13 +58,13 @@ export function useObserver(ethereum: UseEthereumReturnType): void { console.log(`Vault ${vaultUUID} is minted`); await getVault(vaultUUID, VaultState.FUNDED).then(() => { - dispatch(mintUnmintActions.setMintStep([0, vaultUUID])); - dispatch( - modalActions.toggleSuccessfulFlowModalVisibility({ - flow: 'mint', - vaultUUID, - }) - ); + dispatch(mintUnmintActions.setMintStep([3, vaultUUID])); + // dispatch( + // modalActions.toggleSuccessfulFlowModalVisibility({ + // flow: 'mint', + // vaultUUID, + // }) + // ); }); }); @@ -79,12 +79,12 @@ export function useObserver(ethereum: UseEthereumReturnType): void { await getVault(vaultUUID, VaultState.CLOSED).then(() => { dispatch(mintUnmintActions.setUnmintStep([0, vaultUUID])); - dispatch( - modalActions.toggleSuccessfulFlowModalVisibility({ - flow: 'unmint', - vaultUUID, - }) - ); + // dispatch( + // modalActions.toggleSuccessfulFlowModalVisibility({ + // flow: 'unmint', + // vaultUUID, + // }) + // ); }); }); }, [protocolContract, dlcBTCContract, network]);