Use the swap tokens to get pair name

batcher-ui/src/components/batcher/Exchange.tsx

@@ -155,6 +155,8 @@ const Exchange = () => {
         tolerance,
       };
 
+      console.info("SWAP PARAMS", swap_params);
+
       if (selectedToken.standard === 'FA1.2 token') {
         if (!swap.from.token.address) {
           dispatch(

batcher/batcher.mligo

@@ -869,6 +869,7 @@ let get_valid_swap_reduced
  (pair_name: string)
  (storage : storage) : valid_swap_reduced =
  let valid_swaps = TokenManagerUtils.get_valid_swaps storage.tokenmanager in
+ if (Map.size valid_swaps) = 0n then failwith unable_to_get_swaps_from_token_manager else
  match Map.find_opt pair_name valid_swaps with
  | Some vswp -> vswp
  | None -> failwith swap_does_not_exist
@@ -957,6 +958,7 @@ let cancel
   let token_one, token_two = pair in
   let pair_name = find_lexicographical_pair_name token_one token_two in
   let valid_swaps = TokenManagerUtils.get_valid_swaps storage.tokenmanager in
+  if (Map.size valid_swaps) = 0n then failwith unable_to_get_swaps_from_token_manager else
   match Map.find_opt pair_name valid_swaps with
   | None -> failwith swap_does_not_exist
   | Some vswpr -> let valid_tokens = TokenManagerUtils.get_valid_tokens storage.tokenmanager in
@@ -1004,7 +1006,7 @@ let enforce_correct_side
 let deposit (external_order: external_swap_order) (storage : storage) : result =
   let pair = pair_of_external_swap external_order in
   let current_time = Tezos.get_now () in
-  let pair_name = get_rate_name_from_pair pair in
+  let pair_name = find_lexicographical_pair_name external_order.swap.to.name external_order.swap.from.token.name in
   let valid_swap = get_valid_swap_reduced pair_name storage in
   if valid_swap.is_disabled_for_deposits then failwith swap_is_disabled_for_deposits else
   let () = enforce_correct_side external_order valid_swap in

batcher/errors.mligo

@@ -72,3 +72,4 @@
 [@inline] let unable_to_get_balance_of_entrypoint_from_fa2_token : nat           = 171n
 [@inline] let unable_to_get_balance_response_fa12_entrypoint_from_vault : nat    = 172n
 [@inline] let unable_to_get_get_balance_entrypoint_from_fa12_token : nat         = 173n
+[@inline] let valid_swaps_map_is_empty                                           = 174n