Use - instead of / for swap pairs i.e. tzBTC-USDT instead of tzBTC/US…

…DT in UI
marigold-dev · Nov 13, 2023 · f08ca8f · f08ca8f
1 parent c4f5bca
commit f08ca8f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/batcher-ui/src/components/batcher/SelectPair.tsx b/batcher-ui/src/components/batcher/SelectPair.tsx
@@ -24,7 +24,6 @@ const SelectPair = ({ isFrom }: SelectPairProps) => {
   const [availableTokens, setAvailableTokens] = useState<any[]>([]);
   const [availableSwaps, setAvailableSwaps] = useState<any[]>([]);
 
-
   const displayValue = useCallback(() => {
     if (isReverse && isFrom) return swap.to.name;
     if (isReverse && !isFrom) return swap.from.token.name;
@@ -52,10 +51,10 @@ const SelectPair = ({ isFrom }: SelectPairProps) => {
     <Select.Root
       value={displayValue()}
       onValueChange={value => {
-        //const pair = isFrom ? `${value}/${swap.to.name}` : `${swap.from.name}/${value}`;
+        //const pair = isFrom ? `${value}-${swap.to.name}` : `${swap.from.name}-${value}`;
         //const availableSwap = availableSwaps[pair];
         //  const reversed = (!isFrom && value === ${swap.from.name}) || (isFrom && value === ${swap.to.name});
-        const pair = 'tzBTC/USDT';
+        const pair = 'tzBTC-USDT';
         const reversed = false;
         dispatch(changePair(pair, reversed));
       }}

diff --git a/batcher-ui/src/types/contracts/batcher.ts b/batcher-ui/src/types/contracts/batcher.ts
@@ -16,7 +16,7 @@ export enum PriceStrategy {
 // ------ BATCHER STORAGE REPRESENTATION ------ //
 
 export type TokenNames = 'tzBTC' | 'EURL' | 'USDT';
-export type SwapNames = 'tzBTC/USDT' | 'tzBTC/EURL';
+export type SwapNames = 'tzBTC-USDT' | 'tzBTC-EURL';
 
 type Swap = {
   from: {

diff --git a/batcher-ui/src/utils/token-manager.ts b/batcher-ui/src/utils/token-manager.ts
@@ -63,9 +63,9 @@ export const getLexicographicalPairName = (
   from: string
 ): string => {
   if (to > from) {
-    return `${to}/${from}`;
+    return `${to}-${from}`;
   } else {
-    return `${from}/${to}`;
+    return `${from}-${to}`;
   }
 };
 
@@ -74,7 +74,6 @@ export const getSwapsMetadata = async () => {
   const validSwaps = storage['valid_swaps'];
   const names = validSwaps.keys;
   const bm = await api.bigMapsGetBigMapById(validSwaps.values);
-  console.info('DEBUG - validSwaps bm ', bm.value);
   return Promise.all(
     names.map(async swap => {
       const escapedPair = encodeURIComponent(swap);
@@ -110,7 +109,7 @@ export const getPairsInformation = async (
   const storage = await getTokenManagerStorage();
   //const validSwaps = storage['valid_swaps']; //TODO - Only swaps pairs allowed by the contract should be displayed. A token might not be swappable with every other token
   const validTokens = storage['valid_tokens'];
-  const pairs = pair.split('/');
+  const pairs = pair.split('-');
   const left = (await getTokenFromBigmap(validTokens.values, pairs[0])).value;
   const right = (await getTokenFromBigmap(validTokens.values, pairs[1])).value;