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

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 <PassProxy />;
+}

apps/next-demo/src/components/Nav.tsx

@@ -165,9 +165,9 @@ const EvmMenu = ({
         <li>
           <Link
             onClick={() => setIsOpen && setIsOpen(false)}
-            href="/evm/futurePass-proxy"
+            href="/evm/pass-proxy"
           >
-            FuturePass Proxy
+            Pass Proxy
           </Link>
         </li>
       </ul>

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,

apps/vite-react-demo/src/App.tsx

@@ -45,7 +45,6 @@ export default function App() {
 function Layout() {
   const [isOpen, setIsOpen] = React.useState(false);
   const isMobile = useIsMobile(992);
-  const reactRouterLocation = useReactRouterLocation();
   useIsAuthed({ redirectUrl: '/' });
 
   return (
@@ -65,7 +64,7 @@ function Layout() {
       <div className="inner">
         <Outlet />
       </div>
-      <Footer pathName={reactRouterLocation.pathname} />
+      <Footer />
     </div>
   );
 }

apps/vite-react-demo/src/Providers/FVProvider.tsx

@@ -11,14 +11,15 @@ import { authClient, getWagmiConfig, queryClient } from './config';
 import { State } from 'wagmi';
 import {
   type ThemeConfig,
-  DarkTheme,
+  DefaultTheme,
   AuthUiProvider,
 } from '@futureverse/auth-ui';
-import { RootStoreProvider, TrnApiProvider } from '@fv-sdk-demos/ui-shared';
+import { RootStoreProvider } from '@fv-sdk-demos/ui-shared';
 import type { NetworkName } from '@therootnetwork/api';
+import { TrnApiProvider } from '@futureverse/transact-react';
 
 const customTheme: ThemeConfig = {
-  ...DarkTheme,
+  ...DefaultTheme,
   defaultAuthOption: 'web3',
 };
 
@@ -35,20 +36,20 @@ export default function Providers({
 }) {
   return (
     <QueryClientProvider client={queryClient}>
-      <FutureverseWagmiProvider
-        getWagmiConfig={getWagmiConfig}
-        initialState={initialWagmiState}
-      >
-        <TrnApiProvider network={network}>
+      <TrnApiProvider network={network}>
+        <FutureverseWagmiProvider
+          getWagmiConfig={getWagmiConfig}
+          initialState={initialWagmiState}
+        >
           <RootStoreProvider>
             <FutureverseAuthProvider authClient={authClient}>
               <AuthUiProvider themeConfig={customTheme} authClient={authClient}>
                 {children}
               </AuthUiProvider>
             </FutureverseAuthProvider>
           </RootStoreProvider>
-        </TrnApiProvider>
-      </FutureverseWagmiProvider>
+        </FutureverseWagmiProvider>
+      </TrnApiProvider>
     </QueryClientProvider>
   );
 }

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) {

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<number>(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<number>(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);
       }

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')}
               ></Modal>
             </AuthThemeProvider>
           </div>

libs/ui-shared/src/components/Auth/AuthUserSession.tsx

@@ -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">
@@ -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">

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<number>(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<number>(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);
       }

libs/ui-shared/src/components/CustomComps/CustomBuilder.tsx

@@ -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"
@@ -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>
@@ -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"
@@ -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>

libs/ui-shared/src/components/CustomComps/CustomExtrinsic.tsx

@@ -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);
@@ -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<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);
@@ -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);
       }

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,
@@ -246,19 +246,17 @@ export default function CustomEvm() {
           <div className="col col-2">
             <div className="row">
               <label>
-                Use FuturePass
+                Use Pass
                 <select
-                  value={evmUseFuturePass.toString()}
+                  value={evmUsePass.toString()}
                   className="w-full builder-input"
                   onChange={e => {
                     resetState();
-                    setEvmUseFuturePass(
-                      e.target.value === 'true' ? true : false
-                    );
+                    setEvmUsePass(e.target.value === 'true' ? true : false);
                   }}
                 >
-                  <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>

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<number>(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<number>(1);