Up-to-date with Metaplex fix

crusaderincode · Jul 4, 2022 · 7070093 · 7070093
1 parent 17f1a6f
commit 7070093
Show file tree

Hide file tree

Showing 11 changed files with 1,111 additions and 802 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Intoduction
 **candy-machine-ui** is a fork of [Fulgurus/candy-machine-v2-responsive-ui](https://github.com/pandao/editor.md "link") repo.
 
+**Up-to-date with metaplex from v1.1.** 
 ## Features
 
 - **Auto refresh.** Every few seconds ui is updated, This allows you to track the amount of minted NFTs in real time.  

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/index.html b/public/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Forest Industry"
+      content="Candy Machine UI"
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
     <!--
@@ -24,7 +24,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>Forest Industry</title>
+    <title>Candy Machine UI</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/public/logo192.png b/public/logo192.png
diff --git a/public/logo512.png b/public/logo512.png
diff --git a/src/App.tsx b/src/App.tsx
@@ -23,27 +23,36 @@ import {
 } from '@solana/wallet-adapter-react-ui';
 
 import "./App.css";
+import { DEFAULT_TIMEOUT } from './connection';
 import {MintPage} from "./Home";
 
 require('@solana/wallet-adapter-react-ui/styles.css');
 
+const getCandyMachineId = (): anchor.web3.PublicKey | undefined => {
+    try {
+        const candyMachineId = new anchor.web3.PublicKey(
+            process.env.REACT_APP_CANDY_MACHINE_ID!,
+        );
 
-const candyMachineId = new anchor.web3.PublicKey(
-  process.env.REACT_APP_CANDY_MACHINE_ID!
-);
+        return candyMachineId;
+    } catch (e) {
+        console.log('Failed to construct CandyMachineId', e);
+        return undefined;
+    }
+};
+
+const candyMachineId = getCandyMachineId();
 
 const network = process.env.REACT_APP_SOLANA_NETWORK as WalletAdapterNetwork;
 
 const rpcHost = process.env.REACT_APP_SOLANA_RPC_HOST!;
-const connection = new anchor.web3.Connection(rpcHost);
-
-const txTimeout = 30000; // milliseconds (confirm this works for your project)
-
-
+const connection = new anchor.web3.Connection(
+    rpcHost ? rpcHost : anchor.web3.clusterApiUrl('devnet'),
+);
 
 const App = () => {
     // Custom RPC endpoint.
-  const endpoint = useMemo(() => clusterApiUrl(network), []);
+    const endpoint = useMemo(() => clusterApiUrl(network), []);
 
     // @solana/wallet-adapter-wallets includes all the adapters but supports tree shaking and lazy loading --
     // Only the wallets you configure here will be compiled into your application, and only the dependencies
@@ -63,21 +72,21 @@ const App = () => {
         []
     );
 
-  return (
-
+    return (
         <ConnectionProvider endpoint={endpoint}>
-          <WalletProvider wallets={wallets} autoConnect={true}>
-            <WalletModalProvider>
-              <MintPage
-                candyMachineId={candyMachineId}
-                connection={connection}
-                txTimeout={txTimeout}
-                rpcHost={rpcHost}
-              />
-            </WalletModalProvider>
-          </WalletProvider>
+            <WalletProvider wallets={wallets} autoConnect={true}>
+                <WalletModalProvider>
+                    <MintPage
+                        candyMachineId={candyMachineId}
+                        connection={connection}
+                        txTimeout={DEFAULT_TIMEOUT}
+                        rpcHost={rpcHost}
+                        network={network}
+                    />
+                </WalletModalProvider>
+            </WalletProvider>
         </ConnectionProvider>
-  );
+    );
 };
 
 export default App;