Add tx waiting

Author: stevyhacker

Diff for: pages/_app.tsx

@@ -49,6 +49,7 @@ const moonBaseChain: Chain = {
 const { chains, provider, webSocketProvider } = configureChains(
   [
     moonBaseChain,
+    // chain.goerli,
     // moonRiverChain,
     ...(process.env.NEXT_PUBLIC_ENABLE_TESTNETS === 'true'
       ? [moonBaseChain]

Diff for: pages/contract/[contractAddress].tsx

@@ -120,6 +120,7 @@ const MultiResourceNftCollection: NextPage = () => {
         description: "Minting a new RMRK NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -138,6 +139,7 @@ const MultiResourceNftCollection: NextPage = () => {
         description: "Adding a new resource to collection",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 

Diff for: pages/contract/[contractAddress]/[tokenId].tsx

@@ -2,7 +2,7 @@ import { useRouter } from "next/router"
 import styles from "../../../styles/Home.module.css"
 import Image from "next/image"
 import React, { useEffect, useState } from "react"
-import { Contract, Signer } from "ethers"
+import { Signer } from "ethers"
 import { useContract, useProvider, useSigner } from "wagmi"
 import { ConnectButton, useAddRecentTransaction } from "@rainbow-me/rainbowkit"
 import Resource from "../../../components/resource"
@@ -33,9 +33,7 @@ const MultiResourceNft = () => {
   })
 
   useEffect(() => {
-    console.log(
-      "getting " + contractAddress + " data for token id: " + tokenId
-    )
+    console.log("getting " + contractAddress + " data for token id: " + tokenId)
     if (Number(tokenId) >= 0) {
       fetchNft().then((nft) => {
         setCollectionName(nft.name)
@@ -86,6 +84,7 @@ const MultiResourceNft = () => {
         description: "Adding a new resource to collection",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -99,6 +98,7 @@ const MultiResourceNft = () => {
         description: "Rejecting a resource for this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -112,6 +112,7 @@ const MultiResourceNft = () => {
         description: "Accepting a resource for this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -125,6 +126,7 @@ const MultiResourceNft = () => {
         description: "Adding a resource to this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 

Diff for: pages/nesting/[contractAddress].tsx

@@ -117,6 +117,7 @@ const NestingNftCollection: NextPage = () => {
         description: "Minting a new RMRK NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -135,6 +136,7 @@ const NestingNftCollection: NextPage = () => {
         description: "Adding a new resource to collection",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 

Diff for: pages/nesting/[contractAddress]/[tokenId].tsx

@@ -141,6 +141,7 @@ const NestingNft = () => {
         description: "Adding a new resource to collection",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -154,6 +155,7 @@ const NestingNft = () => {
         description: "Rejecting a resource for this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -167,6 +169,7 @@ const NestingNft = () => {
         description: "Accepting a resource for this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -180,6 +183,7 @@ const NestingNft = () => {
         description: "Adding a resource to this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -193,6 +197,7 @@ const NestingNft = () => {
         description: "Transferring child token into this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -210,6 +215,7 @@ const NestingNft = () => {
         description: "Accepting child for this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -223,19 +229,22 @@ const NestingNft = () => {
         description: "Rejecting child for this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
-  async function removeChild(index: number) {
+  async function removeChild(childId: number, index: number) {
     if (signer instanceof Signer) {
       const tx = await nestingContract
         .connect(signer)
         .removeChild(tokenId, index)
+        // .unnestChild(tokenId, childId, index)
       addRecentTransaction({
         hash: tx.hash,
         description: "Removing child from this NFT",
         confirmations: 1,
       })
+      await tx.wait(1)
     }
   }
 
@@ -290,7 +299,9 @@ const NestingNft = () => {
                     <button
                       className="btn btn-secondary btn-sm ml-2 "
                       onClick={() => {
-                        removeChild(index).then((r) => fetchNft())
+                        removeChild(Number(child.tokenId), index).then((r) =>
+                          fetchNft()
+                        )
                       }}
                     >
                       Remove child