LaconicNetwork/laconic-wallet-web
27
0
Fork 2
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases 13 Wiki Activity

Remove unnecessary code from ApproveTransfer

Browse Source
This commit is contained in:
AdityaSalunkhe21 2025-04-16 20:12:04 +05:30 committed by pranavjadhav007
parent 6ce613ccce
commit d56d3aa040
2 changed files with 55 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
src/screens/ApproveTransfer.tsx
View File

@ -46,29 +46,22 @@ export const MEMO = 'Sending signed tx from Laconic Wallet';
// Reference: https://ethereum.org/en/developers/docs/gas/#what-is-gas-limit
const ETH_MINIMUM_GAS = 21000;
type ApproveTransferProps = NativeStackScreenProps<StackParamsList, 'ApproveTransfer'> & {
route: {
params: {
transaction: any;
requestEvent?: {
params: {
chainId: string;
request: {
method: string;
};
};
};
requestSessionData?: any;
chainId?: string;
};
path?: string;
};
};
type ApproveTransferProps = NativeStackScreenProps<StackParamsList, 'ApproveTransfer'>
const ApproveTransfer = ({ route }: ApproveTransferProps) => {
const { networksData } = useNetworks();
const { web3wallet } = useWalletConnect();
// Extract data from route params or path
const requestSession = route.params?.requestSessionData;
const requestName = requestSession?.peer?.metadata?.name;
const requestIcon = requestSession?.peer?.metadata?.icons?.[0];
const requestURL = requestSession?.peer?.metadata?.url;
const transaction = route.params?.transaction;
const requestEvent = route.params?.requestEvent;
const chainId = requestEvent?.params?.chainId || route.params?.chainId;
const requestMethod = requestEvent?.params?.request?.method;
const [account, setAccount] = useState<Account>();
const [isLoading, setIsLoading] = useState(true);
const [balance, setBalance] = useState<string>('');
@ -85,80 +78,6 @@ const ApproveTransfer = ({ route }: ApproveTransferProps) => {
const [ethMaxPriorityFee, setEthMaxPriorityFee] =
useState<BigNumber | null>();
const navigation =
useNavigation<NativeStackNavigationProp<StackParamsList>>();
// Extract data from route params or path
const requestSession = route.params?.requestSessionData;
const requestName = requestSession?.peer?.metadata?.name;
const requestIcon = requestSession?.peer?.metadata?.icons?.[0];
const requestURL = requestSession?.peer?.metadata?.url;
const transaction = route.params?.transaction;
const requestEvent = route.params?.requestEvent;
const chainId = requestEvent?.params?.chainId || route.params?.chainId;
const requestMethod = requestEvent?.params?.request?.method;
const sanitizePath = useCallback((path: string) => {
const regex = /^\/transfer\/(eip155|cosmos)\/(.+)\/(.+)\/(.+)\/(.+)$/;
const match = path.match(regex);
if (match) {
const [, pathNamespace, pathChainId, pathAddress, pathTo, pathAmount] = match;
return {
namespace: pathNamespace,
chainId: pathChainId,
address: pathAddress,
to: pathTo,
amount: pathAmount,
};
} else {
navigation.navigate('InvalidPath');
}
return null;
}, [navigation]);
const retrieveData = useCallback(async (requestNamespace: string, requestChainId: string, requestAddress: string) => {
const requestAccount = await retrieveSingleAccount(
requestNamespace,
requestChainId,
requestAddress,
);
if (!requestAccount) {
navigation.navigate('InvalidPath');
return;
}
setAccount(requestAccount);
}, [navigation]);
useEffect(() => {
if (route.path) {
const sanitizedRoute = sanitizePath(route.path);
if (sanitizedRoute) {
retrieveData(
sanitizedRoute.namespace,
sanitizedRoute.chainId,
sanitizedRoute.address,
);
return;
}
}
if (requestEvent) {
const requestedNetwork = networksData.find(
networkData => {
return `${networkData.namespace}:${networkData.chainId}` === chainId;
}
);
if (requestedNetwork && transaction?.from) {
retrieveData(
requestedNetwork.namespace,
requestedNetwork.chainId,
transaction.from,
);
}
}
}, [retrieveData, sanitizePath, route, networksData, requestEvent, chainId, transaction]);
const isSufficientFunds = useMemo(() => {
if (!transaction.value) {
return;
@ -218,7 +137,7 @@ const ApproveTransfer = ({ route }: ApproveTransferProps) => {
).privKey;
const sender = await DirectSecp256k1Wallet.fromKey(
Uint8Array.from(Buffer.from(cosmosPrivKey.split('0x')[1], 'hex')),
Buffer.from(cosmosPrivKey.split('0x')[1], 'hex'),
requestedNetwork?.addressPrefix,
);
@ -264,6 +183,44 @@ const ApproveTransfer = ({ route }: ApproveTransferProps) => {
}
}, [requestedNetwork, namespace]);
const navigation =
useNavigation<NativeStackNavigationProp<StackParamsList>>();
const sanitizePath = useCallback((path: string) => {
const regex = /^\/transfer\/(eip155|cosmos)\/(.+)\/(.+)\/(.+)\/(.+)$/;
const match = path.match(regex);
if (match) {
const [, pathNamespace, pathChainId, pathAddress, pathTo, pathAmount] = match;
return {
namespace: pathNamespace,
chainId: pathChainId,
address: pathAddress,
to: pathTo,
amount: pathAmount,
};
} else {
navigation.navigate('InvalidPath');
}
return null;
}, [navigation]);
const retrieveData = useCallback(
async (requestAddress: string) => {
const requestAccount = await retrieveSingleAccount(
requestedNetwork!.namespace,
requestedNetwork!.chainId,
requestAddress,
);
if (!requestAccount) {
navigation.navigate('InvalidPath');
return;
}
setAccount(requestAccount);
},
[navigation, requestedNetwork],
);
useEffect(() => {
// Set loading to false when gas values for requested chain are fetched
// If requested chain is EVM compatible, the cosmos gas values will be undefined and vice-versa, hence the condition checks only one of them at the same time
@ -306,6 +263,10 @@ const ApproveTransfer = ({ route }: ApproveTransferProps) => {
ethMaxFee,
]);
useEffect(() => {
retrieveData(transaction.from!);
}, [retrieveData, transaction]);
const isEIP1559 = useMemo(() => {
if (cosmosGasLimit) {
return;

1
src/types.ts
View File

@ -21,6 +21,7 @@ export type StackParamsList = {
requestSessionData?: SessionTypes.Struct;
};
ApproveTransfer: {
chainId?: string;
transaction: PopulatedTransaction;
requestEvent: Web3WalletTypes.SessionRequest;
requestSessionData: SessionTypes.Struct;