Merge branch 'f' into therealLitJesus

js/packages/fair-launch/src/Home.tsx

@@ -12,8 +12,7 @@ import Button from '@material-ui/core/Button';
 import Paper from '@material-ui/core/Paper';
 import Typography from '@material-ui/core/Typography';
 import Grid from '@material-ui/core/Grid';
-import { createStyles, Theme, withStyles } from '@material-ui/core/styles';
-import Backdrop from '@material-ui/core/Backdrop';
+import { createStyles, Theme } from '@material-ui/core/styles';
 import { PhaseCountdown } from './countdown';
 import Dialog from '@material-ui/core/Dialog';
 import MuiDialogTitle from '@material-ui/core/DialogTitle';
@@ -41,7 +40,6 @@ import {
   getFairLaunchState,
   punchTicket,
   purchaseTicket,
-  withdrawFunds,
 } from './fair-launch';
 
 import { formatNumber, getAtaForMint, toDate } from './utils';
@@ -57,8 +55,6 @@ font-size: 16px;
 font-weight: bold;
 `;
 
-const CounterText = styled.span``; // add your styles here
-
 const MintContainer = styled.div``; // add your styles here
 
 const MintButton = styled(Button)`
@@ -122,13 +118,6 @@ const ValueSlider = styled(Slider)({
   },
 });
 
-const LimitedBackdrop = withStyles({
-  root: {
-    position: 'absolute',
-    zIndex: 1,
-  },
-})(Backdrop);
-
 enum Phase {
   Phase0,
   Phase1,
@@ -233,33 +222,7 @@ const isWinner = (fairLaunch: FairLaunchAccount | undefined): boolean => {
   return isWinner > 0;
 };
 
-enum LotteryState {
-  Brewing = 'Brewing',
-  Finished = 'Finished',
-  PastDue = 'Past Due',
-}
-
-const getLotteryState = (
-  phaseThree: boolean | undefined,
-  lottery: Uint8Array | null,
-  lotteryDuration: anchor.BN,
-  phaseTwoEnd: anchor.BN,
-): LotteryState => {
-  if (
-    !phaseThree &&
-    (!lottery || lottery.length === 0) &&
-    phaseTwoEnd.add(lotteryDuration).lt(new anchor.BN(Date.now() / 1000))
-  ) {
-    return LotteryState.PastDue;
-  } else if (phaseThree) {
-    return LotteryState.Finished;
-  } else {
-    return LotteryState.Brewing;
-  }
-};
-
 const Home = (props: HomeProps) => {
-  const [balance, setBalance] = useState<number>();
   const [fairLaunchBalance, setFairLaunchBalance] = useState<number>();
   const [isMinting, setIsMinting] = useState(false); // true when user got to press MINT
   const [contributed, setContributed] = useState(0);
@@ -281,7 +244,7 @@ const Home = (props: HomeProps) => {
       signAllTransactions: wallet.signAllTransactions,
       signTransaction: wallet.signTransaction,
     } as anchor.Wallet;
-  }, [wallet, wallet.publicKey]);
+  }, [wallet]);
 
   const [alertState, setAlertState] = useState<AlertState>({
     open: false,
@@ -353,29 +316,10 @@ const Home = (props: HomeProps) => {
         severity: 'error',
       });
     } finally {
-      if (wallet?.publicKey) {
-        const balance = await props.connection.getBalance(wallet?.publicKey);
-        setBalance(balance / LAMPORTS_PER_SOL);
-      }
       setIsMinting(false);
     }
   };
 
-  useEffect(() => {
-    (async () => {
-      if (anchorWallet?.publicKey) {
-        try {
-          const balance = await props.connection.getBalance(
-            anchorWallet.publicKey,
-          );
-          setBalance(balance / LAMPORTS_PER_SOL);
-        } catch {
-          // ignore connection error
-        }
-      }
-    })();
-  }, [anchorWallet, props.connection]);
-
   useEffect(() => {
     (async () => {
       if (!anchorWallet) {
@@ -433,7 +377,7 @@ const Home = (props: HomeProps) => {
         console.log(e);
       }
     })();
-  }, [anchorWallet, props.candyMachineId, props.connection]);
+  }, [anchorWallet, props.candyMachineId, props.connection, props.fairLaunchId]);
 
   const min = formatNumber.asNumber(fairLaunch?.state.data.priceRangeStart);
   const max = formatNumber.asNumber(fairLaunch?.state.data.priceRangeEnd);
@@ -511,22 +455,6 @@ const Home = (props: HomeProps) => {
     });
   };
 
-  const onWithdraw = async () => {
-    if (!anchorWallet) {
-      return;
-    }
-
-    console.log('withdraw');
-    setIsMinting(true);
-    await withdrawFunds(anchorWallet, fairLaunch);
-    setIsMinting(false);
-    setAlertState({
-      open: true,
-      message: 'Congratulations! Funds withdrawn!',
-      severity: 'success',
-    });
-  };
-
   const phase = getPhase(fairLaunch, candyMachine);
 
   const candyMachinePredatesFairLaunch =
@@ -1011,12 +939,4 @@ interface AlertState {
   severity: 'success' | 'info' | 'warning' | 'error' | undefined;
 }
 
-const renderCounter = ({ days, hours, minutes, seconds, completed }: any) => {
-  return (
-    <CounterText>
-      {hours} hours, {minutes} minutes, {seconds} seconds
-    </CounterText>
-  );
-};
-
 export default Home;

js/packages/fair-launch/src/connection.tsx

@@ -1,6 +1,5 @@
 import {
   Keypair,
-  clusterApiUrl,
   Commitment,
   Connection,
   RpcResponseAndContext,
@@ -14,7 +13,6 @@ import {
 } from '@solana/web3.js';
 
 import {
-  WalletAdapter,
   WalletNotConnectedError,
 } from '@solana/wallet-adapter-base';
 
@@ -275,6 +273,7 @@ export const sendTransaction = async (
     if (confirmation?.err) {
       const errors = await getErrorForTransaction(connection, txid);
 
+      console.log(errors);
       throw new Error(`Raw transaction ${txid} failed`);
     }
   }

js/packages/fair-launch/src/fair-launch.ts

@@ -82,6 +82,31 @@ export interface FairLaunchState {
   treasurySnapshot: null;
 }
 
+export enum LotteryState {
+  Brewing = 'Brewing',
+  Finished = 'Finished',
+  PastDue = 'Past Due',
+}
+
+export const getLotteryState = (
+  phaseThree: boolean | undefined,
+  lottery: Uint8Array | null,
+  lotteryDuration: anchor.BN,
+  phaseTwoEnd: anchor.BN,
+): LotteryState => {
+  if (
+    !phaseThree &&
+    (!lottery || lottery.length === 0) &&
+    phaseTwoEnd.add(lotteryDuration).lt(new anchor.BN(Date.now() / 1000))
+  ) {
+    return LotteryState.PastDue;
+  } else if (phaseThree) {
+    return LotteryState.Finished;
+  } else {
+    return LotteryState.Brewing;
+  }
+};
+
 export const getFairLaunchState = async (
   anchorWallet: anchor.Wallet,
   fairLaunchId: anchor.web3.PublicKey,