feat/add MeshSwap on Polygon [TKR-374] (#491)

* Added MeshSwap on Polygon * Updated changelog
0xProject · Jun 3, 2022 · cda9081 · cda9081
1 parent 7f2f01f
commit cda9081
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/packages/asset-swapper/src/utils/market_operation_utils/orders.ts b/packages/asset-swapper/src/utils/market_operation_utils/orders.ts
@@ -206,10 +206,18 @@ export function getErc20BridgeSourceToBridgeSource(source: ERC20BridgeSource): s
             return encodeBridgeSourceId(BridgeProtocol.GMX, 'GMX');
         case ERC20BridgeSource.Platypus:
             return encodeBridgeSourceId(BridgeProtocol.Platypus, 'Platypus');
+<<<<<<< HEAD
         case ERC20BridgeSource.MeshSwap:
             return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'MeshSwap');
+=======
+<<<<<<< HEAD
+>>>>>>> d1bbea019 (feat/add MeshSwap on Polygon [TKR-374] (#491))
         case ERC20BridgeSource.BancorV3:
             return encodeBridgeSourceId(BridgeProtocol.BancorV3, 'BancorV3');
+=======
+        case ERC20BridgeSource.MeshSwap:
+            return encodeBridgeSourceId(BridgeProtocol.UniswapV2, 'MeshSwap');
+>>>>>>> 1f41fe6a2 (feat/add MeshSwap on Polygon [TKR-374] (#491))
         default:
             throw new Error(AggregationError.NoBridgeForSource);
     }