:Merge branch 'master' of https://github.com/metaplex-foundation/meta…

…plex into feature/ux-improvements
thuglabs · Oct 18, 2021 · e76efdf · e76efdf
2 parents e00e679 + 65b421e
commit e76efdf
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 4 deletions.
diff --git a/js/packages/cli/src/fair-launch-cli.ts b/js/packages/cli/src/fair-launch-cli.ts
@@ -2402,9 +2402,9 @@ program
     console.log('Lottery results', sorted);
 
     await Promise.all(
-      // each 8 entries is 1 byte, we want to send up 1000 bytes at a time.
+      // each 8 entries is 1 byte, we want to send up 10 bytes at a time.
       // be specific here.
-      chunks(Array.from(Array(sorted.length).keys()), 8 * 1000).map(
+      chunks(Array.from(Array(sorted.length).keys()), 8 * 10).map(
         async allIndexesInSlice => {
           const bytes = [];
           const correspondingArrayOfBits = [];

diff --git a/js/packages/common/src/contexts/meta/meta.tsx b/js/packages/common/src/contexts/meta/meta.tsx
@@ -119,6 +119,27 @@ export function MetaProvider({ children = null as any }) {
     return nextState;
   }
 
+  async function pullAllSiteData() {
+    if (isLoading) return state;
+    if (!storeAddress) {
+      if (isReady) {
+        setIsLoading(false);
+      }
+      return state;
+    } else if (!state.store) {
+      setIsLoading(true);
+    }
+    console.log('------->Query started');
+
+    const nextState = await loadAccounts(connection);
+
+    console.log('------->Query finished');
+
+    setState(nextState);
+    await updateMints(nextState.metadataByMint);
+    return;
+  }
+
   async function update(
     auctionAddress?: any,
     bidderAddress?: any,
@@ -314,6 +335,7 @@ export function MetaProvider({ children = null as any }) {
         pullAuctionPage,
         pullAllMetadata,
         pullBillingPage,
+        pullAllSiteData,
         isLoading,
       }}
     >

diff --git a/js/packages/common/src/contexts/meta/types.ts b/js/packages/common/src/contexts/meta/types.ts
@@ -93,7 +93,7 @@ export interface MetaContextState extends MetaState {
   ];
   pullAuctionPage: (auctionAddress: StringPublicKey) => Promise<MetaState>;
   pullBillingPage: (auctionAddress: StringPublicKey) => void;
-
+  pullAllSiteData: () => void;
   pullAllMetadata: () => void;
 }
 

diff --git a/js/packages/web/src/components/Notifications/index.tsx b/js/packages/web/src/components/Notifications/index.tsx
@@ -320,7 +320,7 @@ export function useSettlementAuctions({
               metadataByAuction,
               undefined,
             );
-            if (completeAuctionView) {
+            if(completeAuctionView) {
               await settle(
                 connection,
                 wallet,
@@ -352,6 +352,7 @@ export function Notifications() {
     store,
     vaults,
     safetyDepositBoxesByVaultAndIndex,
+    pullAllSiteData,
   } = useMeta();
   const possiblyBrokenAuctionManagerSetups = useAuctions(
     AuctionViewState.Defective,
@@ -408,6 +409,26 @@ export function Notifications() {
     });
   });
 
+  notifications.push({
+    id: 'none',
+    title: 'Search for other auctions.',
+    description: (
+      <span>
+        Load all auctions (including defectives) by pressing here. Then you can
+        close them.
+      </span>
+    ),
+    action: async () => {
+      try {
+        await pullAllSiteData();
+      } catch (e) {
+        console.error(e);
+        return false;
+      }
+      return true;
+    },
+  });
+
   possiblyBrokenAuctionManagerSetups
     .filter(v => v.auctionManager.authority === walletPubkey)
     .forEach(v => {