diff --git a/rair-front/src/components/adminViews/BatchERC20Transfer.tsx b/rair-front/src/components/adminViews/BatchERC20Transfer.tsx
index 8d9d2dbce..52e842422 100644
--- a/rair-front/src/components/adminViews/BatchERC20Transfer.tsx
+++ b/rair-front/src/components/adminViews/BatchERC20Transfer.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useCallback, useState } from 'react';
import Dropzone from 'react-dropzone';
import { faPlus, faTrash } from '@fortawesome/free-solid-svg-icons';
diff --git a/rair-front/src/components/adminViews/BlockchainSwitcher.tsx b/rair-front/src/components/adminViews/BlockchainSwitcher.tsx
index 9e2f154dd..bb8ae901d 100644
--- a/rair-front/src/components/adminViews/BlockchainSwitcher.tsx
+++ b/rair-front/src/components/adminViews/BlockchainSwitcher.tsx
@@ -1,13 +1,14 @@
+// @ts-nocheck
import { useState } from 'react';
import { JsonRpcProvider, Wallet } from 'ethers';
import { useAppDispatch, useAppSelector } from '../../hooks/useReduxHooks';
import useSwal from '../../hooks/useSwal';
import useWeb3Tx from '../../hooks/useWeb3Tx';
-import {
- setConnectedChain,
- setProgrammaticProvider
-} from '../../redux/web3Slice';
+// import {
+// setConnectedChain,
+// setProgrammaticProvider
+// } from '../../redux/web3Slice';
import InputField from '../common/InputField';
const BlockChainSwitcher = () => {
@@ -36,8 +37,8 @@ const BlockChainSwitcher = () => {
};
const provider = new JsonRpcProvider(rpcEndpoint, networkData);
const currentWallet = new Wallet(UNSAFE_PrivateKey, provider);
- dispatch(setProgrammaticProvider(currentWallet));
- dispatch(setConnectedChain(chainId));
+ // dispatch(setProgrammaticProvider(currentWallet));
+ // dispatch(setConnectedChain(chainId));
} catch (err) {
const error = err as Error;
console.error(error);
diff --git a/rair-front/src/components/adminViews/ImportAndTransfer.tsx b/rair-front/src/components/adminViews/ImportAndTransfer.tsx
index 748ae9be0..fe8d8b0c6 100644
--- a/rair-front/src/components/adminViews/ImportAndTransfer.tsx
+++ b/rair-front/src/components/adminViews/ImportAndTransfer.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import BatchERC20Transfer from './BatchERC20Transfer';
import BlockChainSwitcher from './BlockchainSwitcher';
import ImportExternalContract from './ImportExternalContracts';
diff --git a/rair-front/src/components/adminViews/ImportExternalContracts.tsx b/rair-front/src/components/adminViews/ImportExternalContracts.tsx
index d9ee24dee..a78e1f746 100644
--- a/rair-front/src/components/adminViews/ImportExternalContracts.tsx
+++ b/rair-front/src/components/adminViews/ImportExternalContracts.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useEffect, useState } from 'react';
import { isAddress } from 'ethers';
import { Hex } from 'viem';
diff --git a/rair-front/src/components/adminViews/LicenseExchange.tsx b/rair-front/src/components/adminViews/LicenseExchange.tsx
index b4ea5b83c..0255349de 100644
--- a/rair-front/src/components/adminViews/LicenseExchange.tsx
+++ b/rair-front/src/components/adminViews/LicenseExchange.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useCallback, useState } from 'react';
import { formatEther, parseUnits } from 'ethers';
diff --git a/rair-front/src/components/adminViews/UserManager.tsx b/rair-front/src/components/adminViews/UserManager.tsx
index ad26e074a..0e19bd761 100644
--- a/rair-front/src/components/adminViews/UserManager.tsx
+++ b/rair-front/src/components/adminViews/UserManager.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useCallback, useEffect, useState } from 'react';
import axios from 'axios';
diff --git a/rair-front/src/components/adminViews/transferTokens.tsx b/rair-front/src/components/adminViews/transferTokens.tsx
index 33cdbfa6c..30cb57104 100644
--- a/rair-front/src/components/adminViews/transferTokens.tsx
+++ b/rair-front/src/components/adminViews/transferTokens.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useCallback, useEffect, useState } from 'react';
import { Contract, isAddress, ZeroAddress } from 'ethers';
import { Hex } from 'viem';
diff --git a/rair-front/src/components/common/PurchaseToken.tsx b/rair-front/src/components/common/PurchaseToken.tsx
index de2a27773..2ca177ce2 100644
--- a/rair-front/src/components/common/PurchaseToken.tsx
+++ b/rair-front/src/components/common/PurchaseToken.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import React, { useCallback, useEffect, useState } from 'react';
import { Provider, useStore } from 'react-redux';
import { faCheck } from '@fortawesome/free-solid-svg-icons';
diff --git a/rair-front/src/components/creatorAndConsumerModes.types.ts b/rair-front/src/components/creatorAndConsumerModes.types.ts
index 186399276..5423e5537 100644
--- a/rair-front/src/components/creatorAndConsumerModes.types.ts
+++ b/rair-front/src/components/creatorAndConsumerModes.types.ts
@@ -1,3 +1,4 @@
+//@ts-nocheck
import { ethers } from 'ethers';
export type TSingleOfferDataObject = {
diff --git a/rair-front/src/components/creatorStudio/Deploy.tsx b/rair-front/src/components/creatorStudio/Deploy.tsx
index 61538e4f9..31df2ff9f 100644
--- a/rair-front/src/components/creatorStudio/Deploy.tsx
+++ b/rair-front/src/components/creatorStudio/Deploy.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useCallback, useEffect, useState } from 'react';
import { faGem, faLandmark } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
diff --git a/rair-front/src/components/creatorStudio/creatorSteps/singleMetadataEditor.tsx b/rair-front/src/components/creatorStudio/creatorSteps/singleMetadataEditor.tsx
index 172fe3bc9..66008dbf5 100644
--- a/rair-front/src/components/creatorStudio/creatorSteps/singleMetadataEditor.tsx
+++ b/rair-front/src/components/creatorStudio/creatorSteps/singleMetadataEditor.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useCallback, useEffect, useState } from 'react';
import Dropzone from 'react-dropzone';
import { useParams } from 'react-router-dom';
diff --git a/rair-front/src/components/creatorStudio/diamondCreatorSteps/DiamondMinterMarketplace.tsx b/rair-front/src/components/creatorStudio/diamondCreatorSteps/DiamondMinterMarketplace.tsx
index 79bb0a0dd..ca1db8cc2 100644
--- a/rair-front/src/components/creatorStudio/diamondCreatorSteps/DiamondMinterMarketplace.tsx
+++ b/rair-front/src/components/creatorStudio/diamondCreatorSteps/DiamondMinterMarketplace.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import React, { useCallback, useEffect, useState } from 'react';
import MarketplaceOfferConfig from './MarketplaceOfferConfig';
diff --git a/rair-front/src/components/creatorStudio/workflowSteps.tsx b/rair-front/src/components/creatorStudio/workflowSteps.tsx
index 56d83428f..87ca27c67 100644
--- a/rair-front/src/components/creatorStudio/workflowSteps.tsx
+++ b/rair-front/src/components/creatorStudio/workflowSteps.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { FC, useCallback, useEffect, useState } from 'react';
import {
NavLink,
diff --git a/rair-front/src/components/nft/PersonalProfile/PersonalProfileMyNftTab/ResaleModal/ResaleModal.tsx b/rair-front/src/components/nft/PersonalProfile/PersonalProfileMyNftTab/ResaleModal/ResaleModal.tsx
index 1c4a8c393..1c689403a 100644
--- a/rair-front/src/components/nft/PersonalProfile/PersonalProfileMyNftTab/ResaleModal/ResaleModal.tsx
+++ b/rair-front/src/components/nft/PersonalProfile/PersonalProfileMyNftTab/ResaleModal/ResaleModal.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import React, { useCallback, useEffect, useState } from 'react';
import { faTrash } from '@fortawesome/free-solid-svg-icons';
import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
diff --git a/rair-front/src/components/video/videoItem.tsx b/rair-front/src/components/video/videoItem.tsx
index eb010694d..741c089dd 100644
--- a/rair-front/src/components/video/videoItem.tsx
+++ b/rair-front/src/components/video/videoItem.tsx
@@ -1,3 +1,4 @@
+//@ts-nocheck
import { useCallback, useEffect, useState } from 'react';
import Modal from 'react-modal';
import { Provider, useStore } from 'react-redux';
diff --git a/rair-front/src/hooks/useComponentVisible.tsx b/rair-front/src/hooks/useComponentVisible.tsx
index da0f516ed..056f8b438 100644
--- a/rair-front/src/hooks/useComponentVisible.tsx
+++ b/rair-front/src/hooks/useComponentVisible.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useEffect, useRef, useState } from 'react';
function useComponentVisible(initialIsVisible: any) {
diff --git a/rair-front/src/hooks/useConnectUser.tsx b/rair-front/src/hooks/useConnectUser.tsx
index da4a23dd6..a6d3f6c10 100644
--- a/rair-front/src/hooks/useConnectUser.tsx
+++ b/rair-front/src/hooks/useConnectUser.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useCallback, useEffect, useState } from 'react';
import { useNavigate } from 'react-router';
import { useLocation } from 'react-router-dom';
@@ -14,22 +15,16 @@ import { OnboardingButton } from '../components/common/OnboardingButton/Onboardi
import { dataStatuses } from '../redux/commonTypes';
import { loadCurrentUser } from '../redux/userSlice';
import {
- connectChainAlchemyV4,
+ // connectChainAlchemyV4,
connectChainMetamask,
- connectChainWeb3Auth,
setConnectedChain,
setExchangeRates,
setProgrammaticProvider
} from '../redux/web3Slice';
-import { CombinedBlockchainData } from '../types/commonTypes';
-import { User } from '../types/databaseTypes';
+// import { CombinedBlockchainData } from '../types/commonTypes';
+// import { User } from '../types/databaseTypes';
import chainData from '../utils/blockchainData';
-import {
- rFetch,
- signWeb3MessageAlchemyV4,
- signWeb3MessageMetamask,
- signWeb3MessageWeb3Auth
-} from '../utils/rFetch';
+import { rFetch, signWeb3MessageMetamask } from '../utils/rFetch';
import sockets from '../utils/sockets';
const getCoingeckoRates = async () => {
@@ -94,58 +89,58 @@ const useConnectUser = () => {
};
}, [currentUserAddress]);
- const loginWithAlchemySigner = useCallback(async () => {
- const defaultChain: Hex = import.meta.env.VITE_DEFAULT_BLOCKCHAIN;
- const chainInformation = getBlockchainData(defaultChain);
- if (
- !chainInformation?.hash ||
- !chainInformation?.alchemy ||
- !chainInformation?.viem ||
- !chainInformation?.alchemyAppKey
- ) {
- return {};
- }
-
- const { connectedChain, currentUserAddress, userDetails } = await dispatch(
- connectChainAlchemyV4(chainInformation as CombinedBlockchainData)
- ).unwrap();
-
- return {
- userAddress: currentUserAddress,
- blockchain: connectedChain,
- userDetails
- };
- }, [dispatch, getBlockchainData]);
-
- const loginWithWeb3Auth = useCallback(async () => {
- const defaultChain: Hex = import.meta.env.VITE_DEFAULT_BLOCKCHAIN;
- const chainInformation = getBlockchainData(defaultChain);
- if (
- !chainInformation?.hash ||
- !chainInformation?.alchemy ||
- !chainInformation?.viem ||
- !chainInformation?.alchemyAppKey
- ) {
- return {};
- }
-
- reactSwal.fire({
- title: 'Connecting',
- html: 'Please wait',
- icon: 'info',
- showConfirmButton: false
- });
-
- const { connectedChain, currentUserAddress, userDetails } = await dispatch(
- connectChainWeb3Auth(chainInformation as CombinedBlockchainData)
- ).unwrap();
-
- return {
- userAddress: currentUserAddress,
- blockchain: connectedChain,
- userDetails
- };
- }, [getBlockchainData, reactSwal, dispatch]);
+ // const loginWithAlchemySigner = useCallback(async () => {
+ // const defaultChain: Hex = import.meta.env.VITE_DEFAULT_BLOCKCHAIN;
+ // const chainInformation = getBlockchainData(defaultChain);
+ // if (
+ // !chainInformation?.hash ||
+ // !chainInformation?.alchemy ||
+ // !chainInformation?.viem ||
+ // !chainInformation?.alchemyAppKey
+ // ) {
+ // return {};
+ // }
+
+ // const { connectedChain, currentUserAddress, userDetails } = await dispatch(
+ // connectChainAlchemyV4(chainInformation as CombinedBlockchainData)
+ // ).unwrap();
+
+ // return {
+ // userAddress: currentUserAddress,
+ // blockchain: connectedChain,
+ // userDetails
+ // };
+ // }, [dispatch, getBlockchainData]);
+
+ // const loginWithWeb3Auth = useCallback(async () => {
+ // const defaultChain: Hex = import.meta.env.VITE_DEFAULT_BLOCKCHAIN;
+ // const chainInformation = getBlockchainData(defaultChain);
+ // if (
+ // !chainInformation?.hash ||
+ // !chainInformation?.alchemy ||
+ // !chainInformation?.viem ||
+ // !chainInformation?.alchemyAppKey
+ // ) {
+ // return {};
+ // }
+
+ // reactSwal.fire({
+ // title: 'Connecting',
+ // html: 'Please wait',
+ // icon: 'info',
+ // showConfirmButton: false
+ // });
+
+ // const { connectedChain, currentUserAddress, userDetails } = await dispatch(
+ // connectChainWeb3Auth(chainInformation as CombinedBlockchainData)
+ // ).unwrap();
+
+ // return {
+ // userAddress: currentUserAddress,
+ // blockchain: connectedChain,
+ // userDetails
+ // };
+ // }, [getBlockchainData, reactSwal, dispatch]);
const loginWithMetamask = useCallback(async () => {
const { connectedChain, currentUserAddress } = await dispatch(
@@ -203,20 +198,20 @@ const useConnectUser = () => {
Web3
)}
-
-
Each social login creates a unique wallet address
+ {/*
Each social login creates a unique wallet address
*/}
If you login with a different account, you won’t see purchases
in your other wallets
@@ -256,12 +251,6 @@ const useConnectUser = () => {
reactSwal.close();
try {
switch (loginMethod) {
- case 'alchemyV4':
- loginData = await loginWithAlchemySigner();
- break;
- case 'web3auth':
- loginData = await loginWithWeb3Auth();
- break;
case 'metamask':
loginData = await loginWithMetamask();
break;
@@ -328,18 +317,6 @@ const useConnectUser = () => {
loginData.userAddress
);
break;
- case 'alchemyV4':
- loginResponse = await signWeb3MessageAlchemyV4(
- loginData.userAddress,
- loginData.userDetails
- );
- break;
- case 'web3auth':
- loginResponse = await signWeb3MessageWeb3Auth(
- loginData.userAddress
- );
- reactSwal.close();
- break;
}
const updateData = {};
@@ -394,8 +371,6 @@ const useConnectUser = () => {
[
selectMethod,
reactSwal,
- loginWithAlchemySigner,
- loginWithWeb3Auth,
loginWithMetamask,
loginWithProgrammaticProvider,
adminRights,
diff --git a/rair-front/src/hooks/useContracts.tsx b/rair-front/src/hooks/useContracts.tsx
index c01865fa1..d40a0f086 100644
--- a/rair-front/src/hooks/useContracts.tsx
+++ b/rair-front/src/hooks/useContracts.tsx
@@ -1,11 +1,11 @@
-//@ts-nocheck
+// @ts-nocheck
/* eslint-disable no-case-declarations */
import { useCallback, useEffect, useState } from 'react';
-import { createModularAccountAlchemyClient } from '@alchemy/aa-alchemy';
-import { SmartContractAccount } from '@alchemy/aa-core';
-import { AccountSigner, EthersProviderAdapter } from '@alchemy/aa-ethers';
-import { Web3AuthSigner } from '@alchemy/aa-signers/web3auth';
-import { Alchemy } from 'alchemy-sdk';
+// import { createModularAccountAlchemyClient } from '@alchemy/aa-alchemy';
+// import { SmartContractAccount } from '@alchemy/aa-core';
+// import { AccountSigner, EthersProviderAdapter } from '@alchemy/aa-ethers';
+// import { Web3AuthSigner } from '@alchemy/aa-signers/web3auth';
+// import { Alchemy } from 'alchemy-sdk';
import { BrowserProvider, Contract, isAddress, JsonRpcSigner } from 'ethers';
import { Hex } from 'viem';
@@ -29,7 +29,7 @@ const useContracts = () => {
);
const [signer, setSigner] = useState<
- JsonRpcSigner | AccountSigner
+ JsonRpcSigner
>();
const [diamondFactoryInstance, setDiamondFactoryInstance] = useState<
Contract | undefined
@@ -47,98 +47,92 @@ const useContracts = () => {
Contract | undefined
>();
- const createAlchemyV4Signer = useCallback(async () => {
- const chainData = getBlockchainData(connectedChain);
-
- if (!chainData) {
- return;
- }
- if (!programmaticProvider) {
- return {};
- }
-
- return await programmaticProvider.account.getSigner();
- }, [connectedChain, getBlockchainData, programmaticProvider]);
-
- const createWeb3AuthSigner = useCallback(async () => {
- const chainData = getBlockchainData(connectedChain);
-
- if (!chainData) {
- return;
- }
-
- const web3AuthSigner = new Web3AuthSigner({
- clientId: import.meta.env.VITE_WEB3AUTH_CLIENT_ID,
- chainConfig: {
- chainNamespace: 'eip155',
- chainId: chainData.chainId,
- rpcTarget: chainData.rpcEndpoint,
- displayName: chainData.name,
- blockExplorer: chainData.blockExplorerGateway,
- ticker: chainData.symbol,
- tickerName: chainData.name
- },
- web3AuthNetwork: chainData.testnet
- ? 'sapphire_devnet'
- : 'sapphire_mainnet'
- });
-
- await web3AuthSigner.authenticate({
- init: async () => {
- await web3AuthSigner.inner.initModal();
- },
- connect: async () => {
- await web3AuthSigner.inner.connect();
- }
- });
-
- const modularAccount = await createModularAccountAlchemyClient({
- apiKey: chainData.alchemyAppKey,
- chain: chainData.viem!,
- signer: web3AuthSigner,
- gasManagerConfig: chainData.alchemyGasPolicy
- ? {
- policyId: chainData.alchemyGasPolicy
- }
- : undefined
- });
-
- const alchemy = new Alchemy({
- apiKey: chainData.alchemyAppKey,
- network: chainData?.alchemy,
- maxRetries: 10
- });
-
- const ethersProvider = await alchemy.config.getProvider();
- const provider =
- EthersProviderAdapter.fromEthersProvider(ethersProvider).connectToAccount(
- modularAccount
- );
-
- return provider;
- }, [connectedChain, getBlockchainData]);
+ // const createAlchemyV4Signer = useCallback(async () => {
+ // const chainData = getBlockchainData(connectedChain);
+
+ // if (!chainData) {
+ // return;
+ // }
+ // if (!programmaticProvider) {
+ // return {};
+ // }
+
+ // return await programmaticProvider.account.getSigner();
+ // }, [connectedChain, getBlockchainData, programmaticProvider]);
+
+ // const createWeb3AuthSigner = useCallback(async () => {
+ // const chainData = getBlockchainData(connectedChain);
+
+ // if (!chainData) {
+ // return;
+ // }
+
+ // const web3AuthSigner = new Web3AuthSigner({
+ // clientId: import.meta.env.VITE_WEB3AUTH_CLIENT_ID,
+ // chainConfig: {
+ // chainNamespace: 'eip155',
+ // chainId: chainData.chainId,
+ // rpcTarget: chainData.rpcEndpoint,
+ // displayName: chainData.name,
+ // blockExplorer: chainData.blockExplorerGateway,
+ // ticker: chainData.symbol,
+ // tickerName: chainData.name
+ // },
+ // web3AuthNetwork: chainData.testnet
+ // ? 'sapphire_devnet'
+ // : 'sapphire_mainnet'
+ // });
+
+ // await web3AuthSigner.authenticate({
+ // init: async () => {
+ // await web3AuthSigner.inner.initModal();
+ // },
+ // connect: async () => {
+ // await web3AuthSigner.inner.connect();
+ // }
+ // });
+
+ // const modularAccount = await createModularAccountAlchemyClient({
+ // apiKey: chainData.alchemyAppKey,
+ // chain: chainData.viem!,
+ // signer: web3AuthSigner,
+ // gasManagerConfig: chainData.alchemyGasPolicy
+ // ? {
+ // policyId: chainData.alchemyGasPolicy
+ // }
+ // : undefined
+ // });
+
+ // const alchemy = new Alchemy({
+ // apiKey: chainData.alchemyAppKey,
+ // network: chainData?.alchemy,
+ // maxRetries: 10
+ // });
+
+ // const ethersProvider = await alchemy.config.getProvider();
+ // const provider =
+ // EthersProviderAdapter.fromEthersProvider(ethersProvider).connectToAccount(
+ // modularAccount
+ // );
+
+ // return provider;
+ // }, [connectedChain, getBlockchainData]);
const refreshSigner = useCallback(async () => {
if (!isLoggedIn) {
return;
}
switch (loginType) {
- case 'alchemyV4':
- setSigner(await createAlchemyV4Signer());
- break;
case 'metamask':
if (!window.ethereum.isConnected()) {
return;
}
const metamaskProvider = new BrowserProvider(window.ethereum);
- const signer = await metamaskProvider.getSigner(0);
- setSigner(signer);
- break;
- case 'web3auth':
- setSigner(await createWeb3AuthSigner());
+ // const signer = await metamaskProvider.getSigner(0);
+ // setSigner(signer);
break;
}
- }, [isLoggedIn, loginType, createAlchemyV4Signer, createWeb3AuthSigner]);
+ }, [isLoggedIn, loginType]);
useEffect(() => {
refreshSigner();
diff --git a/rair-front/src/hooks/useIPFSImageLink.tsx b/rair-front/src/hooks/useIPFSImageLink.tsx
index ff6f31ec5..ffadc2d49 100644
--- a/rair-front/src/hooks/useIPFSImageLink.tsx
+++ b/rair-front/src/hooks/useIPFSImageLink.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useEffect, useState } from 'react';
function useIPFSImageLink(initialImageLink: string | undefined) {
diff --git a/rair-front/src/hooks/useOpenVideoPlayer.tsx b/rair-front/src/hooks/useOpenVideoPlayer.tsx
index d997a274c..96bda48f4 100644
--- a/rair-front/src/hooks/useOpenVideoPlayer.tsx
+++ b/rair-front/src/hooks/useOpenVideoPlayer.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useState } from 'react';
export type TUseOpenVideoPlayer = [
diff --git a/rair-front/src/hooks/useReduxHooks.tsx b/rair-front/src/hooks/useReduxHooks.tsx
index 5b77c5450..1a36b3650 100644
--- a/rair-front/src/hooks/useReduxHooks.tsx
+++ b/rair-front/src/hooks/useReduxHooks.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useDispatch, useSelector } from 'react-redux';
import type { AppDispatch, RootState } from '../redux/store';
diff --git a/rair-front/src/hooks/useServerSettings.tsx b/rair-front/src/hooks/useServerSettings.tsx
index 9d75c39cf..9071ebd1d 100644
--- a/rair-front/src/hooks/useServerSettings.tsx
+++ b/rair-front/src/hooks/useServerSettings.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useCallback, useEffect } from 'react';
import { Hex } from 'viem';
diff --git a/rair-front/src/hooks/useWeb3Tx.ts b/rair-front/src/hooks/useWeb3Tx.ts
index d005d3b94..ff6e9ee70 100644
--- a/rair-front/src/hooks/useWeb3Tx.ts
+++ b/rair-front/src/hooks/useWeb3Tx.ts
@@ -1,9 +1,10 @@
+// @ts-nocheck
/* eslint-disable no-case-declarations */
import { useCallback } from 'react';
-import {
- SendUserOperationResult,
- UserOperationOverrides
-} from '@alchemy/aa-core';
+// import {
+// SendUserOperationResult,
+// UserOperationOverrides
+// } from '@alchemy/aa-core';
import { Contract, ContractTransactionResponse } from 'ethers';
import { encodeFunctionData, Hex } from 'viem';
@@ -11,7 +12,7 @@ import { useAppDispatch, useAppSelector } from './useReduxHooks';
import useServerSettings from './useServerSettings';
import useSwal from './useSwal';
-import { connectChainWeb3Auth, setConnectedChain } from '../redux/web3Slice';
+import { setConnectedChain } from '../redux/web3Slice';
import { CombinedBlockchainData } from '../types/commonTypes';
import { rFetch } from '../utils/rFetch';
@@ -162,123 +163,123 @@ const useWeb3Tx = () => {
[handleReceipt, handleWeb3Error]
);
- const verifyAAUserOperation = useCallback(
- async (
- contractProvider: any,
- userOperation: SendUserOperationResult,
- options: web3Options
- ) => {
- if (!contractProvider) {
- console.error('Provider not found');
- return;
- }
- try {
- const txHash = await contractProvider.waitForUserOperationTransaction({
- hash: userOperation.hash
- });
- handleReceipt(txHash, options?.callback);
- return true;
- } catch (err: any) {
- const stringified = err.toString();
- if (
- stringified
- .toLowerCase()
- .includes('failed to find transaction for user operation')
- ) {
- reactSwal.fire({
- title: 'Please wait',
- html: 'Verifying user operation',
- icon: 'info',
- showConfirmButton: false
- });
- return await verifyAAUserOperation(
- contractProvider,
- userOperation,
- options
- );
- }
- console.error(err);
- reactSwal.fire('Error', err.toString(), 'error');
- }
- },
- [handleReceipt, reactSwal]
- );
+ // const verifyAAUserOperation = useCallback(
+ // async (
+ // contractProvider: any,
+ // userOperation: SendUserOperationResult,
+ // options: web3Options
+ // ) => {
+ // if (!contractProvider) {
+ // console.error('Provider not found');
+ // return;
+ // }
+ // try {
+ // const txHash = await contractProvider.waitForUserOperationTransaction({
+ // hash: userOperation.hash
+ // });
+ // handleReceipt(txHash, options?.callback);
+ // return true;
+ // } catch (err: any) {
+ // const stringified = err.toString();
+ // if (
+ // stringified
+ // .toLowerCase()
+ // .includes('failed to find transaction for user operation')
+ // ) {
+ // reactSwal.fire({
+ // title: 'Please wait',
+ // html: 'Verifying user operation',
+ // icon: 'info',
+ // showConfirmButton: false
+ // });
+ // return await verifyAAUserOperation(
+ // contractProvider,
+ // userOperation,
+ // options
+ // );
+ // }
+ // console.error(err);
+ // reactSwal.fire('Error', err.toString(), 'error');
+ // }
+ // },
+ // [handleReceipt, reactSwal]
+ // );
- const web3AuthCall = useCallback(
- async (
- contract: Contract,
- method: string,
- args: any[],
- options: web3Options
- ) => {
- if (!currentUserAddress || !contract) {
- return;
- }
- const methodFound = contract.getFunction(method);
- let fragment = methodFound.fragment;
- if (!fragment) {
- fragment = methodFound.getFragment();
- }
- if (fragment.stateMutability === 'view') {
- // If the method is a view function, query the info directly through Ethers
- return await contract[method](...args);
- }
- let transactionValue: bigint = BigInt(0);
- if (args?.at(-1)?.value !== undefined) {
- transactionValue = BigInt(args.pop().value);
- }
- const uoCallData = encodeFunctionData({
- abi: [fragment],
- functionName: method,
- args: args
- });
+ // const web3AuthCall = useCallback(
+ // async (
+ // contract: Contract,
+ // method: string,
+ // args: any[],
+ // options: web3Options
+ // ) => {
+ // if (!currentUserAddress || !contract) {
+ // return;
+ // }
+ // const methodFound = contract.getFunction(method);
+ // let fragment = methodFound.fragment;
+ // if (!fragment) {
+ // fragment = methodFound.getFragment();
+ // }
+ // if (fragment.stateMutability === 'view') {
+ // // If the method is a view function, query the info directly through Ethers
+ // return await contract[method](...args);
+ // }
+ // let transactionValue: bigint = BigInt(0);
+ // if (args?.at(-1)?.value !== undefined) {
+ // transactionValue = BigInt(args.pop().value);
+ // }
+ // const uoCallData = encodeFunctionData({
+ // abi: [fragment],
+ // functionName: method,
+ // args: args
+ // });
- const elegibleForSponsorship =
- options.sponsored &&
- !transactionValue &&
- (await (contract.runner as any).account.checkGasSponsorshipEligibility({
- uo: {
- target: await contract.getAddress(),
- data: uoCallData,
- value: transactionValue
- }
- }));
+ // const elegibleForSponsorship =
+ // options.sponsored &&
+ // !transactionValue &&
+ // (await (contract.runner as any).account.checkGasSponsorshipEligibility({
+ // uo: {
+ // target: await contract.getAddress(),
+ // data: uoCallData,
+ // value: transactionValue
+ // }
+ // }));
- const overrides: UserOperationOverrides = {
- paymasterAndData: '0x'
- };
+ // const overrides: UserOperationOverrides = {
+ // paymasterAndData: '0x'
+ // };
- const userOperation = await (contract.runner as any).account
- .sendUserOperation({
- uo: {
- target: await contract.getAddress(),
- data: uoCallData,
- value: transactionValue
- },
- overrides: elegibleForSponsorship ? undefined : overrides
- })
- .catch((err) => {
- console.error(err);
- reactSwal.fire('Error', err.details, 'error');
- });
- if (!userOperation?.hash) {
- return false;
- }
- return await verifyAAUserOperation(
- contract.runner,
- userOperation,
- options
- );
- },
- [currentUserAddress, reactSwal, verifyAAUserOperation]
- );
+ // const userOperation = await (contract.runner as any).account
+ // .sendUserOperation({
+ // uo: {
+ // target: await contract.getAddress(),
+ // data: uoCallData,
+ // value: transactionValue
+ // },
+ // overrides: elegibleForSponsorship ? undefined : overrides
+ // })
+ // .catch((err) => {
+ // console.error(err);
+ // reactSwal.fire('Error', err.details, 'error');
+ // });
+ // if (!userOperation?.hash) {
+ // return false;
+ // }
+ // return await verifyAAUserOperation(
+ // contract.runner,
+ // userOperation,
+ // options
+ // );
+ // },
+ // [currentUserAddress, reactSwal, verifyAAUserOperation]
+ // );
const connectWeb3AuthProgrammaticProvider = useCallback(
async (chainData?: CombinedBlockchainData) => {
if (!chainData) {
return;
}
- dispatch(connectChainWeb3Auth(chainData));
+ // dispatch(connectChainWeb3Auth(chainData));
},
[dispatch]
);
@@ -367,23 +368,12 @@ const useWeb3Tx = () => {
switch (loginType) {
case 'metamask':
return metamaskCall(contract, method, args, options);
- case 'web3auth':
- return web3AuthCall(contract, method, args, options);
- case 'alchemyV4':
- return web3AuthCall(contract, method, args, options);
default:
reactSwal.fire('Error', 'Please login', 'error');
return undefined;
}
},
- [
- connectedChain,
- currentUserAddress,
- loginType,
- metamaskCall,
- reactSwal,
- web3AuthCall
- ]
+ [connectedChain, currentUserAddress, loginType, metamaskCall, reactSwal]
);
const web3Switch = useCallback(
diff --git a/rair-front/src/hooks/useWindowDimensions.tsx b/rair-front/src/hooks/useWindowDimensions.tsx
index c1e47f240..0eaa00bef 100644
--- a/rair-front/src/hooks/useWindowDimensions.tsx
+++ b/rair-front/src/hooks/useWindowDimensions.tsx
@@ -1,3 +1,4 @@
+// @ts-nocheck
import { useEffect, useState } from 'react';
const getWindowDimensions = () => {
diff --git a/rair-front/src/main.tsx b/rair-front/src/main.tsx
index face02237..8cd52d164 100644
--- a/rair-front/src/main.tsx
+++ b/rair-front/src/main.tsx
@@ -1,3 +1,4 @@
+//@ts-nocheck
import React, { useEffect } from 'react';
import { createRoot } from 'react-dom/client';
import { HelmetProvider } from 'react-helmet-async';
diff --git a/rair-front/src/redux/web3Slice.ts b/rair-front/src/redux/web3Slice.ts
index 9f5840908..04287ba19 100644
--- a/rair-front/src/redux/web3Slice.ts
+++ b/rair-front/src/redux/web3Slice.ts
@@ -1,23 +1,21 @@
-//@ts-nocheck
-import {
- alchemy,
- AlchemySmartAccountClient,
- createAlchemySmartAccountClient
-} from '@account-kit/infra';
-import { AlchemyWebSigner } from '@account-kit/signer';
-import { createLightAccount } from '@account-kit/smart-contracts';
-import { createModularAccountAlchemyClient } from '@alchemy/aa-alchemy';
-import { Web3AuthSigner } from '@alchemy/aa-signers/web3auth';
+// import {} from // alchemy,
+// AlchemySmartAccountClient,
+// createAlchemySmartAccountClient
+// '@account-kit/infra';
+// import { AlchemyWebSigner } from '@account-kit/signer';
+// import { createLightAccount } from '@account-kit/smart-contracts';
+// import { createModularAccountAlchemyClient } from '@alchemy/aa-alchemy';
+// import { Web3AuthSigner } from '@alchemy/aa-signers/web3auth';
import { Maybe } from '@metamask/providers/dist/utils';
import type { PayloadAction } from '@reduxjs/toolkit';
import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import { WEB3AUTH_NETWORK } from '@web3auth/base';
+// import { WEB3AUTH_NETWORK } from '@web3auth/base';
import { BrowserProvider } from 'ethers';
import { Hex } from 'viem';
import { dataStatuses } from './commonTypes';
-import { CombinedBlockchainData } from '../types/commonTypes';
+// import { CombinedBlockchainData } from '../types/commonTypes';
import { metamaskEventListeners } from '../utils/metamaskUtils';
interface ChainData {
@@ -28,7 +26,7 @@ export interface ContractsState extends ChainData {
web3Status: dataStatuses;
connectedChain?: Hex;
currentUserAddress?: Hex;
- programmaticProvider?: AlchemySmartAccountClient;
+ programmaticProvider?: any;
requestedChain?: Hex;
exchangeRates?: any;
}
@@ -44,109 +42,109 @@ const initialState: ContractsState = {
exchangeRates: undefined
};
-export const connectChainAlchemyV4 = createAsyncThunk(
- 'web3/connectChainAlchemyV4',
- async (chainData: CombinedBlockchainData) => {
- if (!chainData.alchemyAppKey || !chainData.viem) {
- return {};
- }
- const signer = new AlchemyWebSigner({
- client: {
- connection: {
- // rpcUrl: chainData.viem.blockExplorers.alchemy.http[0],
- apiKey: chainData.alchemyAppKey
- // chain: chainInformation.viem,
- // policyId: chainInformation.alchemyGasPolicy
- },
- iframeConfig: {
- iframeContainerId: 'rair-asif' // Alchemy signer iFrame
- }
- }
- });
- if (!signer) {
- return {};
- }
+// export const connectChainAlchemyV4 = createAsyncThunk(
+// 'web3/connectChainAlchemyV4',
+// async (chainData: CombinedBlockchainData) => {
+// if (!chainData.alchemyAppKey || !chainData.viem) {
+// return {};
+// }
+// const signer = new AlchemyWebSigner({
+// client: {
+// connection: {
+// // rpcUrl: chainData.viem.blockExplorers.alchemy.http[0],
+// apiKey: chainData.alchemyAppKey
+// // chain: chainInformation.viem,
+// // policyId: chainInformation.alchemyGasPolicy
+// },
+// iframeConfig: {
+// iframeContainerId: 'rair-asif' // Alchemy signer iFrame
+// }
+// }
+// });
+// if (!signer) {
+// return {};
+// }
- const alchemyTransport = alchemy({
- apiKey: chainData.alchemyAppKey
- });
+// const alchemyTransport = alchemy({
+// apiKey: chainData.alchemyAppKey
+// });
- await signer.preparePopupOauth();
+// await signer.preparePopupOauth();
- const data = await signer.authenticate({
- type: 'oauth',
- authProviderId: 'auth0',
- auth0Connection: 'github',
- mode: 'popup'
- });
+// const data = await signer.authenticate({
+// type: 'oauth',
+// authProviderId: 'auth0',
+// auth0Connection: 'github',
+// mode: 'popup'
+// });
- const client = createAlchemySmartAccountClient({
- transport: alchemyTransport,
- policyId: chainData.alchemyGasPolicy,
- chain: chainData.viem,
- account: await createLightAccount({
- chain: chainData.viem,
- transport: alchemyTransport,
- signer
- })
- });
+// const client = createAlchemySmartAccountClient({
+// transport: alchemyTransport,
+// policyId: chainData.alchemyGasPolicy,
+// chain: chainData.viem,
+// account: await createLightAccount({
+// chain: chainData.viem,
+// transport: alchemyTransport,
+// signer
+// })
+// });
- return {
- connectedChain: chainData.hash,
- currentUserAddress: data.address,
- userDetails: signer,
- client
- };
- }
-);
+// return {
+// connectedChain: chainData.hash,
+// currentUserAddress: data.address,
+// userDetails: signer,
+// client
+// };
+// }
+// );
-export const connectChainWeb3Auth = createAsyncThunk(
- 'web3/connectChainWeb3Auth',
- async (chainData: CombinedBlockchainData) => {
- if (!chainData.viem) {
- return {};
- }
- const web3AuthSigner = new Web3AuthSigner({
- clientId: import.meta.env.VITE_WEB3AUTH_CLIENT_ID,
- chainConfig: {
- chainNamespace: 'eip155',
- chainId: chainData.chainId,
- rpcTarget: chainData.rpcEndpoint,
- displayName: chainData.name,
- blockExplorer: chainData.blockExplorerGateway,
- ticker: chainData.symbol,
- tickerName: chainData.name
- },
- web3AuthNetwork: chainData.testnet
- ? WEB3AUTH_NETWORK.SAPPHIRE_DEVNET
- : WEB3AUTH_NETWORK.SAPPHIRE_MAINNET
- });
- await web3AuthSigner.authenticate({
- init: async () => {
- await web3AuthSigner.inner.initModal();
- },
- connect: async () => {
- await web3AuthSigner.inner.connect();
- }
- });
+// export const connectChainWeb3Auth = createAsyncThunk(
+// 'web3/connectChainWeb3Auth',
+// async (chainData: CombinedBlockchainData) => {
+// if (!chainData.viem) {
+// return {};
+// }
+// const web3AuthSigner = new Web3AuthSigner({
+// clientId: import.meta.env.VITE_WEB3AUTH_CLIENT_ID,
+// chainConfig: {
+// chainNamespace: 'eip155',
+// chainId: chainData.chainId,
+// rpcTarget: chainData.rpcEndpoint,
+// displayName: chainData.name,
+// blockExplorer: chainData.blockExplorerGateway,
+// ticker: chainData.symbol,
+// tickerName: chainData.name
+// },
+// web3AuthNetwork: chainData.testnet
+// ? WEB3AUTH_NETWORK.SAPPHIRE_DEVNET
+// : WEB3AUTH_NETWORK.SAPPHIRE_MAINNET
+// });
+// await web3AuthSigner.authenticate({
+// init: async () => {
+// await web3AuthSigner.inner.initModal();
+// },
+// connect: async () => {
+// await web3AuthSigner.inner.connect();
+// }
+// });
- const modularAccount = await createModularAccountAlchemyClient({
- apiKey: chainData.alchemyAppKey,
- chain: chainData.viem,
- signer: web3AuthSigner,
- gasManagerConfig: chainData.alchemyGasPolicy
- ? {
- policyId: chainData.alchemyGasPolicy
- }
- : undefined
- });
- return {
- connectedChain: chainData.hash,
- currentUserAddress: modularAccount.account.address,
- userDetails: await web3AuthSigner.getAuthDetails()
- };
- }
-);
+// const modularAccount = await createModularAccountAlchemyClient({
+// apiKey: chainData.alchemyAppKey,
+// chain: chainData.viem,
+// signer: web3AuthSigner,
+// gasManagerConfig: chainData.alchemyGasPolicy
+// ? {
+// policyId: chainData.alchemyGasPolicy
+// }
+// : undefined
+// });
+// return {
+// connectedChain: chainData.hash,
+// currentUserAddress: modularAccount.account.address,
+// userDetails: await web3AuthSigner.getAuthDetails()
+// };
+// }
+// );
export const connectChainMetamask = createAsyncThunk(
'web3/connectChainMetamask',
@@ -182,9 +180,9 @@ export const web3Slice = createSlice({
setExchangeRates: (state, action) => {
state.exchangeRates = action.payload;
},
- setRequestedChain: (state, action: PayloadAction) => {
- state.requestedChain = action.payload;
- },
+ // setRequestedChain: (state, action: PayloadAction) => {
+ // state.requestedChain = action.payload;
+ // },
setConnectedChain: (state, action: PayloadAction) => {
state.connectedChain = action.payload;
},
@@ -212,48 +210,48 @@ export const web3Slice = createSlice({
})
.addCase(connectChainMetamask.rejected, (state) => {
state.web3Status = dataStatuses.Failed;
- })
- .addCase(connectChainWeb3Auth.pending, (state) => {
- state.web3Status = dataStatuses.Loading;
- })
- .addCase(connectChainWeb3Auth.fulfilled, (state, action) => {
- state.web3Status = dataStatuses.Complete;
- if (action.payload?.connectedChain) {
- state.connectedChain = action.payload.connectedChain;
- }
- if (action.payload.currentUserAddress) {
- state.currentUserAddress =
- action.payload.currentUserAddress.toLowerCase() as Hex;
- }
- })
- .addCase(connectChainWeb3Auth.rejected, (state) => {
- state.web3Status = dataStatuses.Failed;
- })
- .addCase(connectChainAlchemyV4.pending, (state) => {
- state.web3Status = dataStatuses.Loading;
- })
- .addCase(connectChainAlchemyV4.fulfilled, (state, action) => {
- state.web3Status = dataStatuses.Complete;
- if (action.payload.connectedChain) {
- state.connectedChain = action.payload.connectedChain;
- }
- if (action.payload.currentUserAddress) {
- state.currentUserAddress =
- action.payload.currentUserAddress.toLowerCase() as Hex;
- }
- if (action.payload.userDetails) {
- state.programmaticProvider = action.payload.client;
- }
- })
- .addCase(connectChainAlchemyV4.rejected, (state) => {
- state.web3Status = dataStatuses.Failed;
});
+ // .addCase(connectChainWeb3Auth.pending, (state) => {
+ // state.web3Status = dataStatuses.Loading;
+ // })
+ // .addCase(connectChainWeb3Auth.fulfilled, (state, action) => {
+ // state.web3Status = dataStatuses.Complete;
+ // if (action.payload?.connectedChain) {
+ // state.connectedChain = action.payload.connectedChain;
+ // }
+ // if (action.payload.currentUserAddress) {
+ // state.currentUserAddress =
+ // action.payload.currentUserAddress.toLowerCase() as Hex;
+ // }
+ // })
+ // .addCase(connectChainWeb3Auth.rejected, (state) => {
+ // state.web3Status = dataStatuses.Failed;
+ // })
+ // .addCase(connectChainAlchemyV4.pending, (state) => {
+ // state.web3Status = dataStatuses.Loading;
+ // })
+ // .addCase(connectChainAlchemyV4.fulfilled, (state, action) => {
+ // state.web3Status = dataStatuses.Complete;
+ // if (action.payload.connectedChain) {
+ // state.connectedChain = action.payload.connectedChain;
+ // }
+ // if (action.payload.currentUserAddress) {
+ // state.currentUserAddress =
+ // action.payload.currentUserAddress.toLowerCase() as Hex;
+ // }
+ // if (action.payload.userDetails) {
+ // state.programmaticProvider = action.payload.client;
+ // }
+ // })
+ // .addCase(connectChainAlchemyV4.rejected, (state) => {
+ // state.web3Status = dataStatuses.Failed;
+ // });
}
});
export const {
setExchangeRates,
- setRequestedChain,
+ // setRequestedChain,
setConnectedChain,
setProgrammaticProvider,
setUserAddress
diff --git a/rair-front/src/utils/blockchainData.ts b/rair-front/src/utils/blockchainData.ts
index d62cbf032..16f4c0400 100644
--- a/rair-front/src/utils/blockchainData.ts
+++ b/rair-front/src/utils/blockchainData.ts
@@ -1,4 +1,5 @@
-import { base, mainnet, polygon, sepolia } from '@account-kit/infra';
+//@ts-nocheck
+// import { base, mainnet, polygon, sepolia } from '@account-kit/infra';
import { Network } from 'alchemy-sdk';
import { Hex } from 'viem';
@@ -50,7 +51,7 @@ const chainData: TChainData = {
image: MaticLogo,
name: 'Matic(Polygon) Mainnet',
chainId: '0x89',
- viem: polygon,
+ viem: undefined,
alchemy: Network.MATIC_MAINNET,
coingecko: 'matic-network',
alchemyAppKey: import.meta.env.VITE_MATIC_MAINNET_ALCHEMY_KEY,
@@ -70,7 +71,7 @@ const chainData: TChainData = {
image: EthereumLogo,
name: 'Ethereum Mainnet',
chainId: '0x1',
- viem: mainnet,
+ viem: undefined,
alchemy: Network.ETH_MAINNET,
coingecko: 'ethereum',
alchemyAppKey: import.meta.env.VITE_ETH_MAINNET_ALCHEMY_KEY,
@@ -81,7 +82,7 @@ const chainData: TChainData = {
image: EthereumLogo,
name: 'Ethereum Sepolia',
chainId: '0xaa36a7',
- viem: sepolia,
+ viem: undefined,
alchemy: Network.ETH_SEPOLIA,
coingecko: undefined,
alchemyAppKey: import.meta.env.VITE_ETH_SEPOLIA_ALCHEMY_KEY,
@@ -103,7 +104,7 @@ const chainData: TChainData = {
image: BaseLogo,
name: 'Base Mainnet',
chainId: '0x2105',
- viem: base,
+ viem: undefined,
alchemy: Network.BASE_MAINNET,
coingecko: 'base',
alchemyAppKey: import.meta.env.VITE_BASE_MAINNET_ALCHEMY_KEY,
diff --git a/rair-front/src/utils/checkIPFSanimation.ts b/rair-front/src/utils/checkIPFSanimation.ts
index 9e41bc0db..5d6b760a4 100644
--- a/rair-front/src/utils/checkIPFSanimation.ts
+++ b/rair-front/src/utils/checkIPFSanimation.ts
@@ -1,3 +1,5 @@
+//@ts-nocheck
+
export function checkIPFSanimation(
link = `ipfs://bafybeigims7nqm7iz7gtymqpel6gtaftrmfn53ahj7kskf6p7jytllnttm?id=1`
) {
diff --git a/rair-front/src/utils/copyEmbed.tsx b/rair-front/src/utils/copyEmbed.tsx
index 33b5e1593..b59765fd8 100644
--- a/rair-front/src/utils/copyEmbed.tsx
+++ b/rair-front/src/utils/copyEmbed.tsx
@@ -1,3 +1,5 @@
+//@ts-nocheck
+
export const copyEmbebed = (videoId: number, contract: string) => {
const iframe = `