Merge branch 'main' into auction

AFK-AlignedFamKernel · Dec 2, 2024 · 94ef14a · 94ef14a
2 parents 19c9425 + 138073d
commit 94ef14a
Show file tree

Hide file tree

Showing 22 changed files with 758 additions and 117 deletions.
diff --git a/apps/mobile/src/hooks/modals/useTransaction.ts b/apps/mobile/src/hooks/modals/useTransaction.ts
@@ -18,6 +18,7 @@ export const useTransaction = ({callsProps=[]}: UseTransactionInterface) => {
   const explorer = useExplorer();
   const kakarotScanTxUrl = 'https://sepolia.kakarotscan.org/tx/';
   const [txUrl, setTxUrl] = useState<string | undefined>(undefined);
+  const [txHash, setTxHash] = useState<string | undefined>(undefined);
   const {address, isConnected, connector} = useAccount();
   let walletType;
   if (connector instanceof InjectedConnector) {
@@ -59,18 +60,26 @@ export const useTransaction = ({callsProps=[]}: UseTransactionInterface) => {
       // const {transaction_hash} = await writeAsync(args)
       const transaction_hash = await sendTransactionTx();
 
-      return true;
+      setTxHash(transaction_hash)
+      return {
+        isOk:true,
+        transaction_hash
+      };
       // return new Promise<GetTransactionReceiptResponse>((resolve) => {
       //   showTransactionModal(transaction_hash, resolve);
       // });
     } catch (error) {
       hideTransactionModal();
-      return undefined;
+      return {
+        transaction_hash:undefined,
+        isOk:false
+      };
     }
   };
 
   return {
     sendTransaction,
     txUrl,
+    txHash
   };
 };
