diff --git a/src/containers/application/App.tsx b/src/containers/application/App.tsx
index 1dcc0e7bb..d66f313f5 100644
--- a/src/containers/application/App.tsx
+++ b/src/containers/application/App.tsx
@@ -54,7 +54,6 @@ function App() {
       ),
       []
     ),
-    priority: true,
   });
 
   const { ipfsError } = useBackend();
diff --git a/src/pages/teleport/Teleport.tsx b/src/pages/teleport/Teleport.tsx
index efb98d735..4525e6ad0 100644
--- a/src/pages/teleport/Teleport.tsx
+++ b/src/pages/teleport/Teleport.tsx
@@ -1,5 +1,5 @@
 import { Routes, Route } from 'react-router-dom';
-// import Swap from './swap/swap';
+import Swap from './swap/swap';
 import Send from './send/send';
 import Bridge from './bridge/bridge';
 import TeleportMainScreen from './mainScreen/TeleportMainScreen';
@@ -13,20 +13,7 @@ function TeleportRouter() {
     <Routes>
       <Route path="/" element={<Layout />}>
         <Route index element={<TeleportMainScreen />} />
-        <Route
-          path="swap"
-          element={
-            <div
-              style={{
-                textAlign: 'center',
-                zIndex: 10,
-                position: 'relative',
-              }}
-            >
-              swap temporary disabled due to upgrade issues
-            </div>
-          }
-        />
+        <Route path="swap" element={<Swap />} />
         <Route path="send" element={<Send />} />
         <Route path="bridge" element={<Bridge />} />
         <Route path="relayer" element={<Relayer />} />
diff --git a/src/router.tsx b/src/router.tsx
index 8275904aa..de68aacd1 100644
--- a/src/router.tsx
+++ b/src/router.tsx
@@ -43,6 +43,7 @@ import MainPartal from './containers/portal/mainPortal';
 
 import { routes } from './routes';
 import WarpDashboardPools from './containers/warp/WarpDashboardPools';
+import Warp from './containers/warp/Warp';
 import Robot from './pages/robot/Robot';
 import SigmaWrapper from './containers/sigma/SigmaWrapper';
 import Keys from './pages/Keys/Keys';
@@ -56,6 +57,7 @@ import Brain from './pages/Brain/Brain';
 import Settings from './pages/Settings/Settings';
 import FreestyleIde from './pages/robot/Soul/RuneEditor/FreestyleIde/FreestyleIde';
 import Map from './pages/Portal/Map/Map';
+import { Networks } from './types/networks';
 import GovernanceRoutes from './containers/governance/GovernanceRoutes';
 import StudioWrapper from './features/studio/StudioWrapper';
 
@@ -192,18 +194,7 @@ function AppRouter() {
           <Route path="/teleport/*" element={<Teleport />} />
 
           <Route path="/warp" element={<WarpDashboardPools />} />
-          <Route
-            path="/warp/:tab"
-            element={
-              <div
-                style={{
-                  textAlign: 'center',
-                }}
-              >
-                warp actions temporary disabled due to upgrade issues
-              </div>
-            }
-          />
+          <Route path="/warp/:tab" element={<Warp />} />
           <Route path="/genesis" element={<Movie />} />
           <Route path="/citizenship" element={<PortalCitizenship />} />
           <Route path="/gift" element={<PortalGift />} />
diff --git a/src/services/soft.js/api/msgs.ts b/src/services/soft.js/api/msgs.ts
index 6f44eba88..8e84b0557 100644
--- a/src/services/soft.js/api/msgs.ts
+++ b/src/services/soft.js/api/msgs.ts
@@ -3,6 +3,7 @@ import { Coin } from '@cosmjs/launchpad';
 import { Uint53 } from '@cosmjs/math';
 import { CyberClient } from '@cybercongress/cyber-js';
 import { QueryLiquidityPoolResponse } from '@cybercongress/cyber-js/build/codec/tendermint/liquidity/v1beta1/query';
+import { MsgSwapWithinBatch } from '@cybercongress/cyber-ts/cyber/liquidity/v1beta1/tx';
 import BigNumber from 'bignumber.js';
 import { QueryValidatorsResponse } from 'cosmjs-types/cosmos/staking/v1beta1/query';
 import Long from 'long';
@@ -292,7 +293,7 @@ class Soft3MessageFactory {
     );
 
     return {
-      typeUrl: '/tendermint.liquidity.v1beta1.MsgSwapWithinBatch',
+      typeUrl: MsgSwapWithinBatch.typeUrl,
       value: {
         swapRequesterAddress: this.senderAddress,
         poolId,