Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

chore(next-demo): change instances of fpass to pass, and futurepass t… #16

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

chore(next-demo): change instances of fpass to pass, and futurepass t… #16

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1f7fd14
chore(next-demo): change instances of fpass to pass, and futurepass t…
mattversed Dec 16, 2024
2eb5397
chore: update to latest auth-ui version
mattversed Dec 16, 2024
3eee0a4
chore: update auth and auth-react packages
mattversed Dec 16, 2024
bbf5004
chore: fix missing modal prop
mattversed Dec 16, 2024
74204da
chore: replace route and components names to Pass
mattversed Jan 28, 2025
f1fe732
chore: replace state variables to pass
mattversed Jan 28, 2025
aeab60b
fix: fix vite-react-demo build errors
mattversed Jan 28, 2025
dedac9e
fix: fix ui-shared fpass renames
mattversed Jan 28, 2025
4f5f47c
fix: add trnapiprovider into vite-react-demo
mattversed Jan 28, 2025
fb5e411
fix: fix trnapiprovider import error
mattversed Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/next-demo/src/components/Nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ const EvmMenu = ({
onClick={() => setIsOpen && setIsOpen(false)}
href="/evm/futurePass-proxy"
>
FuturePass Proxy
Pass Proxy
</Link>
</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions libs/ui-shared/src/components/AccountCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
12 changes: 6 additions & 6 deletions libs/ui-shared/src/components/Assets/AssetTransfer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<number>(1);
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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<number>(1);
Expand Down Expand Up @@ -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);
}
Expand Down
1 change: 1 addition & 0 deletions libs/ui-shared/src/components/Auth/AuthUiCustomiser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,6 +379,7 @@ export const AuthUiCustomiser = () => {
themeConfig={themeConfig}
onBack={() => console.log('')}
connectAndSignIn={async () => console.log('connectAndSignIn')}
onSignPass={async () => console.log('onSignPass')}
></Modal>
</AuthThemeProvider>
</div>
Expand Down
4 changes: 2 additions & 2 deletions libs/ui-shared/src/components/Auth/AuthUserSession.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export function AuthUserSession() {
</div>
)}
<div className="row content-row">
<div className="title">FuturePass</div>
<div className="title">Pass</div>
<div className="content">{userSession?.futurepass}</div>
</div>
<div className="row content-row">
Expand Down Expand Up @@ -148,7 +148,7 @@ export function AuthUserSession() {
</div>
)}
<div className="row content-row">
<div className="title">FuturePass</div>
<div className="title">Pass</div>
<div className="content">{userSession?.futurepass}</div>
</div>
<div className="row content-row">
Expand Down
12 changes: 6 additions & 6 deletions libs/ui-shared/src/components/Batch/Batch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<number>(2);
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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<number>(2);
Expand Down Expand Up @@ -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);
}
Expand Down
12 changes: 6 additions & 6 deletions libs/ui-shared/src/components/CustomComps/CustomBuilder.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ export default function CustomBuilderComp() {
<>
<div className="row">
<label>
Use FuturePass
Use Pass
<select
value={useFuturePass.toString()}
className="w-full builder-input"
Expand All @@ -479,9 +479,9 @@ export default function CustomBuilderComp() {
);
}}
>
<option value={'true'}>Use FuturePass</option>
<option value={'true'}>Use Pass</option>
{shouldShowEoa && (
<option value={'false'}>Do Not Use FuturePass</option>
<option value={'false'}>Do Not Use Pass</option>
)}
</select>
</label>
Expand Down Expand Up @@ -975,7 +975,7 @@ export default function CustomBuilderComp() {
<>
<div className="row">
<label>
Use FuturePass
Use Pass
<select
value={useFuturePass.toString()}
className="w-full builder-input"
Expand All @@ -986,9 +986,9 @@ export default function CustomBuilderComp() {
);
}}
>
<option value={'true'}>Use FuturePass</option>
<option value="true">Use Pass</option>
{shouldShowEoa && (
<option value={'false'}>Do Not Use FuturePass</option>
<option value="false">Do Not Use Pass</option>
)}
</select>
</label>
Expand Down
12 changes: 6 additions & 6 deletions libs/ui-shared/src/components/CustomComps/CustomExtrinsic.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ export default function CustomExtrinsic() {
const [collectionId, setCollectionId] = useState<number>(709732);
const [mintQty, setMintQty] = useState<number>(1);

const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>(
shouldShowEoa ? 'eoa' : 'fpass'
const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>(
shouldShowEoa ? 'eoa' : 'pass'
);

const [feeAssetId, setFeeAssetId] = useState<number>(1);
Expand All @@ -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);
}
Expand Down Expand Up @@ -255,8 +255,8 @@ export default function CustomExtrinsic() {
const [collectionId, setCollectionId] = useState<number>(709732);
const [mintQty, setMintQty] = useState<number>(1);

const [fromWallet, setFromWallet] = useState<'eoa' | 'fpass'>(
shouldShowEoa ? 'eoa' : 'fpass'
const [fromWallet, setFromWallet] = useState<'eoa' | 'pass'>(
shouldShowEoa ? 'eoa' : 'pass'
);

const [feeAssetId, setFeeAssetId] = useState<number>(1);
Expand All @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions libs/ui-shared/src/components/EVMComps/CustomEvm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ export default function CustomEvm() {
<div className="col col-2">
<div className="row">
<label>
Use FuturePass
Use Pass
<select
value={evmUseFuturePass.toString()}
className="w-full builder-input"
Expand All @@ -257,8 +257,8 @@ export default function CustomEvm() {
);
}}
>
<option value={'true'}>Use FuturePass</option>
<option value={'false'}>Do Not Use FuturePass</option>
<option value={'true'}>Use Pass</option>
<option value={'false'}>Do Not Use Pass</option>
</select>
</label>
</div>
Expand Down
8 changes: 4 additions & 4 deletions libs/ui-shared/src/components/EVMComps/Decrement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<number>(1);
Expand Down Expand Up @@ -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<number>(1);
Expand Down
4 changes: 2 additions & 2 deletions libs/ui-shared/src/components/EVMComps/DecrementFpass.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export default function DecrementFPass() {
<div>
<div className="inner">
<CodeView code={codeString}>
<h3>Decrement Counter From FuturePass</h3>
<h3>Decrement Counter From Pass</h3>
<span
style={{ display: 'inline-block', fontSize: '0.8rem' }}
>{shortAddress(userSession?.futurepass ?? '')}</span>
Expand Down Expand Up @@ -185,7 +185,7 @@ export default function DecrementFPass() {
<div className={`card ${disable ? 'disabled' : ''}`}>
<div className="inner">
<CodeView code={codeString}>
<h3>Decrement Counter From FuturePass</h3>
<h3>Decrement Counter From Pass</h3>
<span style={{ display: 'inline-block', fontSize: '0.8rem' }}>
{shortAddress(userSession?.futurepass ?? '')}
</span>
Expand Down
8 changes: 4 additions & 4 deletions libs/ui-shared/src/components/EVMComps/Increment.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<number>(1);
Expand Down Expand Up @@ -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<number>(1);
Expand Down
4 changes: 2 additions & 2 deletions libs/ui-shared/src/components/EVMComps/IncrementFpass.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export default function IncrementFPass() {
<div>
<div className="inner">
<CodeView code={codeString}>
<h3>Increment Counter From FuturePass</h3>
<h3>Increment Counter From Pass</h3>
<span
style={{ display: 'inline-block', fontSize: '0.8rem' }}
>{shortAddress(userSession?.futurepass ?? '')}</span>
Expand Down Expand Up @@ -183,7 +183,7 @@ export default function IncrementFPass() {
<div className={`card ${disable ? 'disabled' : ''}`}>
<div className="inner">
<CodeView code={codeString}>
<h3>Increment Counter From FuturePass</h3>
<h3>Increment Counter From Pass</h3>
<span style={{ display: 'inline-block', fontSize: '0.8rem' }}>
{shortAddress(userSession?.futurepass ?? '')}
</span>
Expand Down
12 changes: 6 additions & 6 deletions libs/ui-shared/src/components/Erc1155/Erc1155Mint.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -102,7 +102,7 @@ export default function Erc1155Mint() {
]);

useEffect(() => {
if (fromWallet === 'fpass') {
if (fromWallet === 'pass') {
setFeeAssetId(2);
setFeeAssetIdDisabled(true);
} else {
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -385,7 +385,7 @@ export default function Erc1155Mint() {
]);

useEffect(() => {
if (fromWallet === 'fpass') {
if (fromWallet === 'pass') {
setFeeAssetId(2);
setFeeAssetIdDisabled(true);
} else {
Expand Down
8 changes: 4 additions & 4 deletions libs/ui-shared/src/components/Erc1155/FpassErc1155Mint.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}\`>(
Expand Down Expand Up @@ -230,7 +230,7 @@ export default function FpassErc1155Mint() {
}}
disabled={buttonDisabled}
>
Start FuturePass Proxy Batch Mint
Start Pass Proxy Batch Mint
</button>
</div>
</div>
Expand Down Expand Up @@ -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}`>(
Expand Down Expand Up @@ -456,7 +456,7 @@ export default function FpassErc1155Mint() {
}}
disabled={buttonDisabled}
>
Start FuturePass Proxy Batch Mint
Start Pass Proxy Batch Mint
</button>
</div>
</div>
Expand Down
Loading