diff --git a/apps/mobile/src/modules/KeyModal/FormInstantiateKey.tsx b/apps/mobile/src/modules/KeyModal/FormInstantiateKey.tsx
@@ -51,7 +51,7 @@ export const FormInstantiateKey = ({
 
   const account = useAccount();
   const walletModal = useWalletModal();
-  const {sendTransaction, txUrl} = useTransaction({});
+  const {sendTransaction, txUrl, txHash} = useTransaction({});
   const {hide: hideTransactionModal} = useTransactionModal();
   const waitConnection = useWaitConnection();
   const {handleInstantiateKeys} = useInstantiateKeys();
@@ -96,7 +96,7 @@ export const FormInstantiateKey = ({
     };
     if (!account || !account?.account) return;
 
-    const receipt = await sendTransaction(
+    const {transaction_hash} = await sendTransaction(
       [call],
       // {
       //   contractAddress: ESCROW_ADDRESSES[CHAIN_ID],
@@ -111,7 +111,7 @@ export const FormInstantiateKey = ({
     //   // await handleInstantiateKeys(account?.account);
     // }
 
-    if (receipt) {
+    if (txHash && transaction_hash) {
       hideTransactionModal();
       showSuccess({
         amount: Number(amount),

diff --git a/apps/mobile/src/modules/TipModal/lightning/index.tsx b/apps/mobile/src/modules/TipModal/lightning/index.tsx
@@ -40,7 +40,7 @@ export const TipModalStarknet = forwardRef<Modalize, TipModalStarknetProps>(
 
     const account = useAccount();
     const walletModal = useWalletModal();
-    const sendTransaction = useTransaction();
+    const {sendTransaction} = useTransaction({});
     const {hide: hideTransactionModal} = useTransactionModal();
     const waitConnection = useWaitConnection();
 
@@ -72,8 +72,8 @@ export const TipModalStarknet = forwardRef<Modalize, TipModalStarknetProps>(
         DEFAULT_TIMELOCK, // timelock
       ]);
 
-      const receipt = await sendTransaction({
-        calls: [
+      const {transaction_hash} = await sendTransaction(
+        [
           {
             contractAddress: TOKENS[token][CHAIN_ID].address,
             entrypoint: Entrypoint.APPROVE,
@@ -85,9 +85,9 @@ export const TipModalStarknet = forwardRef<Modalize, TipModalStarknetProps>(
             calldata: depositCallData,
           },
         ],
-      });
+      );
 
-      if (receipt?.isSuccess()) {
+      if (transaction_hash) {
         hideTipModal();
         hideTransactionModal();
         showSuccess({
@@ -102,9 +102,9 @@ export const TipModalStarknet = forwardRef<Modalize, TipModalStarknetProps>(
         });
       } else {
         let description = 'Please Try Again Later.';
-        if (receipt?.isRejected()) {
-          description = receipt.transaction_failure_reason.error_message;
-        }
+        // if (transaction_hash?.isRejected()) {
+          // description = receipt.transaction_failure_reason.error_message;
+        // }
 
         showDialog({
           title: 'Failed to send the tip',

diff --git a/apps/mobile/src/modules/TipModal/starknet/form.tsx b/apps/mobile/src/modules/TipModal/starknet/form.tsx
@@ -45,7 +45,8 @@ export const FormTipStarknet: React.FC<FormTipModalStarknetProps> = ({
 
   const account = useAccount();
   const walletModal = useWalletModal();
-  const sendTransaction = useTransaction();
+  // const sendTransaction = useTransaction({});
+  const {sendTransaction} = useTransaction({});
   const {hide: hideTransactionModal} = useTransactionModal();
   const waitConnection = useWaitConnection();
 
@@ -76,9 +77,7 @@ export const FormTipStarknet: React.FC<FormTipModalStarknetProps> = ({
       uint256.bnToUint256(`0x${event?.pubkey}`), // Recipient nostr pubkey
       DEFAULT_TIMELOCK, // timelock
     ]);
-
-    const receipt = await sendTransaction({
-      calls: [
+    const receipt = await sendTransaction([
         {
           contractAddress: TOKENS[token][CHAIN_ID].address,
           entrypoint: Entrypoint.APPROVE,
@@ -90,9 +89,10 @@ export const FormTipStarknet: React.FC<FormTipModalStarknetProps> = ({
           calldata: depositCallData,
         },
       ],
-    });
+    );
 
-    if (receipt?.isSuccess()) {
+    // TODO add receipt
+     if (receipt?.transaction_hash) {
       hideTipModal();
       hideTransactionModal();
       showSuccess({
@@ -107,16 +107,33 @@ export const FormTipStarknet: React.FC<FormTipModalStarknetProps> = ({
       });
     } else {
       let description = 'Please Try Again Later.';
-      if (receipt?.isRejected()) {
-        description = receipt.transaction_failure_reason.error_message;
-      }
+      // if (receipt?.isRejected()) {
+        // description = receipt.transaction_failure_reason.error_message;
+      // }
 
       showDialog({
         title: 'Failed to send the tip',
         description,
         buttons: [{type: 'secondary', label: 'Close', onPress: () => hideDialog()}],
       });
     }
+
+    // const receipt = await sendTransaction({
+    //   calls: [
+    //     {
+    //       contractAddress: TOKENS[token][CHAIN_ID].address,
+    //       entrypoint: Entrypoint.APPROVE,
+    //       calldata: approveCallData,
+    //     },
+    //     {
+    //       contractAddress: ESCROW_ADDRESSES[CHAIN_ID],
+    //       entrypoint: Entrypoint.DEPOSIT,
+    //       calldata: depositCallData,
+    //     },
+    //   ],
+    // });
+
+
   };
 
   return (

diff --git a/apps/mobile/src/modules/TokenCreatedModal/FormInstantiateKey.tsx b/apps/mobile/src/modules/TokenCreatedModal/FormInstantiateKey.tsx
@@ -51,7 +51,7 @@ export const FormInstantiateKey = ({
 
   const account = useAccount();
   const walletModal = useWalletModal();
-  const sendTransaction = useTransaction();
+  const {sendTransaction} = useTransaction({});
   const {hide: hideTransactionModal} = useTransactionModal();
   const waitConnection = useWaitConnection();
   const {handleInstantiateKeys} = useInstantiateKeys();
@@ -96,24 +96,24 @@ export const FormInstantiateKey = ({
     };
     if (!account || !account?.account) return;
 
-    const receipt = await sendTransaction({
-      calls: [
+    const receipt = await sendTransaction(
+      [
         call,
         // {
         //   contractAddress: ESCROW_ADDRESSES[CHAIN_ID],
         //   entrypoint: Entrypoint.DEPOSIT,
         //   calldata: depositCallData,
         // },
       ],
-    });
+    );
     // const tx = await account?.account?.execute([call], undefined, {});
     // console.log('tx hash', tx?.transaction_hash);
     // if (tx?.transaction_hash) {
     //   const wait_tx = await account?.account?.waitForTransaction(tx?.transaction_hash);
     //   // await handleInstantiateKeys(account?.account);
     // }
 
-    if (receipt?.isSuccess()) {
+    if (receipt?.transaction_hash) {
       hideTransactionModal();
       showSuccess({
         amount: Number(amount),
@@ -132,9 +132,9 @@ export const FormInstantiateKey = ({
       });
     } else {
       let description = 'Please Try Again Later.';
-      if (receipt?.isRejected()) {
-        description = receipt.transaction_failure_reason.error_message;
-      }
+      // if (receipt?.isRejected()) {
+        // description = receipt.transaction_failure_reason.error_message;
+      // }
 
       showDialog({
         title: 'Failed to send the tip',

diff --git a/apps/mobile/src/screens/KeysMarketplace/index.tsx b/apps/mobile/src/screens/KeysMarketplace/index.tsx
@@ -23,7 +23,7 @@ export const KeysMarketplace: React.FC<KeysMarketplaceSreenProps> = () => {
 
   const {provider} = useProvider();
   const account = useAccount();
-  const sendTransaction = useTransaction();
+  const {sendTransaction} = useTransaction({});
   const claim = useClaim();
   const estimateClaim = useEstimateClaim();
   const walletModal = useWalletModal();

diff --git a/apps/mobile/src/screens/Launchpad/index.tsx b/apps/mobile/src/screens/Launchpad/index.tsx
@@ -19,7 +19,7 @@ export const LaunchpadScreen: React.FC<LaunchpadScreenProps> = () => {
 
   const {provider} = useProvider();
   const account = useAccount();
-  const sendTransaction = useTransaction({});
+  const {sendTransaction} = useTransaction({});
   const waitConnection = useWaitConnection();
   const {show: showTransactionModal} = useTransactionModal();
   const {showToast} = useToast();

diff --git a/apps/mobile/src/screens/Tips/TipsComponent.tsx b/apps/mobile/src/screens/Tips/TipsComponent.tsx
@@ -156,10 +156,9 @@ export const TipsComponent: React.FC = () => {
           entrypoint: Entrypoint.CLAIM,
           calldata: claimCalldata,
         }]
-
       );
 
-      if (receipt) {
+      if (receipt?.transaction_hash) {
         tips.refetch();
         showToast({ type: 'success', title: 'Tip claimed successfully' });
       } else {