From bb952ced4e3a6e49fe89a287980851bac60990b9 Mon Sep 17 00:00:00 2001
From: Jordan Prince <jordanmprince@gmail.com>
Date: Mon, 26 Apr 2021 23:57:18 -0500
Subject: [PATCH] Resolve conflicts and remove print stmts

---
 packages/metavinci/src/actions/nft.tsx      |  5 ++---
 packages/metavinci/src/hooks/useAuction.ts  |  1 -
 packages/metavinci/src/hooks/useAuctions.ts | 10 ----------
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/packages/metavinci/src/actions/nft.tsx b/packages/metavinci/src/actions/nft.tsx
index d38799a..9c76a3d 100644
--- a/packages/metavinci/src/actions/nft.tsx
+++ b/packages/metavinci/src/actions/nft.tsx
@@ -151,7 +151,7 @@ export const mintNFT = async (
 
   // Force wait for max confirmations
   // await connection.confirmTransaction(txid, 'max');
-  await connection.getParsedConfirmedTransaction(txid, 'confirmed');
+  await connection.getParsedConfirmedTransaction(txid);
 
   // this means we're done getting AR txn setup. Ship it off to ARWeave!
   const data = new FormData();
@@ -183,8 +183,7 @@ export const mintNFT = async (
   const metadataFile = result.messages?.find(
     m => m.filename == RESERVED_TXN_MANIFEST,
   );
-  if (metadataFile?.transactionId && wallet.publicKey)
-  {
+  if (metadataFile?.transactionId && wallet.publicKey) {
     const updateInstructions: TransactionInstruction[] = [];
     const updateSigners: Account[] = [];
 
diff --git a/packages/metavinci/src/hooks/useAuction.ts b/packages/metavinci/src/hooks/useAuction.ts
index 7fc8f90..2619b24 100644
--- a/packages/metavinci/src/hooks/useAuction.ts
+++ b/packages/metavinci/src/hooks/useAuction.ts
@@ -30,7 +30,6 @@ export const useAuction = (id: string) => {
   useEffect(() => {
     const auction = auctions[id];
     if (auction) {
-      console.log(bidderMetadataByAuctionAndBidder);
       const auctionView = processAccountsIntoAuctionView(
         auction,
         auctionManagers,
diff --git a/packages/metavinci/src/hooks/useAuctions.ts b/packages/metavinci/src/hooks/useAuctions.ts
index 4371efd..f477471 100644
--- a/packages/metavinci/src/hooks/useAuctions.ts
+++ b/packages/metavinci/src/hooks/useAuctions.ts
@@ -150,17 +150,7 @@ export function processAccountsIntoAuctionView(
       bidderPotsByAuctionAndBidder[
         auction.pubkey.toBase58() + '-' + myPayingAccount?.pubkey.toBase58()
       ];
-    if (
-      auction.pubkey.toBase58() ==
-      'CLxhAeuhz8KX3y8yEWHADtmTzE26ofAnd6j8zwMXjW9P'
-    ) {
-      console.log(
-        'I found',
 
-        bidderMetadata,
-        myPayingAccount?.pubkey.toBase58(),
-      );
-    }
     if (existingAuctionView && existingAuctionView.totallyComplete) {
       // If totally complete, we know we arent updating anythign else, let's speed things up
       // and only update the two things that could possibly change