From 1f7fd14a4043c769600bc4f2301ba151a7dc7948 Mon Sep 17 00:00:00 2001 From: Matthew Young Date: Mon, 16 Dec 2024 15:20:38 +1300 Subject: [PATCH 01/10] chore(next-demo): change instances of fpass to pass, and futurepass to pass --- apps/next-demo/src/components/Nav.tsx | 2 +- libs/ui-shared/src/components/AccountCard.tsx | 4 ++-- .../src/components/Assets/AssetTransfer.tsx | 12 ++++++------ .../src/components/Auth/AuthUserSession.tsx | 4 ++-- libs/ui-shared/src/components/Batch/Batch.tsx | 12 ++++++------ .../src/components/CustomComps/CustomBuilder.tsx | 12 ++++++------ .../components/CustomComps/CustomExtrinsic.tsx | 12 ++++++------ .../src/components/EVMComps/CustomEvm.tsx | 6 +++--- .../src/components/EVMComps/Decrement.tsx | 8 ++++---- .../src/components/EVMComps/DecrementFpass.tsx | 4 ++-- .../src/components/EVMComps/Increment.tsx | 8 ++++---- .../src/components/EVMComps/IncrementFpass.tsx | 4 ++-- .../src/components/Erc1155/Erc1155Mint.tsx | 12 ++++++------ .../src/components/Erc1155/FpassErc1155Mint.tsx | 8 ++++---- .../Erc1155/FpassErc1155MintSingle.tsx | 8 ++++---- .../src/components/Erc20/Erc20Transfer.tsx | 12 ++++++------ .../src/components/Erc20/FpassErc20Transfer.tsx | 8 ++++---- .../src/components/Erc721/Erc721Mint.tsx | 12 ++++++------ .../src/components/Erc721/FpassErc721Mint.tsx | 8 ++++---- libs/ui-shared/src/components/EvmModal.tsx | 4 ++-- libs/ui-shared/src/components/Home.tsx | 2 +- .../src/components/NftComps/NftBurn.tsx | 16 ++++++++-------- .../components/NftComps/NftCreateCollection.tsx | 12 ++++++------ .../src/components/NftComps/NftMint.tsx | 12 ++++++------ .../src/components/NftComps/NftPublicMint.tsx | 12 ++++++------ .../components/NftComps/NftPublicMintPrice.tsx | 12 ++++++------ .../src/components/NftComps/NftTransfer.tsx | 16 ++++++++-------- libs/ui-shared/src/components/SendFrom.tsx | 8 ++++---- .../src/components/SftComps/SftBurn.tsx | 12 ++++++------ .../components/SftComps/SftCreateCollection.tsx | 6 +++--- .../src/components/SftComps/SftMint.tsx | 12 ++++++------ .../src/components/SftComps/SftPublicMint.tsx | 8 ++++---- .../src/components/SftComps/SftTransfer.tsx | 12 ++++++------ .../TransferComps/AssetFromFuturePass.tsx | 4 ++-- libs/ui-shared/src/hooks/useEvmSimulateTx.ts | 4 ++-- libs/ui-shared/src/hooks/useEvmTx.ts | 2 +- libs/ui-shared/src/lib/hooksCodeString.ts | 6 +++--- 37 files changed, 158 insertions(+), 158 deletions(-) diff --git a/apps/next-demo/src/components/Nav.tsx b/apps/next-demo/src/components/Nav.tsx index 07235ed..a58b21e 100644 --- a/apps/next-demo/src/components/Nav.tsx +++ b/apps/next-demo/src/components/Nav.tsx @@ -167,7 +167,7 @@ const EvmMenu = ({ onClick={() => setIsOpen && setIsOpen(false)} href="/evm/futurePass-proxy" > - FuturePass Proxy + Pass Proxy diff --git a/libs/ui-shared/src/components/AccountCard.tsx b/libs/ui-shared/src/components/AccountCard.tsx index 2033016..90aed40 100644 --- a/libs/ui-shared/src/components/AccountCard.tsx +++ b/libs/ui-shared/src/components/AccountCard.tsx @@ -41,7 +41,7 @@ const formatter = new Intl.NumberFormat('en-US', options); type AccountCardProps = { title: string; - type: 'eoa' | 'futurepass'; + type: 'eoa' | 'pass'; }; export function AccountCard({ title, type }: AccountCardProps) { @@ -205,7 +205,7 @@ const formatter = new Intl.NumberFormat('en-US', options); type AccountCardProps = { title: string; - type: 'eoa' | 'futurepass'; + type: 'eoa' | 'pass'; }; export function AccountCard({ title, type }: AccountCardProps) { diff --git a/libs/ui-shared/src/components/Assets/AssetTransfer.tsx b/libs/ui-shared/src/components/Assets/AssetTransfer.tsx index 5154cce..98a3e9a 100644 --- a/libs/ui-shared/src/components/Assets/AssetTransfer.tsx +++ b/libs/ui-shared/src/components/Assets/AssetTransfer.tsx @@ -63,8 +63,8 @@ export default function AssetTransfer() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [assetId, setAssetId] = useState(1); @@ -125,7 +125,7 @@ export default function AssetTransfer() { amount: parseInt(valueToSend.toString()), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await builder.addFuturePass(userSession.futurepass); } @@ -310,8 +310,8 @@ export default function AssetTransfer() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [assetId, setAssetId] = useState(1); @@ -372,7 +372,7 @@ export default function AssetTransfer() { amount: parseInt(valueToSend.toString()), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await builder.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/Auth/AuthUserSession.tsx b/libs/ui-shared/src/components/Auth/AuthUserSession.tsx index c01adfb..07251c0 100644 --- a/libs/ui-shared/src/components/Auth/AuthUserSession.tsx +++ b/libs/ui-shared/src/components/Auth/AuthUserSession.tsx @@ -66,7 +66,7 @@ export function AuthUserSession() { )}
-
FuturePass
+
Pass
{userSession?.futurepass}
@@ -148,7 +148,7 @@ export function AuthUserSession() {
)}
-
FuturePass
+
Pass
{userSession?.futurepass}
diff --git a/libs/ui-shared/src/components/Batch/Batch.tsx b/libs/ui-shared/src/components/Batch/Batch.tsx index 7922895..b8c6a87 100644 --- a/libs/ui-shared/src/components/Batch/Batch.tsx +++ b/libs/ui-shared/src/components/Batch/Batch.tsx @@ -93,8 +93,8 @@ export default function Batch() { const getExtrinsic = useGetExtrinsic(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(2); @@ -125,7 +125,7 @@ export default function Batch() { await builder.batchAllWithExtrinsics(extrinsics); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await builder.addFuturePass(userSession.futurepass); } @@ -387,8 +387,8 @@ export default function Batch() { const getExtrinsic = useGetExtrinsic(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(2); @@ -419,7 +419,7 @@ export default function Batch() { await builder.batchAllWithExtrinsics(extrinsics); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await builder.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/CustomComps/CustomBuilder.tsx b/libs/ui-shared/src/components/CustomComps/CustomBuilder.tsx index cd5290c..a9f72d0 100644 --- a/libs/ui-shared/src/components/CustomComps/CustomBuilder.tsx +++ b/libs/ui-shared/src/components/CustomComps/CustomBuilder.tsx @@ -468,7 +468,7 @@ export default function CustomBuilderComp() { <>
@@ -975,7 +975,7 @@ export default function CustomBuilderComp() { <>
diff --git a/libs/ui-shared/src/components/CustomComps/CustomExtrinsic.tsx b/libs/ui-shared/src/components/CustomComps/CustomExtrinsic.tsx index 116682c..a99909d 100644 --- a/libs/ui-shared/src/components/CustomComps/CustomExtrinsic.tsx +++ b/libs/ui-shared/src/components/CustomComps/CustomExtrinsic.tsx @@ -56,8 +56,8 @@ export default function CustomExtrinsic() { const [collectionId, setCollectionId] = useState(709732); const [mintQty, setMintQty] = useState(1); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(1); @@ -82,7 +82,7 @@ export default function CustomExtrinsic() { userSession.eoa ).fromExtrinsic(extrinsic); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await builder.addFuturePass(userSession.futurepass); } @@ -255,8 +255,8 @@ export default function CustomExtrinsic() { const [collectionId, setCollectionId] = useState(709732); const [mintQty, setMintQty] = useState(1); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(1); @@ -281,7 +281,7 @@ export default function CustomExtrinsic() { userSession.eoa ).fromExtrinsic(extrinsic); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await builder.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/EVMComps/CustomEvm.tsx b/libs/ui-shared/src/components/EVMComps/CustomEvm.tsx index 2f86867..009f8bd 100644 --- a/libs/ui-shared/src/components/EVMComps/CustomEvm.tsx +++ b/libs/ui-shared/src/components/EVMComps/CustomEvm.tsx @@ -246,7 +246,7 @@ export default function CustomEvm() {
diff --git a/libs/ui-shared/src/components/EVMComps/Decrement.tsx b/libs/ui-shared/src/components/EVMComps/Decrement.tsx index 464e20e..3025be2 100644 --- a/libs/ui-shared/src/components/EVMComps/Decrement.tsx +++ b/libs/ui-shared/src/components/EVMComps/Decrement.tsx @@ -49,8 +49,8 @@ export default function Decrement() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(1); @@ -236,8 +236,8 @@ export default function Decrement() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(1); diff --git a/libs/ui-shared/src/components/EVMComps/DecrementFpass.tsx b/libs/ui-shared/src/components/EVMComps/DecrementFpass.tsx index c14c62b..e5d8b54 100644 --- a/libs/ui-shared/src/components/EVMComps/DecrementFpass.tsx +++ b/libs/ui-shared/src/components/EVMComps/DecrementFpass.tsx @@ -91,7 +91,7 @@ export default function DecrementFPass() {
-

Decrement Counter From FuturePass

+

Decrement Counter From Pass

{shortAddress(userSession?.futurepass ?? '')} @@ -185,7 +185,7 @@ export default function DecrementFPass() {
-

Decrement Counter From FuturePass

+

Decrement Counter From Pass

{shortAddress(userSession?.futurepass ?? '')} diff --git a/libs/ui-shared/src/components/EVMComps/Increment.tsx b/libs/ui-shared/src/components/EVMComps/Increment.tsx index 05044b5..e230cc6 100644 --- a/libs/ui-shared/src/components/EVMComps/Increment.tsx +++ b/libs/ui-shared/src/components/EVMComps/Increment.tsx @@ -47,8 +47,8 @@ export default function Increment() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(1); @@ -234,8 +234,8 @@ export default function Increment() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(1); diff --git a/libs/ui-shared/src/components/EVMComps/IncrementFpass.tsx b/libs/ui-shared/src/components/EVMComps/IncrementFpass.tsx index 9015b01..a4e8c6f 100644 --- a/libs/ui-shared/src/components/EVMComps/IncrementFpass.tsx +++ b/libs/ui-shared/src/components/EVMComps/IncrementFpass.tsx @@ -89,7 +89,7 @@ export default function IncrementFPass() {
-

Increment Counter From FuturePass

+

Increment Counter From Pass

{shortAddress(userSession?.futurepass ?? '')} @@ -183,7 +183,7 @@ export default function IncrementFPass() {
-

Increment Counter From FuturePass

+

Increment Counter From Pass

{shortAddress(userSession?.futurepass ?? '')} diff --git a/libs/ui-shared/src/components/Erc1155/Erc1155Mint.tsx b/libs/ui-shared/src/components/Erc1155/Erc1155Mint.tsx index 69416cc..8946e0a 100644 --- a/libs/ui-shared/src/components/Erc1155/Erc1155Mint.tsx +++ b/libs/ui-shared/src/components/Erc1155/Erc1155Mint.tsx @@ -50,8 +50,8 @@ export default function Erc1155Mint() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetIdDisabled, setFeeAssetIdDisabled] = useState(false); @@ -102,7 +102,7 @@ export default function Erc1155Mint() { ]); useEffect(() => { - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { setFeeAssetId(2); setFeeAssetIdDisabled(true); } else { @@ -333,8 +333,8 @@ export default function Erc1155Mint() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetIdDisabled, setFeeAssetIdDisabled] = useState(false); @@ -385,7 +385,7 @@ export default function Erc1155Mint() { ]); useEffect(() => { - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { setFeeAssetId(2); setFeeAssetIdDisabled(true); } else { diff --git a/libs/ui-shared/src/components/Erc1155/FpassErc1155Mint.tsx b/libs/ui-shared/src/components/Erc1155/FpassErc1155Mint.tsx index e10b6a2..d5b48db 100644 --- a/libs/ui-shared/src/components/Erc1155/FpassErc1155Mint.tsx +++ b/libs/ui-shared/src/components/Erc1155/FpassErc1155Mint.tsx @@ -37,7 +37,7 @@ import { EvmCollectionInfo } from '../EvmCollectionInfo'; export default function FpassErc1155Mint() { const { userSession } = useAuth(); - const fromWallet = 'fpass'; + const fromWallet = 'pass'; const [collectionId, setCollectionId] = useState(834660); const [collectionContract, setCollectionContract] = useState<\`0x$\{string}\`>( @@ -230,7 +230,7 @@ export default function FpassErc1155Mint() { }} disabled={buttonDisabled} > - Start FuturePass Proxy Batch Mint + Start Pass Proxy Batch Mint
@@ -263,7 +263,7 @@ export default function FpassErc1155Mint() { export default function FpassErc1155Mint() { const { userSession } = useAuth(); - const fromWallet = 'fpass'; + const fromWallet = 'pass'; const [collectionId, setCollectionId] = useState(834660); const [collectionContract, setCollectionContract] = useState<`0x${string}`>( @@ -456,7 +456,7 @@ export default function FpassErc1155Mint() { }} disabled={buttonDisabled} > - Start FuturePass Proxy Batch Mint + Start Pass Proxy Batch Mint
diff --git a/libs/ui-shared/src/components/Erc1155/FpassErc1155MintSingle.tsx b/libs/ui-shared/src/components/Erc1155/FpassErc1155MintSingle.tsx index 68b4758..fbb68e1 100644 --- a/libs/ui-shared/src/components/Erc1155/FpassErc1155MintSingle.tsx +++ b/libs/ui-shared/src/components/Erc1155/FpassErc1155MintSingle.tsx @@ -36,7 +36,7 @@ import { EvmCollectionInfo } from '../EvmCollectionInfo'; export default function FpassErc1155MintSingle() { const { userSession } = useAuth(); - const fromWallet = 'fpass'; + const fromWallet = 'pass'; const [collectionId, setCollectionId] = useState(834660); const [collectionContract, setCollectionContract] = useState<\`0x$\{string}\`>( @@ -196,7 +196,7 @@ export default function FpassErc1155MintSingle() { }} disabled={buttonDisabled} > - Start FuturePass Proxy Single Mint + Start Pass Proxy Single Mint
@@ -225,7 +225,7 @@ export default function FpassErc1155MintSingle() { export default function FpassErc1155MintSingle() { const { userSession } = useAuth(); - const fromWallet = 'fpass'; + const fromWallet = 'pass'; const [collectionId, setCollectionId] = useState(834660); const [collectionContract, setCollectionContract] = useState<`0x${string}`>( @@ -385,7 +385,7 @@ export default function FpassErc1155MintSingle() { }} disabled={buttonDisabled} > - Start FuturePass Proxy Single Mint + Start Pass Proxy Single Mint
diff --git a/libs/ui-shared/src/components/Erc20/Erc20Transfer.tsx b/libs/ui-shared/src/components/Erc20/Erc20Transfer.tsx index 2e19e9a..ee684ed 100644 --- a/libs/ui-shared/src/components/Erc20/Erc20Transfer.tsx +++ b/libs/ui-shared/src/components/Erc20/Erc20Transfer.tsx @@ -50,8 +50,8 @@ export default function Erc20Transfer() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetIdDisabled, setFeeAssetIdDisabled] = useState(false); const [assetId, setAssetId] = useState(1); @@ -107,7 +107,7 @@ export default function Erc20Transfer() { ); useEffect(() => { - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { setFeeAssetId(2); setFeeAssetIdDisabled(true); } else { @@ -286,8 +286,8 @@ export default function Erc20Transfer() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetIdDisabled, setFeeAssetIdDisabled] = useState(false); const [assetId, setAssetId] = useState(1); @@ -343,7 +343,7 @@ export default function Erc20Transfer() { ); useEffect(() => { - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { setFeeAssetId(2); setFeeAssetIdDisabled(true); } else { diff --git a/libs/ui-shared/src/components/Erc20/FpassErc20Transfer.tsx b/libs/ui-shared/src/components/Erc20/FpassErc20Transfer.tsx index 3c82576..b6fb035 100644 --- a/libs/ui-shared/src/components/Erc20/FpassErc20Transfer.tsx +++ b/libs/ui-shared/src/components/Erc20/FpassErc20Transfer.tsx @@ -45,7 +45,7 @@ export default function FpassErc20Transfer() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); - const fromWallet = 'fpass'; + const fromWallet = 'pass'; const [assetId, setAssetId] = useState(1); const [assetContract, setAssetContract] = useState<\`0x\${string}\`>( @@ -191,7 +191,7 @@ export default function FpassErc20Transfer() { }} disabled={buttonDisabled} > - Start FuturePass Proxy Transfer + Start Pass Proxy Transfer
@@ -225,7 +225,7 @@ export default function FpassErc20Transfer() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); - const fromWallet = 'fpass'; + const fromWallet = 'pass'; const [assetId, setAssetId] = useState(1); const [assetContract, setAssetContract] = useState<`0x${string}`>( @@ -371,7 +371,7 @@ export default function FpassErc20Transfer() { }} disabled={buttonDisabled} > - Start FuturePass Proxy Transfer + Start Pass Proxy Transfer
diff --git a/libs/ui-shared/src/components/Erc721/Erc721Mint.tsx b/libs/ui-shared/src/components/Erc721/Erc721Mint.tsx index 35f633b..ec1ef1a 100644 --- a/libs/ui-shared/src/components/Erc721/Erc721Mint.tsx +++ b/libs/ui-shared/src/components/Erc721/Erc721Mint.tsx @@ -50,8 +50,8 @@ export default function Erc721Mint() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetIdDisabled, setFeeAssetIdDisabled] = useState(false); @@ -99,7 +99,7 @@ export default function Erc721Mint() { ]); useEffect(() => { - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { setFeeAssetId(2); setFeeAssetIdDisabled(true); } else { @@ -268,8 +268,8 @@ export default function Erc721Mint() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetIdDisabled, setFeeAssetIdDisabled] = useState(false); @@ -317,7 +317,7 @@ export default function Erc721Mint() { ]); useEffect(() => { - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { setFeeAssetId(2); setFeeAssetIdDisabled(true); } else { diff --git a/libs/ui-shared/src/components/Erc721/FpassErc721Mint.tsx b/libs/ui-shared/src/components/Erc721/FpassErc721Mint.tsx index 1208e44..df97a1f 100644 --- a/libs/ui-shared/src/components/Erc721/FpassErc721Mint.tsx +++ b/libs/ui-shared/src/components/Erc721/FpassErc721Mint.tsx @@ -166,7 +166,7 @@ export default function FpassErc721Mint() { }} disabled={buttonDisabled} > - Start FuturePass Proxy Mint + Start Pass Proxy Mint @@ -174,7 +174,7 @@ export default function FpassErc721Mint() { {showDialog && ( - Start FuturePass Proxy Mint + Start Pass Proxy Mint @@ -333,7 +333,7 @@ export default function FpassErc721Mint() { {showDialog && ( void; - fromWallet: 'eoa' | 'fpass'; + fromWallet: 'eoa' | 'pass'; contract: Address; abi: Abi; functionName: string; @@ -139,7 +139,7 @@ export function EvmModal({ chainId === userSession.chainId && !!contract && !!evmData && - fromWallet === 'fpass' && + fromWallet === 'pass' && !isSimulateError, }); diff --git a/libs/ui-shared/src/components/Home.tsx b/libs/ui-shared/src/components/Home.tsx index f843ef9..5eaef00 100644 --- a/libs/ui-shared/src/components/Home.tsx +++ b/libs/ui-shared/src/components/Home.tsx @@ -52,7 +52,7 @@ export default function Home({ title }: { title: string }) {
{shouldShowEoa && } - +
)} diff --git a/libs/ui-shared/src/components/NftComps/NftBurn.tsx b/libs/ui-shared/src/components/NftComps/NftBurn.tsx index 965eeef..a5aad76 100644 --- a/libs/ui-shared/src/components/NftComps/NftBurn.tsx +++ b/libs/ui-shared/src/components/NftComps/NftBurn.tsx @@ -56,8 +56,8 @@ export default function NftBurn() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const { @@ -66,7 +66,7 @@ export default function NftBurn() { isLoading, } = useGetTokens( userSession - ? fromWallet === 'fpass' + ? fromWallet === 'pass' ? userSession?.futurepass : userSession?.eoa : '', @@ -103,7 +103,7 @@ export default function NftBurn() { serialNumber: Number(serialNumber), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -273,8 +273,8 @@ export default function NftBurn() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const { @@ -283,7 +283,7 @@ export default function NftBurn() { isLoading, } = useGetTokens( userSession - ? fromWallet === 'fpass' + ? fromWallet === 'pass' ? userSession?.futurepass : userSession?.eoa : '', @@ -320,7 +320,7 @@ export default function NftBurn() { serialNumber: Number(serialNumber), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/NftComps/NftCreateCollection.tsx b/libs/ui-shared/src/components/NftComps/NftCreateCollection.tsx index 571a7c0..4574d5d 100644 --- a/libs/ui-shared/src/components/NftComps/NftCreateCollection.tsx +++ b/libs/ui-shared/src/components/NftComps/NftCreateCollection.tsx @@ -67,8 +67,8 @@ export default function NftCreateCollection() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionName, setCollectionName] = useState(''); @@ -138,7 +138,7 @@ export default function NftCreateCollection() { crossChain, }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -515,8 +515,8 @@ export default function NftCreateCollection() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionName, setCollectionName] = useState(''); @@ -586,7 +586,7 @@ export default function NftCreateCollection() { crossChain, }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/NftComps/NftMint.tsx b/libs/ui-shared/src/components/NftComps/NftMint.tsx index 7d971b2..a8ded4f 100644 --- a/libs/ui-shared/src/components/NftComps/NftMint.tsx +++ b/libs/ui-shared/src/components/NftComps/NftMint.tsx @@ -53,8 +53,8 @@ export default function NftMint() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionId, setCollectionId] = useState(709732); @@ -86,7 +86,7 @@ export default function NftMint() { quantity: mintQty, }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -250,8 +250,8 @@ export default function NftMint() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionId, setCollectionId] = useState(709732); @@ -283,7 +283,7 @@ export default function NftMint() { quantity: mintQty, }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/NftComps/NftPublicMint.tsx b/libs/ui-shared/src/components/NftComps/NftPublicMint.tsx index 5ac5cef..6dc0db8 100644 --- a/libs/ui-shared/src/components/NftComps/NftPublicMint.tsx +++ b/libs/ui-shared/src/components/NftComps/NftPublicMint.tsx @@ -69,8 +69,8 @@ export default function NftPublicMint() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(2); @@ -88,7 +88,7 @@ export default function NftPublicMint() { collectionId ).togglePublicMint(publicMint); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -265,8 +265,8 @@ export default function NftPublicMint() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(2); @@ -284,7 +284,7 @@ export default function NftPublicMint() { collectionId ).togglePublicMint(publicMint); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/NftComps/NftPublicMintPrice.tsx b/libs/ui-shared/src/components/NftComps/NftPublicMintPrice.tsx index 6b10eee..4c22a0b 100644 --- a/libs/ui-shared/src/components/NftComps/NftPublicMintPrice.tsx +++ b/libs/ui-shared/src/components/NftComps/NftPublicMintPrice.tsx @@ -81,8 +81,8 @@ export default function NftPublicMint() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(2); @@ -104,7 +104,7 @@ export default function NftPublicMint() { : { assetId: 0, price: BigInt(0) } ); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -354,8 +354,8 @@ export default function NftPublicMint() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(2); @@ -377,7 +377,7 @@ export default function NftPublicMint() { : { assetId: 0, price: BigInt(0) } ); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/NftComps/NftTransfer.tsx b/libs/ui-shared/src/components/NftComps/NftTransfer.tsx index 334ff91..26f0552 100644 --- a/libs/ui-shared/src/components/NftComps/NftTransfer.tsx +++ b/libs/ui-shared/src/components/NftComps/NftTransfer.tsx @@ -57,8 +57,8 @@ export default function NftTransfer() { const [collectionId, setCollectionId] = useState(709732); const debouncedCollectionId = useDebounce(collectionId, 500); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const { @@ -67,7 +67,7 @@ export default function NftTransfer() { isLoading, } = useGetTokens( userSession - ? fromWallet === 'fpass' + ? fromWallet === 'pass' ? userSession?.futurepass : userSession?.eoa : '', @@ -116,7 +116,7 @@ export default function NftTransfer() { serialNumbers: [Number(serialNumber)], }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -295,8 +295,8 @@ export default function NftTransfer() { const [collectionId, setCollectionId] = useState(709732); const debouncedCollectionId = useDebounce(collectionId, 500); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const { @@ -305,7 +305,7 @@ export default function NftTransfer() { isLoading, } = useGetTokens( userSession - ? fromWallet === 'fpass' + ? fromWallet === 'pass' ? userSession?.futurepass : userSession?.eoa : '', @@ -354,7 +354,7 @@ export default function NftTransfer() { serialNumbers: [Number(serialNumber)], }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/SendFrom.tsx b/libs/ui-shared/src/components/SendFrom.tsx index ebea8ea..93a51a6 100644 --- a/libs/ui-shared/src/components/SendFrom.tsx +++ b/libs/ui-shared/src/components/SendFrom.tsx @@ -5,8 +5,8 @@ import React from 'react'; type SendFromProps = { shouldShowEoa?: boolean; - fromWallet: 'eoa' | 'fpass'; - setFromWallet: (wallet: 'eoa' | 'fpass') => void; + fromWallet: 'eoa' | 'pass'; + setFromWallet: (wallet: 'eoa' | 'pass') => void; resetState?: () => void; disable?: boolean; setAddressToSend?: (address: string) => void; @@ -35,7 +35,7 @@ export default function SendFrom({ disabled={disable} onChange={e => { resetState && resetState(); - setFromWallet(e.target.value as 'eoa' | 'fpass'); + setFromWallet(e.target.value as 'eoa' | 'pass'); setAddressToSend && setAddressToSend( userSession @@ -48,7 +48,7 @@ export default function SendFrom({ }} > {shouldShowEoa && } - + ); diff --git a/libs/ui-shared/src/components/SftComps/SftBurn.tsx b/libs/ui-shared/src/components/SftComps/SftBurn.tsx index b72f255..7ec60d9 100644 --- a/libs/ui-shared/src/components/SftComps/SftBurn.tsx +++ b/libs/ui-shared/src/components/SftComps/SftBurn.tsx @@ -53,8 +53,8 @@ export default function SftBurn() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionId, setCollectionId] = useState(834660); @@ -96,7 +96,7 @@ export default function SftBurn() { })), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -315,8 +315,8 @@ export default function SftBurn() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionId, setCollectionId] = useState(834660); @@ -355,7 +355,7 @@ export default function SftBurn() { })), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/SftComps/SftCreateCollection.tsx b/libs/ui-shared/src/components/SftComps/SftCreateCollection.tsx index 7a6fa96..ba3e78b 100644 --- a/libs/ui-shared/src/components/SftComps/SftCreateCollection.tsx +++ b/libs/ui-shared/src/components/SftComps/SftCreateCollection.tsx @@ -42,8 +42,8 @@ export default function NftCreateCollection() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionName, setCollectionName] = useState(''); @@ -101,7 +101,7 @@ export default function NftCreateCollection() { royalties, }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await sft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/SftComps/SftMint.tsx b/libs/ui-shared/src/components/SftComps/SftMint.tsx index 04fd8dc..76c1a51 100644 --- a/libs/ui-shared/src/components/SftComps/SftMint.tsx +++ b/libs/ui-shared/src/components/SftComps/SftMint.tsx @@ -55,8 +55,8 @@ export default function SftMint() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionId, setCollectionId] = useState(834660); @@ -99,7 +99,7 @@ export default function SftMint() { })), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -330,8 +330,8 @@ export default function SftMint() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [collectionId, setCollectionId] = useState(834660); @@ -374,7 +374,7 @@ export default function SftMint() { })), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/SftComps/SftPublicMint.tsx b/libs/ui-shared/src/components/SftComps/SftPublicMint.tsx index d509023..d128202 100644 --- a/libs/ui-shared/src/components/SftComps/SftPublicMint.tsx +++ b/libs/ui-shared/src/components/SftComps/SftPublicMint.tsx @@ -38,8 +38,8 @@ export default function NftBurn() { const shouldShowEoa = useShouldShowEoa(); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const { @@ -48,7 +48,7 @@ export default function NftBurn() { isLoading, } = useGetTokens( userSession - ? fromWallet === 'fpass' + ? fromWallet === 'pass' ? userSession?.futurepass : userSession?.eoa : '', @@ -85,7 +85,7 @@ export default function NftBurn() { serialNumber: Number(serialNumber), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/SftComps/SftTransfer.tsx b/libs/ui-shared/src/components/SftComps/SftTransfer.tsx index 9cf99f6..71fd8c8 100644 --- a/libs/ui-shared/src/components/SftComps/SftTransfer.tsx +++ b/libs/ui-shared/src/components/SftComps/SftTransfer.tsx @@ -58,8 +58,8 @@ export default function NftTransfer() { const [collectionId, setCollectionId] = useState(834660); const collectionIdDebounced = useDebounce(collectionId, 500); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(2); @@ -114,7 +114,7 @@ export default function NftTransfer() { })), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } @@ -359,8 +359,8 @@ export default function NftTransfer() { const [collectionId, setCollectionId] = useState(834660); const collectionIdDebounced = useDebounce(collectionId, 500); - const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>( - shouldShowEoa ? 'eoa' : 'fpass' + const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>( + shouldShowEoa ? 'eoa' : 'pass' ); const [feeAssetId, setFeeAssetId] = useState(2); @@ -415,7 +415,7 @@ export default function NftTransfer() { })), }); - if (fromWallet === 'fpass') { + if (fromWallet === 'pass') { if (feeAssetId === 2) { await nft.addFuturePass(userSession.futurepass); } diff --git a/libs/ui-shared/src/components/TransferComps/AssetFromFuturePass.tsx b/libs/ui-shared/src/components/TransferComps/AssetFromFuturePass.tsx index 70e0d5c..c7b6777 100644 --- a/libs/ui-shared/src/components/TransferComps/AssetFromFuturePass.tsx +++ b/libs/ui-shared/src/components/TransferComps/AssetFromFuturePass.tsx @@ -97,7 +97,7 @@ export default function AssetFromFuturePass() {
-

Send From FuturePass

+

Send From Pass

{shortAddress(userSession?.futurepass ?? '')} @@ -234,7 +234,7 @@ export default function AssetFromFuturePass() {
-

Send From FuturePass

+

Send From Pass

{shortAddress(userSession?.futurepass ?? '')} diff --git a/libs/ui-shared/src/hooks/useEvmSimulateTx.ts b/libs/ui-shared/src/hooks/useEvmSimulateTx.ts index 3aa6c8f..135c285 100644 --- a/libs/ui-shared/src/hooks/useEvmSimulateTx.ts +++ b/libs/ui-shared/src/hooks/useEvmSimulateTx.ts @@ -22,7 +22,7 @@ export function useEvmSimulateTx({ feeAssetId = 2, slippage, }: { - fromWallet: 'eoa' | 'fpass'; + fromWallet: 'eoa' | 'pass'; account: Address; address: Address; abi: Abi; @@ -134,7 +134,7 @@ export function useEvmSimulateTx({ if (fromWallet === 'eoa' && feeAssetId === 2 && !eoaIsLoaded) { fetchEoa(); } - if (fromWallet === 'fpass' && !fpassIsLoaded) { + if (fromWallet === 'pass' && !fpassIsLoaded) { fetchFpass(); } if (fromWallet === 'eoa' && feeAssetId !== 2 && !feeProxyIsLoaded) { diff --git a/libs/ui-shared/src/hooks/useEvmTx.ts b/libs/ui-shared/src/hooks/useEvmTx.ts index 6e6e262..7af406a 100644 --- a/libs/ui-shared/src/hooks/useEvmTx.ts +++ b/libs/ui-shared/src/hooks/useEvmTx.ts @@ -80,7 +80,7 @@ export function useEvmTx() { throw new Error('Address is required'); } - if (fromWallet === 'fpass' && gasToken === 2) { + if (fromWallet === 'pass' && gasToken === 2) { const futurePassCall = encodeFunctionData({ abi, functionName, diff --git a/libs/ui-shared/src/lib/hooksCodeString.ts b/libs/ui-shared/src/lib/hooksCodeString.ts index 0ce12b4..d8cf694 100644 --- a/libs/ui-shared/src/lib/hooksCodeString.ts +++ b/libs/ui-shared/src/lib/hooksCodeString.ts @@ -803,7 +803,7 @@ export function useEvmSimulateTx({ feeAssetId = 2, slippage, }: { - fromWallet: 'eoa' | 'fpass'; + fromWallet: 'eoa' | 'pass'; account: Address; address: Address; abi: Abi; @@ -915,7 +915,7 @@ export function useEvmSimulateTx({ if (fromWallet === 'eoa' && feeAssetId === 2 && !eoaIsLoaded) { fetchEoa(); } - if (fromWallet === 'fpass' && !fpassIsLoaded) { + if (fromWallet === 'pass' && !fpassIsLoaded) { fetchFpass(); } if (fromWallet === 'eoa' && feeAssetId !== 2 && !feeProxyIsLoaded) { @@ -1045,7 +1045,7 @@ export function useEvmTx() { throw new Error('Address is required'); } - if (fromWallet === 'fpass' && gasToken === 2) { + if (fromWallet === 'pass' && gasToken === 2) { const futurePassCall = encodeFunctionData({ abi, functionName, From 2eb53975d07efebec7619705b5dad7955e77f1f3 Mon Sep 17 00:00:00 2001 From: Matthew Young Date: Mon, 16 Dec 2024 16:15:00 +1300 Subject: [PATCH 02/10] chore: update to latest auth-ui version --- package-lock.json | 415 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 6 +- 2 files changed, 396 insertions(+), 25 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4a62d46..41233ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@futureverse/asset-register-react": "latest", "@futureverse/auth": "latest", "@futureverse/auth-react": "latest", - "@futureverse/auth-ui": "latest", + "@futureverse/auth-ui": "^0.6.3", "@futureverse/signer": "latest", "@futureverse/transact": "latest", "@futureverse/transact-react": "latest", @@ -2992,6 +2992,109 @@ "node": ">=14" } }, + "node_modules/@formatjs/ecma402-abstract": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz", + "integrity": "sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==", + "license": "MIT", + "peer": true, + "dependencies": { + "@formatjs/fast-memoize": "2.2.3", + "@formatjs/intl-localematcher": "0.5.8", + "tslib": "2" + } + }, + "node_modules/@formatjs/fast-memoize": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.3.tgz", + "integrity": "sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==", + "license": "MIT", + "peer": true, + "dependencies": { + "tslib": "2" + } + }, + "node_modules/@formatjs/icu-messageformat-parser": { + "version": "2.9.4", + "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.4.tgz", + "integrity": "sha512-Tbvp5a9IWuxUcpWNIW6GlMQYEc4rwNHR259uUFoKWNN1jM9obf9Ul0e+7r7MvFOBNcN+13K7NuKCKqQiAn1QEg==", + "license": "MIT", + "peer": true, + "dependencies": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/icu-skeleton-parser": "1.8.8", + "tslib": "2" + } + }, + "node_modules/@formatjs/icu-skeleton-parser": { + "version": "1.8.8", + "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.8.tgz", + "integrity": "sha512-vHwK3piXwamFcx5YQdCdJxUQ1WdTl6ANclt5xba5zLGDv5Bsur7qz8AD7BevaKxITwpgDeU0u8My3AIibW9ywA==", + "license": "MIT", + "peer": true, + "dependencies": { + "@formatjs/ecma402-abstract": "2.2.4", + "tslib": "2" + } + }, + "node_modules/@formatjs/intl": { + "version": "2.10.15", + "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.15.tgz", + "integrity": "sha512-i6+xVqT+6KCz7nBfk4ybMXmbKO36tKvbMKtgFz9KV+8idYFyFbfwKooYk8kGjyA5+T5f1kEPQM5IDLXucTAQ9g==", + "license": "MIT", + "peer": true, + "dependencies": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/fast-memoize": "2.2.3", + "@formatjs/icu-messageformat-parser": "2.9.4", + "@formatjs/intl-displaynames": "6.8.5", + "@formatjs/intl-listformat": "7.7.5", + "intl-messageformat": "10.7.7", + "tslib": "2" + }, + "peerDependencies": { + "typescript": "^4.7 || 5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@formatjs/intl-displaynames": { + "version": "6.8.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.8.5.tgz", + "integrity": "sha512-85b+GdAKCsleS6cqVxf/Aw/uBd+20EM0wDpgaxzHo3RIR3bxF4xCJqH/Grbzx8CXurTgDDZHPdPdwJC+May41w==", + "license": "MIT", + "peer": true, + "dependencies": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/intl-localematcher": "0.5.8", + "tslib": "2" + } + }, + "node_modules/@formatjs/intl-listformat": { + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.7.5.tgz", + "integrity": "sha512-Wzes10SMNeYgnxYiKsda4rnHP3Q3II4XT2tZyOgnH5fWuHDtIkceuWlRQNsvrI3uiwP4hLqp2XdQTCsfkhXulg==", + "license": "MIT", + "peer": true, + "dependencies": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/intl-localematcher": "0.5.8", + "tslib": "2" + } + }, + "node_modules/@formatjs/intl-localematcher": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz", + "integrity": "sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==", + "license": "MIT", + "peer": true, + "dependencies": { + "tslib": "2" + } + }, "node_modules/@futureverse/artm": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@futureverse/artm/-/artm-2.2.5.tgz", @@ -3065,16 +3168,50 @@ } }, "node_modules/@futureverse/auth-ui": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@futureverse/auth-ui/-/auth-ui-0.5.1.tgz", - "integrity": "sha512-R0mAFW0Vk3Gsdx/wz6u9s2q/lRhawXUJsZSOltbu+Zoe0foUCqZj0LsVmYv8RGBUzTKy6UOQjxtVI1bOv/VRzA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@futureverse/auth-ui/-/auth-ui-0.6.3.tgz", + "integrity": "sha512-tJNXd/HWl7m+vYigklTYzCD4wdVsQBYCZeABjdMTI2y9FoPJyYPsw9A/LI5wtf0YzuWh1M/43MYl7pAKXj55ZQ==", "dependencies": { - "@futureverse/auth": "^3.3.9", - "@futureverse/wagmi-connectors": "^2.7.7", + "@futureverse/auth": "^4.0.0", + "@futureverse/wagmi-connectors": "^3.0.1", "wagmi": "^2.10.9" }, "peerDependencies": { - "react": ">=18" + "react": ">=18", + "react-intl": "^6.8.7" + } + }, + "node_modules/@futureverse/auth-ui/node_modules/@futureverse/auth": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@futureverse/auth/-/auth-4.0.0.tgz", + "integrity": "sha512-vhLoMZOv0+7jdDdbmfFWyAazrdvbQew7silhrKwKV8QT3yGpYcP/JgDYdmplVEGujbccROnYiPWrnMK+5DgWqw==", + "dependencies": { + "@futureverse/signer": "1.5.0", + "cookie-storage": "^6.1.0", + "jwt-decode": "^4.0.0", + "oidc-client-ts": "^3.0.1", + "zod": "^3.23.8" + }, + "peerDependencies": { + "viem": "2.x" + } + }, + "node_modules/@futureverse/auth-ui/node_modules/@futureverse/wagmi-connectors": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@futureverse/wagmi-connectors/-/wagmi-connectors-3.0.1.tgz", + "integrity": "sha512-izapSby6bVY0C7Ig+vXnKAZE97TKwbaCh0dmmT/6ET8uUMMo6obFAOUsXX7abLq1OBXhKMZwUB9BlVGgwiEdDA==", + "dependencies": { + "@futureverse/auth": "4.0.0", + "@futureverse/signer": "1.5.0", + "@futureverse/transact": "0.5.1", + "@polkadot/api": "^10.11.1", + "@therootnetwork/api": "^1.0.9", + "xumm": "^1.7.7" + }, + "peerDependencies": { + "@wagmi/connectors": "^5.1.8", + "@wagmi/core": "^2.13.0", + "viem": "2.x" } }, "node_modules/@futureverse/signer": { @@ -11649,6 +11786,17 @@ "@types/unist": "^2" } }, + "node_modules/@types/hoist-non-react-statics": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz", + "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==", + "license": "MIT", + "peer": true, + "dependencies": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, "node_modules/@types/http-cache-semantics": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", @@ -11831,8 +11979,7 @@ "node_modules/@types/prop-types": { "version": "15.7.13", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz", - "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==", - "devOptional": true + "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==" }, "node_modules/@types/qs": { "version": "6.9.17", @@ -11850,7 +11997,6 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz", "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==", - "devOptional": true, "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" @@ -17624,8 +17770,7 @@ "node_modules/csstype": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "devOptional": true + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/d": { "version": "1.0.2", @@ -22409,6 +22554,23 @@ "minimalistic-crypto-utils": "^1.0.1" } }, + "node_modules/hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "react-is": "^16.7.0" + } + }, + "node_modules/hoist-non-react-statics/node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "license": "MIT", + "peer": true + }, "node_modules/homedir-polyfill": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", @@ -23060,6 +23222,19 @@ "node": ">=10.13.0" } }, + "node_modules/intl-messageformat": { + "version": "10.7.7", + "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.7.tgz", + "integrity": "sha512-F134jIoeYMro/3I0h08D0Yt4N9o9pjddU/4IIxMMURqbAtI2wu70X8hvG1V48W49zXHXv3RKSF/po+0fDfsGjA==", + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/fast-memoize": "2.2.3", + "@formatjs/icu-messageformat-parser": "2.9.4", + "tslib": "2" + } + }, "node_modules/invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -31455,6 +31630,34 @@ "react": "^18.3.1" } }, + "node_modules/react-intl": { + "version": "6.8.9", + "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.8.9.tgz", + "integrity": "sha512-TUfj5E7lyUDvz/GtovC9OMh441kBr08rtIbgh3p0R8iF3hVY+V2W9Am7rb8BpJ/29BH1utJOqOOhmvEVh3GfZg==", + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/icu-messageformat-parser": "2.9.4", + "@formatjs/intl": "2.10.15", + "@formatjs/intl-displaynames": "6.8.5", + "@formatjs/intl-listformat": "7.7.5", + "@types/hoist-non-react-statics": "3", + "@types/react": "16 || 17 || 18", + "hoist-non-react-statics": "3", + "intl-messageformat": "10.7.7", + "tslib": "2" + }, + "peerDependencies": { + "react": "^16.6.0 || 17 || 18", + "typescript": "^4.7 || 5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -39909,6 +40112,93 @@ "micro-ftch": "^0.3.1" } }, + "@formatjs/ecma402-abstract": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.2.4.tgz", + "integrity": "sha512-lFyiQDVvSbQOpU+WFd//ILolGj4UgA/qXrKeZxdV14uKiAUiPAtX6XAn7WBCRi7Mx6I7EybM9E5yYn4BIpZWYg==", + "peer": true, + "requires": { + "@formatjs/fast-memoize": "2.2.3", + "@formatjs/intl-localematcher": "0.5.8", + "tslib": "2" + } + }, + "@formatjs/fast-memoize": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.3.tgz", + "integrity": "sha512-3jeJ+HyOfu8osl3GNSL4vVHUuWFXR03Iz9jjgI7RwjG6ysu/Ymdr0JRCPHfF5yGbTE6JCrd63EpvX1/WybYRbA==", + "peer": true, + "requires": { + "tslib": "2" + } + }, + "@formatjs/icu-messageformat-parser": { + "version": "2.9.4", + "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.9.4.tgz", + "integrity": "sha512-Tbvp5a9IWuxUcpWNIW6GlMQYEc4rwNHR259uUFoKWNN1jM9obf9Ul0e+7r7MvFOBNcN+13K7NuKCKqQiAn1QEg==", + "peer": true, + "requires": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/icu-skeleton-parser": "1.8.8", + "tslib": "2" + } + }, + "@formatjs/icu-skeleton-parser": { + "version": "1.8.8", + "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.8.tgz", + "integrity": "sha512-vHwK3piXwamFcx5YQdCdJxUQ1WdTl6ANclt5xba5zLGDv5Bsur7qz8AD7BevaKxITwpgDeU0u8My3AIibW9ywA==", + "peer": true, + "requires": { + "@formatjs/ecma402-abstract": "2.2.4", + "tslib": "2" + } + }, + "@formatjs/intl": { + "version": "2.10.15", + "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.15.tgz", + "integrity": "sha512-i6+xVqT+6KCz7nBfk4ybMXmbKO36tKvbMKtgFz9KV+8idYFyFbfwKooYk8kGjyA5+T5f1kEPQM5IDLXucTAQ9g==", + "peer": true, + "requires": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/fast-memoize": "2.2.3", + "@formatjs/icu-messageformat-parser": "2.9.4", + "@formatjs/intl-displaynames": "6.8.5", + "@formatjs/intl-listformat": "7.7.5", + "intl-messageformat": "10.7.7", + "tslib": "2" + } + }, + "@formatjs/intl-displaynames": { + "version": "6.8.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-displaynames/-/intl-displaynames-6.8.5.tgz", + "integrity": "sha512-85b+GdAKCsleS6cqVxf/Aw/uBd+20EM0wDpgaxzHo3RIR3bxF4xCJqH/Grbzx8CXurTgDDZHPdPdwJC+May41w==", + "peer": true, + "requires": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/intl-localematcher": "0.5.8", + "tslib": "2" + } + }, + "@formatjs/intl-listformat": { + "version": "7.7.5", + "resolved": "https://registry.npmjs.org/@formatjs/intl-listformat/-/intl-listformat-7.7.5.tgz", + "integrity": "sha512-Wzes10SMNeYgnxYiKsda4rnHP3Q3II4XT2tZyOgnH5fWuHDtIkceuWlRQNsvrI3uiwP4hLqp2XdQTCsfkhXulg==", + "peer": true, + "requires": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/intl-localematcher": "0.5.8", + "tslib": "2" + } + }, + "@formatjs/intl-localematcher": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.5.8.tgz", + "integrity": "sha512-I+WDNWWJFZie+jkfkiK5Mp4hEDyRSEvmyfYadflOno/mmKJKcB17fEpEH0oJu/OWhhCJ8kJBDz2YMd/6cDl7Mg==", + "peer": true, + "requires": { + "tslib": "2" + } + }, "@futureverse/artm": { "version": "2.2.5", "resolved": "https://registry.npmjs.org/@futureverse/artm/-/artm-2.2.5.tgz", @@ -39970,13 +40260,40 @@ } }, "@futureverse/auth-ui": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@futureverse/auth-ui/-/auth-ui-0.5.1.tgz", - "integrity": "sha512-R0mAFW0Vk3Gsdx/wz6u9s2q/lRhawXUJsZSOltbu+Zoe0foUCqZj0LsVmYv8RGBUzTKy6UOQjxtVI1bOv/VRzA==", + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/@futureverse/auth-ui/-/auth-ui-0.6.3.tgz", + "integrity": "sha512-tJNXd/HWl7m+vYigklTYzCD4wdVsQBYCZeABjdMTI2y9FoPJyYPsw9A/LI5wtf0YzuWh1M/43MYl7pAKXj55ZQ==", "requires": { - "@futureverse/auth": "^3.3.9", - "@futureverse/wagmi-connectors": "^2.7.7", + "@futureverse/auth": "^4.0.0", + "@futureverse/wagmi-connectors": "^3.0.1", "wagmi": "^2.10.9" + }, + "dependencies": { + "@futureverse/auth": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@futureverse/auth/-/auth-4.0.0.tgz", + "integrity": "sha512-vhLoMZOv0+7jdDdbmfFWyAazrdvbQew7silhrKwKV8QT3yGpYcP/JgDYdmplVEGujbccROnYiPWrnMK+5DgWqw==", + "requires": { + "@futureverse/signer": "1.5.0", + "cookie-storage": "^6.1.0", + "jwt-decode": "^4.0.0", + "oidc-client-ts": "^3.0.1", + "zod": "^3.23.8" + } + }, + "@futureverse/wagmi-connectors": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@futureverse/wagmi-connectors/-/wagmi-connectors-3.0.1.tgz", + "integrity": "sha512-izapSby6bVY0C7Ig+vXnKAZE97TKwbaCh0dmmT/6ET8uUMMo6obFAOUsXX7abLq1OBXhKMZwUB9BlVGgwiEdDA==", + "requires": { + "@futureverse/auth": "4.0.0", + "@futureverse/signer": "1.5.0", + "@futureverse/transact": "0.5.1", + "@polkadot/api": "^10.11.1", + "@therootnetwork/api": "^1.0.9", + "xumm": "^1.7.7" + } + } } }, "@futureverse/signer": { @@ -46004,6 +46321,16 @@ "@types/unist": "^2" } }, + "@types/hoist-non-react-statics": { + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.6.tgz", + "integrity": "sha512-lPByRJUer/iN/xa4qpyL0qmL11DqNW81iU/IG1S3uvRUq4oKagz8VCxZjiWkumgt66YT3vOdDgZ0o32sGKtCEw==", + "peer": true, + "requires": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, "@types/http-cache-semantics": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz", @@ -46178,8 +46505,7 @@ "@types/prop-types": { "version": "15.7.13", "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.13.tgz", - "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==", - "devOptional": true + "integrity": "sha512-hCZTSvwbzWGvhqxp/RqVqwU999pBf2vp7hzIjiYOsl8wqOmUxkQ6ddw1cV3l8811+kdUFus/q4d1Y3E3SyEifA==" }, "@types/qs": { "version": "6.9.17", @@ -46197,7 +46523,6 @@ "version": "18.3.1", "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz", "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==", - "devOptional": true, "requires": { "@types/prop-types": "*", "csstype": "^3.0.2" @@ -50606,8 +50931,7 @@ "csstype": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", - "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", - "devOptional": true + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "d": { "version": "1.0.2", @@ -54205,6 +54529,23 @@ "minimalistic-crypto-utils": "^1.0.1" } }, + "hoist-non-react-statics": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz", + "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==", + "peer": true, + "requires": { + "react-is": "^16.7.0" + }, + "dependencies": { + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "peer": true + } + } + }, "homedir-polyfill": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", @@ -54692,6 +55033,18 @@ "integrity": "sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==", "dev": true }, + "intl-messageformat": { + "version": "10.7.7", + "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.7.tgz", + "integrity": "sha512-F134jIoeYMro/3I0h08D0Yt4N9o9pjddU/4IIxMMURqbAtI2wu70X8hvG1V48W49zXHXv3RKSF/po+0fDfsGjA==", + "peer": true, + "requires": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/fast-memoize": "2.2.3", + "@formatjs/icu-messageformat-parser": "2.9.4", + "tslib": "2" + } + }, "invariant": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", @@ -60850,6 +61203,24 @@ "scheduler": "^0.23.2" } }, + "react-intl": { + "version": "6.8.9", + "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.8.9.tgz", + "integrity": "sha512-TUfj5E7lyUDvz/GtovC9OMh441kBr08rtIbgh3p0R8iF3hVY+V2W9Am7rb8BpJ/29BH1utJOqOOhmvEVh3GfZg==", + "peer": true, + "requires": { + "@formatjs/ecma402-abstract": "2.2.4", + "@formatjs/icu-messageformat-parser": "2.9.4", + "@formatjs/intl": "2.10.15", + "@formatjs/intl-displaynames": "6.8.5", + "@formatjs/intl-listformat": "7.7.5", + "@types/hoist-non-react-statics": "3", + "@types/react": "16 || 17 || 18", + "hoist-non-react-statics": "3", + "intl-messageformat": "10.7.7", + "tslib": "2" + } + }, "react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", diff --git a/package.json b/package.json index e304dd4..1f1654e 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,11 @@ "private": true, "dependencies": { "@ensdomains/ensjs": "^4.0.1-alpha.0", - "@futureverse/asset-register-react": "latest", "@futureverse/asset-register": "latest", + "@futureverse/asset-register-react": "latest", "@futureverse/auth": "latest", "@futureverse/auth-react": "latest", - "@futureverse/auth-ui": "latest", + "@futureverse/auth-ui": "^0.6.3", "@futureverse/signer": "latest", "@futureverse/transact": "latest", "@futureverse/transact-react": "latest", @@ -116,4 +116,4 @@ "resolutions": { "@polkadot/api": "10.13.1" } -} \ No newline at end of file +} From 3eee0a40d3606b1176bc9247ed3aecf62481d1cb Mon Sep 17 00:00:00 2001 From: Matthew Young Date: Mon, 16 Dec 2024 18:24:53 +1300 Subject: [PATCH 03/10] chore: update auth and auth-react packages --- package-lock.json | 112 +++++++++++----------------------------------- package.json | 4 +- 2 files changed, 28 insertions(+), 88 deletions(-) diff --git a/package-lock.json b/package-lock.json index 41233ea..ae0c895 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,8 +12,8 @@ "@ensdomains/ensjs": "^4.0.1-alpha.0", "@futureverse/asset-register": "latest", "@futureverse/asset-register-react": "latest", - "@futureverse/auth": "latest", - "@futureverse/auth-react": "latest", + "@futureverse/auth": "^4.0.0", + "@futureverse/auth-react": "^4.0.1", "@futureverse/auth-ui": "^0.6.3", "@futureverse/signer": "latest", "@futureverse/transact": "latest", @@ -3137,9 +3137,9 @@ } }, "node_modules/@futureverse/auth": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/@futureverse/auth/-/auth-3.3.9.tgz", - "integrity": "sha512-zT/RejA3UA4T0MshqaL49xrsJExWBdrO/AB1D5h7QJ2rE1W1RF8QPWfpipYD8oSojW0gAQQgLAt1HATsZMW6NA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@futureverse/auth/-/auth-4.0.0.tgz", + "integrity": "sha512-vhLoMZOv0+7jdDdbmfFWyAazrdvbQew7silhrKwKV8QT3yGpYcP/JgDYdmplVEGujbccROnYiPWrnMK+5DgWqw==", "dependencies": { "@futureverse/signer": "1.5.0", "cookie-storage": "^6.1.0", @@ -3152,13 +3152,13 @@ } }, "node_modules/@futureverse/auth-react": { - "version": "3.5.13", - "resolved": "https://registry.npmjs.org/@futureverse/auth-react/-/auth-react-3.5.13.tgz", - "integrity": "sha512-AU9fqiconTjJnzoV5QOBNL8EUSu7SRZrdlKV4bJ+du2PfUO9Tq1wTLfZbN6CjQEDVbgY1lhKxuWSqNR5Wo2tRA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@futureverse/auth-react/-/auth-react-4.0.1.tgz", + "integrity": "sha512-srjKK7YoemYNcxErk9ldXcaLxNvACoAIeN647iO89VQ6hCeSxbXjI6wgbTO5Q3PGkJd4w+NnwnNhEYVMZwxZvg==", "dependencies": { - "@futureverse/auth": "^3.3.9", + "@futureverse/auth": "^4.0.0", "@futureverse/signer": "^1.5.0", - "@futureverse/wagmi-connectors": "^2.7.7", + "@futureverse/wagmi-connectors": "^3.0.1", "wagmi": "^2.10.9" }, "peerDependencies": { @@ -3181,39 +3181,6 @@ "react-intl": "^6.8.7" } }, - "node_modules/@futureverse/auth-ui/node_modules/@futureverse/auth": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@futureverse/auth/-/auth-4.0.0.tgz", - "integrity": "sha512-vhLoMZOv0+7jdDdbmfFWyAazrdvbQew7silhrKwKV8QT3yGpYcP/JgDYdmplVEGujbccROnYiPWrnMK+5DgWqw==", - "dependencies": { - "@futureverse/signer": "1.5.0", - "cookie-storage": "^6.1.0", - "jwt-decode": "^4.0.0", - "oidc-client-ts": "^3.0.1", - "zod": "^3.23.8" - }, - "peerDependencies": { - "viem": "2.x" - } - }, - "node_modules/@futureverse/auth-ui/node_modules/@futureverse/wagmi-connectors": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@futureverse/wagmi-connectors/-/wagmi-connectors-3.0.1.tgz", - "integrity": "sha512-izapSby6bVY0C7Ig+vXnKAZE97TKwbaCh0dmmT/6ET8uUMMo6obFAOUsXX7abLq1OBXhKMZwUB9BlVGgwiEdDA==", - "dependencies": { - "@futureverse/auth": "4.0.0", - "@futureverse/signer": "1.5.0", - "@futureverse/transact": "0.5.1", - "@polkadot/api": "^10.11.1", - "@therootnetwork/api": "^1.0.9", - "xumm": "^1.7.7" - }, - "peerDependencies": { - "@wagmi/connectors": "^5.1.8", - "@wagmi/core": "^2.13.0", - "viem": "2.x" - } - }, "node_modules/@futureverse/signer": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@futureverse/signer/-/signer-1.5.0.tgz", @@ -3285,11 +3252,11 @@ } }, "node_modules/@futureverse/wagmi-connectors": { - "version": "2.7.7", - "resolved": "https://registry.npmjs.org/@futureverse/wagmi-connectors/-/wagmi-connectors-2.7.7.tgz", - "integrity": "sha512-TLuMoYX5tkky5+xIFNqSc8zqmvlTuJAtV3QTjfkQFuufLC6oty7/WZwa4GFEVKtMFCt3aEZdo/Vj5ee3C+QxtA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@futureverse/wagmi-connectors/-/wagmi-connectors-3.0.1.tgz", + "integrity": "sha512-izapSby6bVY0C7Ig+vXnKAZE97TKwbaCh0dmmT/6ET8uUMMo6obFAOUsXX7abLq1OBXhKMZwUB9BlVGgwiEdDA==", "dependencies": { - "@futureverse/auth": "3.3.9", + "@futureverse/auth": "4.0.0", "@futureverse/signer": "1.5.0", "@futureverse/transact": "0.5.1", "@polkadot/api": "^10.11.1", @@ -40237,9 +40204,9 @@ } }, "@futureverse/auth": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/@futureverse/auth/-/auth-3.3.9.tgz", - "integrity": "sha512-zT/RejA3UA4T0MshqaL49xrsJExWBdrO/AB1D5h7QJ2rE1W1RF8QPWfpipYD8oSojW0gAQQgLAt1HATsZMW6NA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@futureverse/auth/-/auth-4.0.0.tgz", + "integrity": "sha512-vhLoMZOv0+7jdDdbmfFWyAazrdvbQew7silhrKwKV8QT3yGpYcP/JgDYdmplVEGujbccROnYiPWrnMK+5DgWqw==", "requires": { "@futureverse/signer": "1.5.0", "cookie-storage": "^6.1.0", @@ -40249,13 +40216,13 @@ } }, "@futureverse/auth-react": { - "version": "3.5.13", - "resolved": "https://registry.npmjs.org/@futureverse/auth-react/-/auth-react-3.5.13.tgz", - "integrity": "sha512-AU9fqiconTjJnzoV5QOBNL8EUSu7SRZrdlKV4bJ+du2PfUO9Tq1wTLfZbN6CjQEDVbgY1lhKxuWSqNR5Wo2tRA==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@futureverse/auth-react/-/auth-react-4.0.1.tgz", + "integrity": "sha512-srjKK7YoemYNcxErk9ldXcaLxNvACoAIeN647iO89VQ6hCeSxbXjI6wgbTO5Q3PGkJd4w+NnwnNhEYVMZwxZvg==", "requires": { - "@futureverse/auth": "^3.3.9", + "@futureverse/auth": "^4.0.0", "@futureverse/signer": "^1.5.0", - "@futureverse/wagmi-connectors": "^2.7.7", + "@futureverse/wagmi-connectors": "^3.0.1", "wagmi": "^2.10.9" } }, @@ -40267,33 +40234,6 @@ "@futureverse/auth": "^4.0.0", "@futureverse/wagmi-connectors": "^3.0.1", "wagmi": "^2.10.9" - }, - "dependencies": { - "@futureverse/auth": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@futureverse/auth/-/auth-4.0.0.tgz", - "integrity": "sha512-vhLoMZOv0+7jdDdbmfFWyAazrdvbQew7silhrKwKV8QT3yGpYcP/JgDYdmplVEGujbccROnYiPWrnMK+5DgWqw==", - "requires": { - "@futureverse/signer": "1.5.0", - "cookie-storage": "^6.1.0", - "jwt-decode": "^4.0.0", - "oidc-client-ts": "^3.0.1", - "zod": "^3.23.8" - } - }, - "@futureverse/wagmi-connectors": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@futureverse/wagmi-connectors/-/wagmi-connectors-3.0.1.tgz", - "integrity": "sha512-izapSby6bVY0C7Ig+vXnKAZE97TKwbaCh0dmmT/6ET8uUMMo6obFAOUsXX7abLq1OBXhKMZwUB9BlVGgwiEdDA==", - "requires": { - "@futureverse/auth": "4.0.0", - "@futureverse/signer": "1.5.0", - "@futureverse/transact": "0.5.1", - "@polkadot/api": "^10.11.1", - "@therootnetwork/api": "^1.0.9", - "xumm": "^1.7.7" - } - } } }, "@futureverse/signer": { @@ -40364,11 +40304,11 @@ } }, "@futureverse/wagmi-connectors": { - "version": "2.7.7", - "resolved": "https://registry.npmjs.org/@futureverse/wagmi-connectors/-/wagmi-connectors-2.7.7.tgz", - "integrity": "sha512-TLuMoYX5tkky5+xIFNqSc8zqmvlTuJAtV3QTjfkQFuufLC6oty7/WZwa4GFEVKtMFCt3aEZdo/Vj5ee3C+QxtA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@futureverse/wagmi-connectors/-/wagmi-connectors-3.0.1.tgz", + "integrity": "sha512-izapSby6bVY0C7Ig+vXnKAZE97TKwbaCh0dmmT/6ET8uUMMo6obFAOUsXX7abLq1OBXhKMZwUB9BlVGgwiEdDA==", "requires": { - "@futureverse/auth": "3.3.9", + "@futureverse/auth": "4.0.0", "@futureverse/signer": "1.5.0", "@futureverse/transact": "0.5.1", "@polkadot/api": "^10.11.1", diff --git a/package.json b/package.json index 1f1654e..03367fc 100644 --- a/package.json +++ b/package.json @@ -12,8 +12,8 @@ "@ensdomains/ensjs": "^4.0.1-alpha.0", "@futureverse/asset-register": "latest", "@futureverse/asset-register-react": "latest", - "@futureverse/auth": "latest", - "@futureverse/auth-react": "latest", + "@futureverse/auth": "^4.0.0", + "@futureverse/auth-react": "^4.0.1", "@futureverse/auth-ui": "^0.6.3", "@futureverse/signer": "latest", "@futureverse/transact": "latest", From bbf50043a13ed342dfc91141597c77cbac7bdab7 Mon Sep 17 00:00:00 2001 From: Matthew Young Date: Mon, 16 Dec 2024 18:34:43 +1300 Subject: [PATCH 04/10] chore: fix missing modal prop --- libs/ui-shared/src/components/Auth/AuthUiCustomiser.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/ui-shared/src/components/Auth/AuthUiCustomiser.tsx b/libs/ui-shared/src/components/Auth/AuthUiCustomiser.tsx index 263934e..9505a6a 100644 --- a/libs/ui-shared/src/components/Auth/AuthUiCustomiser.tsx +++ b/libs/ui-shared/src/components/Auth/AuthUiCustomiser.tsx @@ -379,6 +379,7 @@ export const AuthUiCustomiser = () => { themeConfig={themeConfig} onBack={() => console.log('')} connectAndSignIn={async () => console.log('connectAndSignIn')} + onSignPass={async () => console.log('onSignPass')} >
From 74204daece4c652d4eaf0c60daf7e0b724c99d54 Mon Sep 17 00:00:00 2001 From: Matthew Young Date: Wed, 29 Jan 2025 09:41:26 +1300 Subject: [PATCH 05/10] chore: replace route and components names to Pass --- .../src/app/evm/futurePass-proxy/page.tsx | 7 ------- apps/next-demo/src/app/evm/pass-proxy/page.tsx | 7 +++++++ apps/next-demo/src/components/Nav.tsx | 2 +- .../src/components/client-components.tsx | 4 ++-- ...{FpassErc1155Mint.tsx => PassErc1155Mint.tsx} | 4 ++-- ...5MintSingle.tsx => PassErc1155MintSingle.tsx} | 4 ++-- libs/ui-shared/src/components/Erc1155/index.ts | 8 ++++---- ...ssErc20Transfer.tsx => PassErc20Transfer.tsx} | 4 ++-- libs/ui-shared/src/components/Erc20/index.ts | 4 ++-- .../{FpassErc721Mint.tsx => PassErc721Mint.tsx} | 4 ++-- libs/ui-shared/src/components/Erc721/index.ts | 4 ++-- .../{FuturePassProxy.tsx => PassProxy.tsx} | 16 ++++++++-------- libs/ui-shared/src/components/index.ts | 4 ++-- 13 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 apps/next-demo/src/app/evm/futurePass-proxy/page.tsx create mode 100644 apps/next-demo/src/app/evm/pass-proxy/page.tsx rename libs/ui-shared/src/components/Erc1155/{FpassErc1155Mint.tsx => PassErc1155Mint.tsx} (99%) rename libs/ui-shared/src/components/Erc1155/{FpassErc1155MintSingle.tsx => PassErc1155MintSingle.tsx} (99%) rename libs/ui-shared/src/components/Erc20/{FpassErc20Transfer.tsx => PassErc20Transfer.tsx} (99%) rename libs/ui-shared/src/components/Erc721/{FpassErc721Mint.tsx => PassErc721Mint.tsx} (99%) rename libs/ui-shared/src/components/{FuturePassProxy.tsx => PassProxy.tsx} (68%) diff --git a/apps/next-demo/src/app/evm/futurePass-proxy/page.tsx b/apps/next-demo/src/app/evm/futurePass-proxy/page.tsx deleted file mode 100644 index a0a48b2..0000000 --- a/apps/next-demo/src/app/evm/futurePass-proxy/page.tsx +++ /dev/null @@ -1,7 +0,0 @@ -'use client'; - -import { FuturePassProxy } from '@/components/client-components'; - -export default function Page() { - return ; -} diff --git a/apps/next-demo/src/app/evm/pass-proxy/page.tsx b/apps/next-demo/src/app/evm/pass-proxy/page.tsx new file mode 100644 index 0000000..b141978 --- /dev/null +++ b/apps/next-demo/src/app/evm/pass-proxy/page.tsx @@ -0,0 +1,7 @@ +'use client'; + +import { PassProxy } from '@/components/client-components'; + +export default function Page() { + return ; +} diff --git a/apps/next-demo/src/components/Nav.tsx b/apps/next-demo/src/components/Nav.tsx index a58b21e..1d0fb33 100644 --- a/apps/next-demo/src/components/Nav.tsx +++ b/apps/next-demo/src/components/Nav.tsx @@ -165,7 +165,7 @@ const EvmMenu = ({
  • setIsOpen && setIsOpen(false)} - href="/evm/futurePass-proxy" + href="/evm/pass-proxy" > Pass Proxy diff --git a/apps/next-demo/src/components/client-components.tsx b/apps/next-demo/src/components/client-components.tsx index 8a32694..9f72cab 100644 --- a/apps/next-demo/src/components/client-components.tsx +++ b/apps/next-demo/src/components/client-components.tsx @@ -30,7 +30,7 @@ import { EvmErc721, EvmErc1155, FeeProxy, - FuturePassProxy, + PassProxy, LogIn, AuthReactSdk, AuthUiSdk, @@ -63,7 +63,7 @@ export { EvmErc721, EvmErc1155, FeeProxy, - FuturePassProxy, + PassProxy, LogIn, AuthReactSdk, AuthUiSdk, diff --git a/libs/ui-shared/src/components/Erc1155/FpassErc1155Mint.tsx b/libs/ui-shared/src/components/Erc1155/PassErc1155Mint.tsx similarity index 99% rename from libs/ui-shared/src/components/Erc1155/FpassErc1155Mint.tsx rename to libs/ui-shared/src/components/Erc1155/PassErc1155Mint.tsx index d5b48db..4fd26e2 100644 --- a/libs/ui-shared/src/components/Erc1155/FpassErc1155Mint.tsx +++ b/libs/ui-shared/src/components/Erc1155/PassErc1155Mint.tsx @@ -34,7 +34,7 @@ import { EvmModal } from '../EvmModal'; import { EvmCollectionInfo } from '../EvmCollectionInfo'; -export default function FpassErc1155Mint() { +export default function PassErc1155Mint() { const { userSession } = useAuth(); const fromWallet = 'pass'; @@ -260,7 +260,7 @@ export default function FpassErc1155Mint() { } `; -export default function FpassErc1155Mint() { +export default function PassErc1155Mint() { const { userSession } = useAuth(); const fromWallet = 'pass'; diff --git a/libs/ui-shared/src/components/Erc1155/FpassErc1155MintSingle.tsx b/libs/ui-shared/src/components/Erc1155/PassErc1155MintSingle.tsx similarity index 99% rename from libs/ui-shared/src/components/Erc1155/FpassErc1155MintSingle.tsx rename to libs/ui-shared/src/components/Erc1155/PassErc1155MintSingle.tsx index fbb68e1..773bb29 100644 --- a/libs/ui-shared/src/components/Erc1155/FpassErc1155MintSingle.tsx +++ b/libs/ui-shared/src/components/Erc1155/PassErc1155MintSingle.tsx @@ -33,7 +33,7 @@ import { CurrentChainSwap } from '../CurrentChainSwap'; import { EvmModal } from '../EvmModal'; import { EvmCollectionInfo } from '../EvmCollectionInfo'; -export default function FpassErc1155MintSingle() { +export default function PassErc1155MintSingle() { const { userSession } = useAuth(); const fromWallet = 'pass'; @@ -222,7 +222,7 @@ export default function FpassErc1155MintSingle() { } `; -export default function FpassErc1155MintSingle() { +export default function PassErc1155MintSingle() { const { userSession } = useAuth(); const fromWallet = 'pass'; diff --git a/libs/ui-shared/src/components/Erc1155/index.ts b/libs/ui-shared/src/components/Erc1155/index.ts index 4e10f22..92b0990 100644 --- a/libs/ui-shared/src/components/Erc1155/index.ts +++ b/libs/ui-shared/src/components/Erc1155/index.ts @@ -1,8 +1,8 @@ import EoaErc1155MintSingle from './EoaErc1155MintSingle'; import EoaErc1155Mint from './EoaErc1155Mint'; import Erc1155Mint from './Erc1155Mint'; -import FpassErc1155Mint from './FpassErc1155Mint'; -import FpassErc1155MintSingle from './FpassErc1155MintSingle'; +import PassErc1155Mint from './PassErc1155Mint'; +import PassErc1155MintSingle from './PassErc1155MintSingle'; import FeeProxyErc1155Mint from './FeeProxyErc1155Mint'; import FeeProxyErc1155MintSingle from './FeeProxyErc1155MintSingle'; @@ -10,8 +10,8 @@ export { EoaErc1155MintSingle, EoaErc1155Mint, Erc1155Mint, - FpassErc1155Mint, - FpassErc1155MintSingle, + PassErc1155Mint, + PassErc1155MintSingle, FeeProxyErc1155Mint, FeeProxyErc1155MintSingle, }; diff --git a/libs/ui-shared/src/components/Erc20/FpassErc20Transfer.tsx b/libs/ui-shared/src/components/Erc20/PassErc20Transfer.tsx similarity index 99% rename from libs/ui-shared/src/components/Erc20/FpassErc20Transfer.tsx rename to libs/ui-shared/src/components/Erc20/PassErc20Transfer.tsx index b6fb035..ade5523 100644 --- a/libs/ui-shared/src/components/Erc20/FpassErc20Transfer.tsx +++ b/libs/ui-shared/src/components/Erc20/PassErc20Transfer.tsx @@ -41,7 +41,7 @@ import { AddressToSend } from '../AddressToSend'; import { CurrentChainSwap } from '../CurrentChainSwap'; import { EvmModal } from '../EvmModal'; -export default function FpassErc20Transfer() { +export default function PassErc20Transfer() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); @@ -221,7 +221,7 @@ export default function FpassErc20Transfer() { } `; -export default function FpassErc20Transfer() { +export default function PassErc20Transfer() { const { userSession } = useAuth(); const shouldShowEoa = useShouldShowEoa(); diff --git a/libs/ui-shared/src/components/Erc20/index.ts b/libs/ui-shared/src/components/Erc20/index.ts index e41928c..c430557 100644 --- a/libs/ui-shared/src/components/Erc20/index.ts +++ b/libs/ui-shared/src/components/Erc20/index.ts @@ -1,11 +1,11 @@ import Erc20Transfer from './Erc20Transfer'; import EoaErc20Transfer from './EoaErc20Transfer'; -import FpassErc20Transfer from './FpassErc20Transfer'; +import PassErc20Transfer from './PassErc20Transfer'; import FeeProxyErc20Transfer from './FeeProxyErc20Transfer'; export { Erc20Transfer, EoaErc20Transfer, - FpassErc20Transfer, + PassErc20Transfer, FeeProxyErc20Transfer, }; diff --git a/libs/ui-shared/src/components/Erc721/FpassErc721Mint.tsx b/libs/ui-shared/src/components/Erc721/PassErc721Mint.tsx similarity index 99% rename from libs/ui-shared/src/components/Erc721/FpassErc721Mint.tsx rename to libs/ui-shared/src/components/Erc721/PassErc721Mint.tsx index df97a1f..733284e 100644 --- a/libs/ui-shared/src/components/Erc721/FpassErc721Mint.tsx +++ b/libs/ui-shared/src/components/Erc721/PassErc721Mint.tsx @@ -33,7 +33,7 @@ import { CurrentChainSwap } from '../CurrentChainSwap'; import { EvmModal } from '../EvmModal'; import { EvmCollectionInfo } from '../EvmCollectionInfo'; -export default function FpassErc721Mint() { +export default function PassErc721Mint() { const { userSession } = useAuth(); const [collectionId, setCollectionId] = useState(709732); @@ -192,7 +192,7 @@ export default function FpassErc721Mint() { } `; -export default function FpassErc721Mint() { +export default function PassErc721Mint() { const { userSession } = useAuth(); const [collectionId, setCollectionId] = useState(709732); diff --git a/libs/ui-shared/src/components/Erc721/index.ts b/libs/ui-shared/src/components/Erc721/index.ts index 90948f0..b8ebc5d 100644 --- a/libs/ui-shared/src/components/Erc721/index.ts +++ b/libs/ui-shared/src/components/Erc721/index.ts @@ -1,6 +1,6 @@ import Erc721Mint from './Erc721Mint'; import EoaErc721Mint from './EoaErc721Mint'; -import FpassErc721Mint from './FpassErc721Mint'; +import PassErc721Mint from './PassErc721Mint'; import FeeProxyErc721Mint from './FeeProxyErc721Mint'; -export { Erc721Mint, EoaErc721Mint, FpassErc721Mint, FeeProxyErc721Mint }; +export { Erc721Mint, EoaErc721Mint, PassErc721Mint, FeeProxyErc721Mint }; diff --git a/libs/ui-shared/src/components/FuturePassProxy.tsx b/libs/ui-shared/src/components/PassProxy.tsx similarity index 68% rename from libs/ui-shared/src/components/FuturePassProxy.tsx rename to libs/ui-shared/src/components/PassProxy.tsx index c6b4ee7..281c358 100644 --- a/libs/ui-shared/src/components/FuturePassProxy.tsx +++ b/libs/ui-shared/src/components/PassProxy.tsx @@ -5,10 +5,10 @@ import React, { useEffect } from 'react'; import { useIsMounted } from '../hooks'; import { useAuth } from '@futureverse/auth-react'; import { useRootStore } from '../hooks/useRootStore'; -import { FpassErc1155Mint, FpassErc1155MintSingle } from './Erc1155'; -import { FpassErc20Transfer } from './Erc20'; -import { FpassErc721Mint } from './Erc721'; -export default function FuturePassProxy() { +import { PassErc1155Mint, PassErc1155MintSingle } from './Erc1155'; +import { PassErc20Transfer } from './Erc20'; +import { PassErc721Mint } from './Erc721'; +export default function PassProxy() { const isMounted = useIsMounted(); const { userSession } = useAuth(); @@ -33,10 +33,10 @@ export default function FuturePassProxy() {

    EVM Pass.Online Proxy Demo

    - - - - + + + +
    ); diff --git a/libs/ui-shared/src/components/index.ts b/libs/ui-shared/src/components/index.ts index dffc9fc..d68c7c5 100644 --- a/libs/ui-shared/src/components/index.ts +++ b/libs/ui-shared/src/components/index.ts @@ -16,7 +16,7 @@ import EvmErc20 from './EvmErc20'; import EvmErc721 from './EvmErc721'; import EvmErc1155 from './EvmErc1155'; import FeeProxy from './FeeProxy'; -import FuturePassProxy from './FuturePassProxy'; +import PassProxy from './PassProxy'; import AuthUiSdk from './AuthUiSdk'; import AuthReactSdk from './AuthReactSdk'; import AuthUiSdkCustomiser from './AuthUiSdkCustomiser'; @@ -95,7 +95,7 @@ export { EvmErc721, EvmErc1155, FeeProxy, - FuturePassProxy, + PassProxy, AuthUiSdk, AuthReactSdk, AuthUiSdkCustomiser, From f1fe732bd232eb6cbdad02e17d2418cb0e85144e Mon Sep 17 00:00:00 2001 From: Matthew Young Date: Wed, 29 Jan 2025 09:44:38 +1300 Subject: [PATCH 06/10] chore: replace state variables to pass --- libs/ui-shared/src/components/EVMComps/CustomEvm.tsx | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/libs/ui-shared/src/components/EVMComps/CustomEvm.tsx b/libs/ui-shared/src/components/EVMComps/CustomEvm.tsx index 009f8bd..3aa8d87 100644 --- a/libs/ui-shared/src/components/EVMComps/CustomEvm.tsx +++ b/libs/ui-shared/src/components/EVMComps/CustomEvm.tsx @@ -19,7 +19,7 @@ export default function CustomEvm() { const [evmContractAddress, setEvmContractAddress] = useState( '0xb271a5C4e7628fA6F9b9A55EC889a8072e8E0E62' ); - const [evmUseFuturePass, setEvmUseFuturePass] = useState(false); + const [evmUsePass, setEvmUsePass] = useState(false); const [evmArgs, setEvmArgs] = useState(''); const [evmFunctionName, setEvmFunctionName] = useState('increment'); const [slippage, setSlippage] = useState('5'); @@ -135,7 +135,7 @@ export default function CustomEvm() { abi: JSON.parse(evmAbi), functionName: evmFunctionName, args: evmArgs.length > 0 ? evmArgs.split(',') : undefined, - fromFuturePass: evmUseFuturePass, + fromFuturePass: evmUsePass, }); if (assetId !== 2) { @@ -155,7 +155,7 @@ export default function CustomEvm() { evmFunctionName, evmAbi, evmArgs, - evmUseFuturePass, + evmUsePass, assetId, getExtrinsic, setCurrentBuilder, @@ -248,13 +248,11 @@ export default function CustomEvm() {