Merge branch 'release-ghostnet-beta' into 410-further-split-out-batch…

…er-and-mm-contracts-to-avoid-size-constraint
marigold-dev · Nov 16, 2023 · a4d69bd · a4d69bd
2 parents 0421cc6 + 00ae6a2
commit a4d69bd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/batcher-ui/src/commands/exchange.ts b/batcher-ui/src/commands/exchange.ts
@@ -151,6 +151,7 @@ const fetchSwapsCmd = () => {
   );
 };
 
+
 export {
   fetchPairInfosCmd,
   fetchCurrentBatchNumberCmd,

diff --git a/batcher-ui/src/pages/index.tsx b/batcher-ui/src/pages/index.tsx
@@ -16,6 +16,7 @@ import {
 const Swap = () => {
   const userAddress = useSelector(userAddressSelector);
   const tokenPair = useSelector(currentPairSelector);
+  //const tokens = useSelector(tokensSelector);
 
   const dispatch = useDispatch();
 

diff --git a/batcher-ui/src/types/state.ts b/batcher-ui/src/types/state.ts
@@ -29,6 +29,7 @@ export type VolumesState = {
   sell: Record<PriceStrategy, number>;
 };
 
+
 export type ExchangeState = {
   priceStrategy: PriceStrategy;
   currentSwap: CurrentSwap;

diff --git 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}`;
@@ -179,6 +179,7 @@ export const getTokensMetadata = async () => {
   );
 };
 
+
 export const getTokensFromStorage = async () => {
   const storage = await getTokenManagerStorage();
   const validTokens = storage['valid_tokens'];
@@ -220,4 +221,4 @@ export const getSwapsFromStorage = async () => {
       };
     })
   );
-};
+}
diff --git 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);
 
@@ -401,6 +401,7 @@ export const ensureMapTypeOnTokens = (
     return toks;
   }
 };
+
 export const ensureMapTypeOnSwaps = (
   swaps: Map<string, ValidSwap>
 ): Map<string, ValidSwap> => {