From 2ffcf6c2f763ae6815aad28c0b39e878f2bb766b Mon Sep 17 00:00:00 2001
From: Jason Ridgway-Taylor <jason@glottologist.co.uk>
Date: Thu, 16 Nov 2023 19:57:10 +0800
Subject: [PATCH] Fixed UI docker build issues

---
 batcher-ui/Dockerfile.ghostnet            |  4 ++++
 batcher-ui/src/config/token-vaults.ts     | 10 +++++-----
 batcher-ui/src/contexts/tezos-toolkit.tsx |  2 +-
 batcher-ui/src/utils/token-manager.ts     |  2 +-
 batcher-ui/src/utils/utils.ts             |  2 +-
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/batcher-ui/Dockerfile.ghostnet b/batcher-ui/Dockerfile.ghostnet
index 043cc7cd..1321ca01 100644
--- a/batcher-ui/Dockerfile.ghostnet
+++ b/batcher-ui/Dockerfile.ghostnet
@@ -9,6 +9,10 @@ COPY ./package.json ./
 RUN npm install
 
 COPY ./tsconfig.json ./jsconfig.json ./
+COPY ./.eslintignore ./.eslintignore ./
+COPY ./.eslintrc.json ./.eslintrc.json ./
+COPY ./next-env.d.ts ./next-env.d.ts ./
+COPY ./next.config.js ./next.config.js ./
 #COPY ./pages ./pages
 COPY ./src ./src
 COPY ./styles ./styles
diff --git a/batcher-ui/src/config/token-vaults.ts b/batcher-ui/src/config/token-vaults.ts
index 9ed11049..8d5b97dc 100644
--- a/batcher-ui/src/config/token-vaults.ts
+++ b/batcher-ui/src/config/token-vaults.ts
@@ -1,7 +1,7 @@
 export const tokenVaultsConfig: { [key: string]: string } = {
-  tzBTC: process.env.NEXT_PUBLIC_TZBTC_VAULT_CONTRACT_HASH,
-  USDT: process.env.NEXT_PUBLIC_USDT_VAULT_CONTRACT_HASH,
-  EURL: process.env.NEXT_PUBLIC_EURL_VAULT_CONTRACT_HASH,
-  BTCtz: process.env.NEXT_PUBLIC_BTCTZ_VAULT_CONTRACT_HASH,
-  USDtz: process.env.NEXT_PUBLIC_USDTZ_VAULT_CONTRACT_HASH,
+  tzBTC: process.env.NEXT_PUBLIC_TZBTC_VAULT_CONTRACT_HASH || '',
+  USDT: process.env.NEXT_PUBLIC_USDT_VAULT_CONTRACT_HASH || '',
+  EURL: process.env.NEXT_PUBLIC_EURL_VAULT_CONTRACT_HASH || '',
+  BTCtz: process.env.NEXT_PUBLIC_BTCTZ_VAULT_CONTRACT_HASH || '',
+  USDtz: process.env.NEXT_PUBLIC_USDTZ_VAULT_CONTRACT_HASH || '',
 };
diff --git a/batcher-ui/src/contexts/tezos-toolkit.tsx b/batcher-ui/src/contexts/tezos-toolkit.tsx
index ce6da160..1829be61 100644
--- a/batcher-ui/src/contexts/tezos-toolkit.tsx
+++ b/batcher-ui/src/contexts/tezos-toolkit.tsx
@@ -6,7 +6,7 @@ type TzTkState = {
 };
 
 export const TezosToolkitContext = createContext<TzTkState>({
-  tezos: new TezosToolkit(process.env.NEXT_PUBLIC_TEZOS_NODE_URI),
+  tezos: new TezosToolkit(process.env.NEXT_PUBLIC_TEZOS_NODE_URI || ''),
 });
 
 export const useTezosToolkit = () => React.useContext(TezosToolkitContext);
diff --git a/batcher-ui/src/utils/token-manager.ts b/batcher-ui/src/utils/token-manager.ts
index af43da49..335bda2a 100644
--- a/batcher-ui/src/utils/token-manager.ts
+++ b/batcher-ui/src/utils/token-manager.ts
@@ -34,7 +34,7 @@ export const getLexicographicalPairName = (
   from: string
 ): string => {
   const comp = to.localeCompare(from);
-  if (comp < 0)
+  if (comp < 0){
     return `${to}-${from}`;
   } else {
     return `${from}-${to}`;
diff --git a/batcher-ui/src/utils/utils.ts b/batcher-ui/src/utils/utils.ts
index 08b7dad9..09379424 100644
--- a/batcher-ui/src/utils/utils.ts
+++ b/batcher-ui/src/utils/utils.ts
@@ -48,7 +48,7 @@ export const getSwaps = async () => {
     swaps.map((value, index) => [
       getLexicographicalPairName(value.swap.to, value.swap.from),
       value,
-    ])<<<<<<< 410-further-split-out-batcher-and-mm-contracts-to-avoid-size-constraint
+    ])
   );
   console.info('getSwaps swapMap', swapsMap);