Skip to content

Commit 672bbff

Browse files
feat: transfer passport nft
1 parent ce615ef commit 672bbff

File tree

20 files changed

+578
-31
lines changed

20 files changed

+578
-31
lines changed

src/components/AccountList/index.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import PassportInfo from '../PassportInfo';
1313
import SelectActivePassportPopup from '../SelectActivePassportPopup';
1414
import { refreshSolanaBalances, storeSystemData } from '../../services/wallets';
1515
import { CoNET_Data } from '../../utils/globals';
16+
import { useNavigate } from 'react-router-dom';
1617

1718
interface AccountListProps {
1819
showMainWallet?: boolean;
@@ -32,6 +33,8 @@ export default function AccountList({ showMainWallet = true, simplifiedView = fa
3233

3334
const { isSelectPassportPopupOpen, setIsSelectPassportPopupOpen } = useDaemonContext();
3435

36+
const navigate = useNavigate();
37+
3538
function toggleAccount(accountAddress: string) {
3639
setOpenAccountList((prev) => (
3740
prev.includes(accountAddress) ? prev.filter((item) => item !== accountAddress) : [...prev, accountAddress]
@@ -206,7 +209,7 @@ export default function AccountList({ showMainWallet = true, simplifiedView = fa
206209
!simplifiedView && (
207210
<div className="cta-buttons" style={{ marginBottom: "0px" }}>
208211
<div className="highlight-1">
209-
<button className='disabled'>
212+
<button onClick={() => navigate('/transfer')}>
210213
<p>Transfer Silent Pass Passport</p>
211214
</button>
212215
</div>

src/pages/Subscription/page-components/FifthStep.tsx renamed to src/components/global-steps/Declined.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export default function FifthStep() {
1+
export default function Declined() {
22
return (
33
<>
44
<span style={{ display: 'block' }}></span>

src/pages/Subscription/page-components/ThirdStep.tsx renamed to src/components/global-steps/Loading.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import LoadingRing from '../../../components/LoadingRing';
1+
import LoadingRing from '../LoadingRing';
22

3-
export default function ThirdStep() {
3+
export default function Loading() {
44
return (
55
<div className="step-container">
66
<LoadingRing />

src/pages/Subscription/index.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,14 @@ import FirstStep from './page-components/FirstStep';
55
import Header from './page-components/Header';
66
import PageFooter from './page-components/Footer';
77
import SecondStep from './page-components/SecondStep';
8-
import ThirdStep from './page-components/ThirdStep';
9-
import FifthStep from './page-components/FifthStep';
108
import FourthStep from './page-components/FourthStep';
119

1210
import './index.css';
1311
import { getOracle, purchasePassport } from '../../services/passportPurchase';
1412
import { useDaemonContext } from '../../providers/DaemonProvider';
15-
16-
export type Step = 1 | 2 | 3 | 4 | 5;
13+
import Loading from '../../components/global-steps/Loading';
14+
import Declined from '../../components/global-steps/Declined';
15+
import { Step } from '../../types/global-types';
1716

1817
export default function Subscription() {
1918
const [step, setStep] = useState<Step>(1);
@@ -142,9 +141,9 @@ export default function Subscription() {
142141

143142
{step === 1 && <FirstStep spInUsd={spInUsd} solInUsd={solInUsd} />} {/* Purchase payment */}
144143
{step === 2 && <SecondStep price={price} gasfee={gasfee} updateCounter={updateCounter} spInUsd={spInUsd} solInUsd={solInUsd} />} {/* Purchase confirmation */}
145-
{step === 3 && <ThirdStep />} {/* Purchase loading */}
144+
{step === 3 && <Loading />} {/* Purchase loading */}
146145
{step === 4 && <FourthStep price={price} gasfee={gasfee} />} {/* Purchase successful */}
147-
{step === 5 && <FifthStep />} {/* Purchase declined */}
146+
{step === 5 && <Declined />} {/* Purchase declined */}
148147

149148
<PageFooter step={step} handleButtonAction={handleButtonAction} isSubmitButtonDisabled={isSubmitButtonDisabled} />
150149
</div>

src/pages/Subscription/page-components/Footer.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1-
import { useNavigate } from 'react-router-dom';
2-
import { Step } from '..';
31

2+
3+
import { Step } from '../../../types/global-types';
44
import { ReactComponent as ProgressIcon } from "../assets/progress-activity.svg";
5-
import { useDaemonContext } from '../../../providers/DaemonProvider';
6-
import { useEffect, useState } from 'react';
7-
import { purchasePassport } from '../../../services/passportPurchase';
85

96
interface FooterProps {
107
step: Step;
@@ -13,7 +10,6 @@ interface FooterProps {
1310
}
1411

1512
export default function Footer({ step, isSubmitButtonDisabled, handleButtonAction }: FooterProps) {
16-
1713
return (
1814
<div className="subscription-footer">
1915
{(step === 2 || step === 3) && <p>Your transaction completion time may vary and can take up to 24 hours. Confirmation of Transaction Hash will display on completion.</p>}

src/pages/Subscription/page-components/Header.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import BackButton from '../../../components/BackButton';
2-
import { Step } from '..';
2+
import { Step } from '../../../types/global-types';
33

44
export default function Header({ step, setStep }: { step: Step, setStep: (step: Step) => void }) {
55
return (
Lines changed: 3 additions & 0 deletions
Loading
Lines changed: 6 additions & 0 deletions
Loading
Lines changed: 6 additions & 0 deletions
Loading
Lines changed: 4 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)