Merge pull request #1217 from scroll-tech/remove-mintable-badge-batch…

…-check fix: remove batch badge eligibility check
scroll-tech · Jul 31, 2024 · 964e8f0 · 964e8f0
2 parents a142341 + eb60b3e
commit 964e8f0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 26 deletions.
diff --git a/src/pages/canvas/Dashboard/ActionBox/index.tsx b/src/pages/canvas/Dashboard/ActionBox/index.tsx
@@ -143,8 +143,6 @@ const ActionBox = () => {
     changeReferDialog,
     changeBadgesDialogVisible,
     upgradableBadges,
-    mintableBadges,
-    pickMintableBadgesLoading,
     pickUpgradableBadgesLoading,
   } = useCanvasStore()
 
@@ -211,8 +209,8 @@ const ActionBox = () => {
           }
         },
         visible: !othersWalletAddress,
-        withBadge: !!mintableBadges.length || !!upgradableBadges.length,
-        loading: pickMintableBadgesLoading || pickUpgradableBadgesLoading,
+        withBadge: !!upgradableBadges.length,
+        loading: pickUpgradableBadgesLoading,
         menu: {
           anchorEl: badgesAnchorEl,
           open: badgesOpen,
@@ -226,15 +224,6 @@ const ActionBox = () => {
                 changeCustomizeDisplayDialogVisible(true)
               },
             },
-            {
-              key: "mint",
-              label: "Mint eligible badges",
-              extra: mintableBadges.length ? <BadgeCount>{mintableBadges.length > 99 ? "99+" : mintableBadges.length}</BadgeCount> : null,
-              onClick: () => {
-                handleCloseMenu()
-                changeBadgesDialogVisible(BadgesDialogType.MINT)
-              },
-            },
             ...(upgradableBadges.length
               ? [
                   {
@@ -326,9 +315,7 @@ const ActionBox = () => {
     shareOpen,
     handleCopyLink,
     copied,
-    mintableBadges.length,
     upgradableBadges.length,
-    pickMintableBadgesLoading,
     pickUpgradableBadgesLoading,
   ])
 

diff --git a/src/pages/canvas/Dashboard/BadgeDetailDialog/index.tsx b/src/pages/canvas/Dashboard/BadgeDetailDialog/index.tsx
@@ -68,7 +68,6 @@ const BadgeDetailDialog = () => {
     isBadgeUpgrading,
     changeIsBadgeMinting,
     changeIsBadgeUpgrading,
-    pickMintableBadges,
     changeSelectedBadge,
     upgradeBadgeAndRefreshUserBadges,
   } = useCanvasStore()
@@ -113,7 +112,6 @@ const BadgeDetailDialog = () => {
       // const result: any = await testAsyncFunc("0x11cfb299dda2ae8b1fccf9a055394de9a7f953e8b8f115295dc0f2325e8b2130")
       if (result) {
         await queryVisibleBadges(provider, walletCurrentAddress)
-        await pickMintableBadges(provider, walletCurrentAddress, false)
         alertWarning(
           <>
             {selectedBadge.name} minted successfully!<br></br>

diff --git a/src/pages/canvas/Dashboard/index.tsx b/src/pages/canvas/Dashboard/index.tsx
@@ -46,9 +46,7 @@ const Dashboard = props => {
     badgesDialogVisible,
     mintableBadges,
     upgradableBadges,
-    pickMintableBadges,
     pickUpgradableBadges,
-    pickMintableBadgesLoading,
     pickUpgradableBadgesLoading,
   } = useCanvasStore()
 
@@ -59,10 +57,7 @@ const Dashboard = props => {
   }
 
   useEffect(() => {
-    // recheck badge eligibility when openning badges dialog
-    if (badgesDialogVisible === BadgesDialogType.MINT) {
-      pickMintableBadges(publicProvider, walletCurrentAddress, true)
-    } else if (badgesDialogVisible === BadgesDialogType.UPGRADE) {
+    if (badgesDialogVisible === BadgesDialogType.UPGRADE) {
       pickUpgradableBadges(publicProvider)
     }
   }, [badgesDialogVisible])
@@ -112,8 +107,6 @@ const Dashboard = props => {
       changeProfileDetailLoading(true)
       const signer = await provider?.getSigner(0)
       await fetchCurrentCanvasDetail(signer, walletAddress, profileAddress)
-      // initially check eligibility
-      pickMintableBadges(provider, walletAddress, true)
       pickUpgradableBadges(provider)
     } catch (e) {
       alertWarning(e.message)
@@ -201,7 +194,7 @@ const Dashboard = props => {
               <ReferDialog />
               <BadgesDialog
                 badges={badgesDialogVisible === BadgesDialogType.MINT ? mintableBadges : upgradableBadges}
-                loading={pickMintableBadgesLoading || pickUpgradableBadgesLoading}
+                loading={pickUpgradableBadgesLoading}
               />
               <BadgeDetailDialog />
             </>

diff --git a/src/stores/canvasStore.ts b/src/stores/canvasStore.ts
@@ -403,6 +403,7 @@ const useCanvasStore = create<CanvasStore>()((set, get) => ({
     })
   },
 
+  // not in use
   pickMintableBadges: async (provider, walletCurrentAddress, refresh) => {
     set({
       pickMintableBadgesLoading: true,
-Original file line number
+Diff line change
@@ Expand Up @@
         })
       },
+      // not in use
       pickMintableBadges: async (provider, walletCurrentAddress, refresh) => {
         set({
           pickMintableBadgesLoading: true,
@@ Expand Down @@