diff --git a/centrifuge-app/.env-config/.env.development b/centrifuge-app/.env-config/.env.development
index 8bf6e9b058..271aa0cd10 100644
--- a/centrifuge-app/.env-config/.env.development
+++ b/centrifuge-app/.env-config/.env.development
@@ -17,4 +17,4 @@ REACT_APP_WHITELISTED_ACCOUNTS=
 REACT_APP_TINLAKE_SUBGRAPH_URL=https://api.goldsky.com/api/public/project_clhi43ef5g4rw49zwftsvd2ks/subgraphs/main/1.0.2/gn
 REACT_APP_REWARDS_TREE_URL=https://storage.googleapis.com/rad-rewards-trees-kovan-staging/latest.json
 REACT_APP_WALLETCONNECT_ID=c32fa79350803519804a67fcab0b742a
-REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=kAJ27w29x7gHM75xajP2yXVLjVBaKmmUTxHwgRuCoAcWaoEiz
+REACT_APP_MEMBERLIST_ADMIN_PURE_PROXY=kAJ27w29x7gHM75xajP2yXVLjVBaKmmUTxHwgRuCoAcWaoEiz
\ No newline at end of file
diff --git a/centrifuge-app/src/components/DebugFlags/components/ConvertAddress.tsx b/centrifuge-app/src/components/DebugFlags/components/ConvertAddress.tsx
new file mode 100644
index 0000000000..477295fbac
--- /dev/null
+++ b/centrifuge-app/src/components/DebugFlags/components/ConvertAddress.tsx
@@ -0,0 +1,214 @@
+import { addressToHex } from '@centrifuge/centrifuge-js'
+import {
+  getChainInfo,
+  truncateAddress,
+  useCentrifugeApi,
+  useCentrifugeUtils,
+  useWallet,
+} from '@centrifuge/centrifuge-react'
+import { Dialog, Grid, Select, Stack, Text, TextInput } from '@centrifuge/fabric'
+import { isAddress as isEvmAddress } from '@ethersproject/address'
+import { isAddress as isSubstrateAddress } from '@polkadot/util-crypto'
+import * as React from 'react'
+import { useQuery } from 'react-query'
+import { firstValueFrom } from 'rxjs'
+import { copyToClipboard } from '../../../utils/copyToClipboard'
+
+enum LocationType {
+  Parachain = 'Parachain',
+  Relaychain = 'Relaychain',
+  Native = 'Native',
+  EVM = 'EVM',
+}
+
+export function ConvertAddress() {
+  const [open, setOpen] = React.useState(false)
+  const {
+    evm: { accounts: evmAccounts, chains },
+    substrate: { accounts: substrateAccounts },
+  } = useWallet()
+
+  const [address, setAddress] = React.useState('')
+  const [locationType, setLocationType] = React.useState<LocationType>(LocationType.Parachain)
+  const [locationDetail, setLocationDetail] = React.useState('')
+  const utils = useCentrifugeUtils()
+  const api = useCentrifugeApi()
+  const addressListId = React.useId()
+  const locationListId = React.useId()
+  const isValidAddress =
+    locationType === LocationType.EVM
+      ? isEvmAddress(address)
+      : locationType === LocationType.Parachain
+      ? isSubstrateAddress(address) || isEvmAddress(address)
+      : !isEvmAddress(address) && isSubstrateAddress(address)
+
+  function getMultilocation() {
+    if (!isValidAddress) return null
+    switch (locationType) {
+      case LocationType.Parachain:
+        if (!locationDetail) return null
+        return {
+          parents: 1,
+          interior: {
+            X2: [
+              {
+                Parachain: locationDetail,
+              },
+              isEvmAddress(address)
+                ? {
+                    AccountKey20: {
+                      network: null,
+                      key: address,
+                    },
+                  }
+                : {
+                    AccountId32: {
+                      id: addressToHex(address),
+                    },
+                  },
+            ],
+          },
+        }
+      case LocationType.Relaychain:
+        return {
+          parents: 1,
+          interior: {
+            X1: {
+              AccountId32: {
+                id: addressToHex(address),
+              },
+            },
+          },
+        }
+      case LocationType.Native:
+        return {}
+      case LocationType.EVM:
+        if (!locationDetail) return null
+        return {
+          parents: 0,
+          interior: {
+            X1: {
+              AccountKey20: {
+                network: { Ethereum: { chainId: locationDetail } },
+                key: address,
+              },
+            },
+          },
+        }
+    }
+  }
+
+  const multilocation = getMultilocation()
+
+  const { data: convertedAddress } = useQuery(
+    [address, locationType, locationDetail],
+    async () => {
+      if (locationType === LocationType.Native) return address
+      const addr = await firstValueFrom(api.call.accountConversionApi.conversionOf(multilocation))
+      return addr.toHuman() as string
+    },
+    {
+      enabled: !!address && !!multilocation && isValidAddress,
+      staleTime: Infinity,
+    }
+  )
+
+  return (
+    <>
+      <button onClick={() => setOpen(true)}>Convert address</button>
+      <Dialog title="Convert address" width="800px" isOpen={open} onClose={() => setOpen(false)}>
+        <Stack gap={4}>
+          <Stack gap={1}>
+            <datalist id={addressListId}>
+              {evmAccounts?.map((addr) => (
+                <option value={addr}>{truncateAddress(addr)} (EVM)</option>
+              ))}
+              {substrateAccounts?.map((acc) => (
+                <option value={utils.formatAddress(acc.address)}>
+                  {acc.name && `${acc.name} - `}
+                  {truncateAddress(utils.formatAddress(acc.address))}
+                </option>
+              ))}
+            </datalist>
+            <Select
+              label="From"
+              value={locationType}
+              options={[
+                { label: 'Parachain', value: LocationType.Parachain },
+                { label: 'Relaychain', value: LocationType.Relaychain },
+                { label: 'Native', value: LocationType.Native },
+                { label: 'EVM', value: LocationType.EVM },
+              ]}
+              onChange={(e) => {
+                setLocationType(e.target.value as any)
+              }}
+            />
+            {locationType === LocationType.EVM ? (
+              <>
+                <TextInput
+                  label="EVM chain ID"
+                  value={locationDetail}
+                  onChange={(e) => setLocationDetail(e.target.value)}
+                  list={locationListId}
+                />
+                <datalist id={locationListId}>
+                  {Object.keys(chains).map((chainId) => (
+                    <option value={chainId}>
+                      {chainId} - {getChainInfo(chains, Number(chainId)).name}
+                    </option>
+                  ))}
+                </datalist>
+              </>
+            ) : locationType === LocationType.Parachain ? (
+              <>
+                <TextInput
+                  label="Para ID"
+                  value={locationDetail}
+                  onChange={(e) => setLocationDetail(e.target.value)}
+                  list={locationListId}
+                />
+                <datalist id={locationListId}></datalist>
+              </>
+            ) : null}
+
+            <TextInput
+              label={
+                locationType === LocationType.EVM
+                  ? 'EVM address'
+                  : locationType === LocationType.Parachain
+                  ? 'Substrate or EVM address'
+                  : 'Substrate address'
+              }
+              value={address}
+              onChange={(e) => setAddress(e.target.value)}
+              list={addressListId}
+              errorMessage={address && !isValidAddress ? 'Invalid address' : ''}
+            />
+          </Stack>
+          {convertedAddress && (
+            <Stack gap={2}>
+              <Text variant="heading3">Converted address</Text>
+              <Grid columns={2} gap={1}>
+                <Text variant="label1">ss58</Text>
+                <Text
+                  style={{ wordBreak: 'break-all', cursor: 'copy' }}
+                  onClick={() => copyToClipboard(utils.formatAddress(convertedAddress))}
+                >
+                  {utils.formatAddress(convertedAddress)}
+                </Text>
+
+                <Text variant="label1">hex</Text>
+                <Text
+                  style={{ wordBreak: 'break-all', cursor: 'copy' }}
+                  onClick={() => copyToClipboard(addressToHex(convertedAddress))}
+                >
+                  {addressToHex(convertedAddress)}
+                </Text>
+              </Grid>
+            </Stack>
+          )}
+        </Stack>
+      </Dialog>
+    </>
+  )
+}
diff --git a/centrifuge-app/src/components/DebugFlags/components/ConvertEvmAddress.tsx b/centrifuge-app/src/components/DebugFlags/components/ConvertEvmAddress.tsx
deleted file mode 100644
index fca69ac6e9..0000000000
--- a/centrifuge-app/src/components/DebugFlags/components/ConvertEvmAddress.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { evmToSubstrateAddress } from '@centrifuge/centrifuge-js'
-import { useCentrifugeUtils, useWallet } from '@centrifuge/centrifuge-react'
-import { isAddress } from '@ethersproject/address'
-
-export function ConvertEvmAddress() {
-  const ctx = useWallet()
-  const utils = useCentrifugeUtils()
-  function convert() {
-    const addr = window.prompt('EVM address')
-    if (!addr || !isAddress(addr)) {
-      window.alert('Invalid EVM address')
-      return
-    }
-    const chainId = window.prompt('Chain ID', String(ctx.substrate.evmChainId))
-    if (!chainId || !Number.isSafeInteger(Number(chainId))) {
-      window.alert('Invalid chain ID')
-      return
-    }
-    const converted = evmToSubstrateAddress(addr, Number(chainId))
-    const formatted = utils.formatAddress(converted)
-    window.alert(formatted)
-    console.log('Substrate address', formatted)
-  }
-  return <button onClick={convert}>Convert EVM to Substrate</button>
-}
diff --git a/centrifuge-app/src/components/DebugFlags/config.ts b/centrifuge-app/src/components/DebugFlags/config.ts
index f62aee2939..1c84c4466c 100644
--- a/centrifuge-app/src/components/DebugFlags/config.ts
+++ b/centrifuge-app/src/components/DebugFlags/config.ts
@@ -1,6 +1,6 @@
 import React from 'react'
-import { config } from '../../config'
-import { ConvertEvmAddress } from './components/ConvertEvmAddress'
+import { config, isTestEnv } from '../../config'
+import { ConvertAddress } from './components/ConvertAddress'
 
 const params = new URLSearchParams(typeof window !== 'undefined' ? window.location.search : {})
 export const debug =
@@ -36,6 +36,7 @@ export type Key =
   | 'batchMintNFTs'
   | 'persistDebugFlags'
   | 'showBase'
+  | 'showArbitrum'
   | 'showUnusedFlags'
   | 'allowInvestBelowMin'
   | 'alternativeTheme'
@@ -45,8 +46,11 @@ export type Key =
   | 'showAdvancedAccounts'
   | 'editAdminConfig'
   | 'showPodAccountCreation'
-  | 'convertEvmAddress'
+  | 'convertAddress'
   | 'showPortfolio'
+  | 'showTestNets'
+  | 'showSwaps'
+  | 'showLiquidityPoolsOptions'
   | 'showPrime'
   | 'poolCreationType'
 
@@ -77,6 +81,16 @@ export const flagsConfig: Record<Key, DebugFlagConfig> = {
     default: false,
     alwaysShow: true,
   },
+  showArbitrum: {
+    type: 'checkbox',
+    default: false,
+    alwaysShow: true,
+  },
+  showTestNets: {
+    type: 'checkbox',
+    default: isTestEnv,
+    alwaysShow: true,
+  },
   editPoolConfig: {
     type: 'checkbox',
     default: false,
@@ -85,6 +99,10 @@ export const flagsConfig: Record<Key, DebugFlagConfig> = {
     type: 'checkbox',
     default: false,
   },
+  showLiquidityPoolsOptions: {
+    type: 'checkbox',
+    default: false,
+  },
   poolReporting: {
     type: 'checkbox',
     default: false,
@@ -111,16 +129,19 @@ export const flagsConfig: Record<Key, DebugFlagConfig> = {
     default: false,
     alwaysShow: true,
   },
-  convertEvmAddress: {
+  convertAddress: {
     type: 'component',
-    Component: ConvertEvmAddress,
+    Component: ConvertAddress,
     default: null,
     alwaysShow: true,
   },
   showPortfolio: {
     type: 'checkbox',
     default: false,
-    alwaysShow: true,
+  },
+  showSwaps: {
+    type: 'checkbox',
+    default: false,
   },
   showPrime: {
     type: 'checkbox',
diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
index c69c072b6d..0a4d34fda6 100644
--- a/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
+++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeem.tsx
@@ -22,12 +22,11 @@ import {
   Thumbnail,
   useControlledState,
 } from '@centrifuge/fabric'
-import css from '@styled-system/css'
 import Decimal from 'decimal.js-light'
 import { Field, FieldProps, Form, FormikErrors, FormikProvider, useFormik } from 'formik'
 import * as React from 'react'
 import { useHistory, useParams } from 'react-router-dom'
-import styled from 'styled-components'
+import { ethConfig } from '../../config'
 import { Dec } from '../../utils/Decimal'
 import { formatBalance, roundDown } from '../../utils/formatting'
 import { useTinlakePermissions } from '../../utils/tinlake/useTinlakePermissions'
@@ -35,6 +34,7 @@ import { TinlakePool } from '../../utils/tinlake/useTinlakePools'
 import { useAddress } from '../../utils/useAddress'
 import { useEpochTimeCountdown } from '../../utils/useEpochTimeCountdown'
 import { useFocusInvalidInput } from '../../utils/useFocusInvalidInput'
+import { useActiveDomains } from '../../utils/useLiquidityPools'
 import { usePermissions } from '../../utils/usePermissions'
 import { usePool, usePoolMetadata } from '../../utils/usePools'
 import { positiveNumber } from '../../utils/validation'
@@ -45,6 +45,8 @@ import { LoadBoundary } from '../LoadBoundary'
 import { Spinner } from '../Spinner'
 import { AnchorTextLink } from '../TextLink'
 import { InvestRedeemProvider, useInvestRedeem } from './InvestRedeemProvider'
+import { LightButton } from './LightButton'
+import { InvestRedeemState as InvestRedeemContextState } from './types'
 
 export type ActionsRef = React.MutableRefObject<
   | {
@@ -64,8 +66,25 @@ type Props = {
 // @ts-ignore
 const listFormatter = new Intl.ListFormat('en')
 
-export function InvestRedeem({ networks = ['centrifuge'], ...rest }: Props) {
+export function InvestRedeem({ poolId, ...rest }: Props) {
   const getNetworkName = useGetNetworkName()
+  const { setScopedNetworks, connectedType, isEvmOnSubstrate } = useWallet()
+
+  const isLiquidityPools = !poolId.startsWith('0x') && connectedType === 'evm' && !isEvmOnSubstrate
+
+  const { data: domains } = useActiveDomains(poolId, isLiquidityPools)
+
+  const networks: Network[] = poolId.startsWith('0x') ? [ethConfig.network === 'goerli' ? 5 : 1] : ['centrifuge']
+  if (domains) {
+    networks.push(...domains.map((d) => d.chainId))
+  }
+
+  React.useEffect(() => {
+    setScopedNetworks(networks)
+    return () => setScopedNetworks(null)
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [networks])
+
   return (
     <LoadBoundary>
       <ConnectionGuard
@@ -74,7 +93,7 @@ export function InvestRedeem({ networks = ['centrifuge'], ...rest }: Props) {
           networks.length > 1 ? 'networks' : 'network'
         }. To be able to invest and redeem you need to switch the network.`}
       >
-        <InvestRedeemState networks={networks} {...rest} />
+        <InvestRedeemState networks={networks} poolId={poolId} {...rest} />
       </ConnectionGuard>
     </LoadBoundary>
   )
@@ -115,7 +134,7 @@ function EpochBusy({ busy }: { busy?: boolean }) {
 
 function useAllowedTranches(poolId: string) {
   const address = useAddress()
-  const { connectedType } = useWallet()
+  const { connectedType, isEvmOnSubstrate } = useWallet()
   const permissions = usePermissions(connectedType === 'substrate' ? address : undefined)
   const isTinlakePool = poolId.startsWith('0x')
   const { data: tinlakePermissions } = useTinlakePermissions(poolId, address)
@@ -138,6 +157,8 @@ function useAllowedTranches(poolId: string) {
       )
     : [Object.keys(permissions?.pools[poolId]?.tranches ?? {})].flat()
 
+  if (connectedType === 'evm' && !isEvmOnSubstrate) return pool.tranches
+
   return allowedTrancheIds.map((id) => [...pool.tranches].find((tranche) => tranche.id === id)!)
 }
 
@@ -192,12 +213,10 @@ type InnerProps = Props & {
 function InvestRedeemInner({ view, setView, setTrancheId, networks }: InnerProps) {
   const { state } = useInvestRedeem()
   const pool = usePool(state.poolId)
-  const allowedTranches = useAllowedTranches(state.poolId)
   const isTinlakePool = state.poolId.startsWith('0x')
-  const availableTranches = isTinlakePool ? allowedTranches : pool.tranches
 
   const { data: metadata } = usePoolMetadata(pool)
-  const { connectedType } = useWallet()
+  const { connectedType, isEvmOnSubstrate } = useWallet()
 
   let actualView = view
   if (state.order) {
@@ -209,105 +228,102 @@ function InvestRedeemInner({ view, setView, setTrancheId, networks }: InnerProps
   const canOnlyInvest =
     state.order?.payoutTokenAmount.isZero() && state.trancheBalanceWithPending.isZero() && pendingRedeem.isZero()
 
-  if (!isTinlakePool || availableTranches.length) {
-    return (
-      <>
-        <Stack as={Card} gap={2} p={2}>
-          <Stack alignItems="center">
-            <Box pb={1}>
-              <Thumbnail type="token" size="large" label={state.trancheCurrency?.symbol ?? ''} />
-            </Box>
-            {connectedType && (
-              <>
-                <TextWithPlaceholder variant="heading3" isLoading={state.isDataLoading}>
-                  {formatBalance(state.investmentValue, state.poolCurrency?.symbol, 2, 0)}
-                </TextWithPlaceholder>
-                <TextWithPlaceholder variant="body3" isLoading={state.isDataLoading} width={12} variance={0}>
-                  {formatBalance(state.trancheBalanceWithPending, state.trancheCurrency?.symbol, 2, 0)}
-                </TextWithPlaceholder>
-              </>
-            )}
-            <Box bleedX={2} mt={1} alignSelf="stretch">
-              <Divider borderColor="borderSecondary" />
-            </Box>
-          </Stack>
-          {availableTranches.length > 1 && (
-            <Select
-              name="token"
-              placeholder="Select a token"
-              options={availableTranches
-                .map((tranche) => ({
-                  label: tranche.currency.symbol ?? '',
-                  value: tranche.id,
-                }))
-                .reverse()}
-              value={state.trancheId}
-              onChange={(event) => setTrancheId(event.target.value as any)}
-            />
-          )}
-          {connectedType && state.isDataLoading ? (
-            <Spinner />
-          ) : state.isAllowedToInvest ? (
+  return (
+    <>
+      <Stack as={Card} gap={2} p={2}>
+        <Stack alignItems="center">
+          <Box pb={1}>
+            <Thumbnail type="token" size="large" label={state.trancheCurrency?.symbol ?? ''} />
+          </Box>
+          {connectedType && (
             <>
-              {canOnlyInvest ? (
-                <InvestForm autoFocus investLabel={`Invest in ${state.trancheCurrency?.symbol ?? ''}`} />
-              ) : actualView === 'start' ? (
-                <>
-                  {state.order &&
-                    (!state.order.payoutTokenAmount.isZero() ? (
-                      <SuccessBanner
-                        title="Investment successful"
-                        body={`${formatBalance(
-                          state.order.investCurrency,
-                          state.poolCurrency?.symbol
-                        )} was successfully invested`}
-                      />
-                    ) : !state.order.payoutCurrencyAmount.isZero() ? (
-                      <SuccessBanner title="Redemption successful" />
-                    ) : null)}
-                  <EpochBusy busy={state.isPoolBusy} />
-                  <Stack p={1} gap={1}>
-                    <Grid gap={1} columns={2} equalColumns>
-                      <Button variant="secondary" small onClick={() => setView('redeem')} disabled={state.isPoolBusy}>
-                        Redeem
-                      </Button>
-                      <Button variant="primary" small onClick={() => setView('invest')} disabled={state.isPoolBusy}>
-                        Invest more
-                      </Button>
-                    </Grid>
-                    <Box alignSelf="center">
-                      <TransactionsLink />
-                    </Box>
-                  </Stack>
-                </>
-              ) : actualView === 'invest' ? (
-                <InvestForm onCancel={() => setView('start')} autoFocus />
-              ) : (
-                <RedeemForm onCancel={() => setView('start')} autoFocus />
-              )}
+              <TextWithPlaceholder variant="heading3" isLoading={state.isDataLoading}>
+                {formatBalance(state.investmentValue, state.poolCurrency?.symbol, 2, 0)}
+              </TextWithPlaceholder>
+              <TextWithPlaceholder variant="body3" isLoading={state.isDataLoading} width={12} variance={0}>
+                {formatBalance(state.trancheBalanceWithPending, state.trancheCurrency?.symbol, 2, 0)}
+              </TextWithPlaceholder>
             </>
-          ) : (
-            // TODO: Show whether onboarding is in progress
-            <Stack gap={2}>
-              <Text variant="body3">
-                {metadata?.pool?.issuer?.name} tokens are available to U.S. and Non-U.S. persons. U.S. persons must be
-                verified “accredited investors”.{' '}
-                <AnchorTextLink href="https://docs.centrifuge.io/use/onboarding/#onboarding-as-an-us-investor">
-                  Learn more
-                </AnchorTextLink>
-              </Text>
-              <Stack px={1}>
-                <OnboardingButton networks={networks} />
-              </Stack>
-            </Stack>
           )}
+          <Box bleedX={2} mt={1} alignSelf="stretch">
+            <Divider borderColor="borderSecondary" />
+          </Box>
         </Stack>
+        {pool.tranches.length > 1 && (
+          <Select
+            name="token"
+            placeholder="Select a token"
+            options={pool.tranches
+              .map((tranche) => ({
+                label: tranche.currency.symbol ?? '',
+                value: tranche.id,
+              }))
+              .reverse()}
+            value={state.trancheId}
+            onChange={(event) => setTrancheId(event.target.value as any)}
+          />
+        )}
+        {connectedType && state.isDataLoading ? (
+          <Spinner />
+        ) : state.isAllowedToInvest ? (
+          <>
+            {canOnlyInvest ? (
+              <InvestForm autoFocus investLabel={`Invest in ${state.trancheCurrency?.symbol ?? ''}`} />
+            ) : actualView === 'start' ? (
+              <>
+                {state.order &&
+                  (!state.order.payoutTokenAmount.isZero() ? (
+                    <SuccessBanner
+                      title="Investment successful"
+                      body={`${formatBalance(
+                        state.order.investCurrency,
+                        state.poolCurrency?.symbol
+                      )} was successfully invested`}
+                    />
+                  ) : !state.order.payoutCurrencyAmount.isZero() ? (
+                    <SuccessBanner title="Redemption successful" />
+                  ) : null)}
+                <EpochBusy busy={state.isPoolBusy} />
+                <Stack p={1} gap={1}>
+                  <Grid gap={1} columns={2} equalColumns>
+                    <Button variant="secondary" small onClick={() => setView('redeem')} disabled={state.isPoolBusy}>
+                      Redeem
+                    </Button>
+                    <Button variant="primary" small onClick={() => setView('invest')} disabled={state.isPoolBusy}>
+                      Invest more
+                    </Button>
+                  </Grid>
+                  <Box alignSelf="center">
+                    <TransactionsLink />
+                  </Box>
+                </Stack>
+              </>
+            ) : actualView === 'invest' ? (
+              <InvestForm onCancel={() => setView('start')} autoFocus />
+            ) : (
+              <RedeemForm onCancel={() => setView('start')} autoFocus />
+            )}
+          </>
+        ) : (
+          // TODO: Show whether onboarding is in progress
+          <Stack gap={2}>
+            <Text variant="body3">
+              {metadata?.pool?.issuer?.name} tokens are available to U.S. and Non-U.S. persons. U.S. persons must be
+              verified “accredited investors”.{' '}
+              <AnchorTextLink href="https://docs.centrifuge.io/use/onboarding/#onboarding-as-an-us-investor">
+                Learn more
+              </AnchorTextLink>
+            </Text>
+            <Stack px={1}>
+              <OnboardingButton networks={networks} />
+            </Stack>
+          </Stack>
+        )}
+      </Stack>
 
-        {!isTinlakePool && <LiquidityRewardsContainer />}
-      </>
-    )
-  }
-  return null
+      {!isTinlakePool && (connectedType === 'substrate' || isEvmOnSubstrate) && <LiquidityRewardsContainer />}
+    </>
+  )
 }
 
 const OnboardingButton = ({ networks }: { networks: Network[] | undefined; trancheId?: string }) => {
@@ -374,6 +390,10 @@ type InvestFormProps = {
   investLabel?: string
 }
 
+function toNumber(n: '' | number | Decimal) {
+  return n instanceof Decimal ? n.toNumber() : Number(n)
+}
+
 function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest' }: InvestFormProps) {
   const { state, actions, hooks } = useInvestRedeem()
   const [changeOrderFormShown, setChangeOrderFormShown] = React.useState(false)
@@ -405,8 +425,8 @@ function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest'
     },
     validate: (values) => {
       const errors: FormikErrors<InvestValues> = {}
-      if (validateNumberInput(values.amount, 0, state.poolCUrrencyBalanceWithPending)) {
-        errors.amount = validateNumberInput(values.amount, 0, state.poolCUrrencyBalanceWithPending)
+      if (validateNumberInput(values.amount, 0, state.poolCurrencyBalanceWithPending)) {
+        errors.amount = validateNumberInput(values.amount, 0, state.poolCurrencyBalanceWithPending)
       } else if (hasPendingOrder && Dec(values.amount).eq(pendingInvest)) {
         errors.amount = 'Equals current order'
       } else if (!allowInvestBelowMin && state.isFirstInvestment && Dec(values.amount).lt(state.minInitialInvestment)) {
@@ -431,10 +451,14 @@ function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest'
   const isApproving = state.pendingAction === 'approvePoolCurrency' && isPending
   const isCollecting = state.pendingAction === 'collect' && isPending
 
-  function renderInput(cancelCb?: () => void, preSubmitAction?: { onClick: () => void; loading?: boolean }) {
+  function renderInput(
+    cancelCb?: () => void,
+    preSubmitAction?: { onClick: () => void; loading?: boolean; label?: string }
+  ) {
     return (
       <Stack gap={2}>
         <EpochBusy busy={state.isPoolBusy} />
+        {state.statusMessage && <InlineFeedback>{state.statusMessage}</InlineFeedback>}
         {nativeBalanceTooLow && (
           <InlineFeedback>
             {state.nativeCurrency && `${state.nativeCurrency.symbol} balance is too low.`}
@@ -457,9 +481,9 @@ function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest'
                 secondaryLabel={
                   state.poolCurrencyBalance &&
                   state.poolCurrency &&
-                  `${formatBalance(state.poolCUrrencyBalanceWithPending, state.poolCurrency.symbol, 2)} balance`
+                  `${formatBalance(state.poolCurrencyBalanceWithPending, state.poolCurrency.symbol, 2)} balance`
                 }
-                onSetMax={() => form.setFieldValue('amount', state.poolCUrrencyBalanceWithPending)}
+                onSetMax={() => form.setFieldValue('amount', state.poolCurrencyBalanceWithPending)}
                 autoFocus={autoFocus}
               />
             )
@@ -489,7 +513,7 @@ function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest'
         ) : null}
         <Stack px={1} gap={1}>
           {preSubmitAction ? (
-            <Button {...preSubmitAction}>{investLabel}</Button>
+            <Button {...preSubmitAction}>{preSubmitAction.label ?? investLabel}</Button>
           ) : (
             <Button
               type="submit"
@@ -534,26 +558,33 @@ function InvestForm({ onCancel, hasInvestment, autoFocus, investLabel = 'Invest'
             </Stack>
           </Stack>
         ) : changeOrderFormShown ? (
-          state.needsPoolCurrencyApproval ? (
+          state.needsPoolCurrencyApproval(inputToNumber(form.values.amount)) ? (
             renderInput(onCancel, { onClick: actions.approvePoolCurrency, loading: isApproving })
           ) : (
             renderInput(onCancel)
           )
         ) : hasPendingOrder ? (
-          <PendingOrder
-            type="invest"
-            pool={pool}
-            amount={pendingInvest}
-            onCancelOrder={() => actions.cancelInvest()}
-            isCancelling={isCancelling}
-            onChangeOrder={() => {
-              form.resetForm()
-              form.setFieldValue('amount', pendingInvest, false)
-              setChangeOrderFormShown(true)
-            }}
-          />
-        ) : state.needsPoolCurrencyApproval ? (
-          renderInput(onCancel, { onClick: actions.approvePoolCurrency, loading: isApproving })
+          <Stack gap={2}>
+            {state.statusMessage && <InlineFeedback>{state.statusMessage}</InlineFeedback>}
+            <PendingOrder
+              type="invest"
+              pool={pool}
+              state={state}
+              amount={pendingInvest}
+              onCancelOrder={() => actions.cancelInvest()}
+              isCancelling={isCancelling}
+              onChangeOrder={() => {
+                form.resetForm()
+                form.setFieldValue('amount', pendingInvest, false)
+                setChangeOrderFormShown(true)
+              }}
+            />
+          </Stack>
+        ) : state.needsPoolCurrencyApproval(toNumber(form.values.amount)) ? (
+          renderInput(onCancel, {
+            onClick: actions.approvePoolCurrency,
+            loading: isApproving,
+          })
         ) : (
           renderInput(onCancel)
         )}
@@ -574,7 +605,8 @@ function RedeemForm({ onCancel, autoFocus }: RedeemFormProps) {
 
   const pendingRedeem = state.order?.remainingRedeemToken ?? Dec(0)
 
-  const maxRedeem = state.trancheBalanceWithPending.mul(state.tokenPrice)
+  const maxRedeemTokens = state.trancheBalanceWithPending
+  const maxRedeemCurrency = maxRedeemTokens.mul(state.tokenPrice)
   const tokenSymbol = state.trancheCurrency?.symbol
 
   hooks.useActionSucceeded((action) => {
@@ -604,16 +636,16 @@ function RedeemForm({ onCancel, autoFocus }: RedeemFormProps) {
       amount: '',
     },
     onSubmit: (values, formActions) => {
-      const amount = values.amount instanceof Decimal ? values.amount : Dec(values.amount).div(state.tokenPrice)
-      actions.redeem(TokenBalance.fromFloat(amount, pool.currency.decimals ?? 18))
+      const amountTokens = values.amount instanceof Decimal ? values.amount : Dec(values.amount).div(state.tokenPrice)
+      actions.redeem(TokenBalance.fromFloat(amountTokens, state.poolCurrency?.decimals ?? 18))
       formActions.setSubmitting(false)
     },
     validate: (values) => {
       const errors: FormikErrors<InvestValues> = {}
-      const amount = values.amount instanceof Decimal ? values.amount : Dec(values.amount).div(state.tokenPrice)
-      if (validateNumberInput(amount, 0, maxRedeem)) {
-        errors.amount = validateNumberInput(amount, 0, maxRedeem)
-      } else if (hasPendingOrder && amount.eq(pendingRedeem)) {
+      const amountTokens = values.amount instanceof Decimal ? values.amount : Dec(values.amount).div(state.tokenPrice)
+      if (validateNumberInput(amountTokens, 0, maxRedeemTokens)) {
+        errors.amount = validateNumberInput(amountTokens, 0, maxRedeemTokens)
+      } else if (hasPendingOrder && amountTokens.eq(pendingRedeem)) {
         errors.amount = 'Equals current order'
       }
 
@@ -649,8 +681,8 @@ function RedeemForm({ onCancel, autoFocus }: RedeemFormProps) {
               disabled={isRedeeming}
               onSetMax={() => form.setFieldValue('amount', state.trancheBalanceWithPending)}
               onChange={(value) => form.setFieldValue('amount', value)}
-              currency={pool.currency.symbol}
-              secondaryLabel={`${formatBalance(roundDown(maxRedeem), pool.currency.symbol, 2)} available`}
+              currency={state.poolCurrency?.symbol}
+              secondaryLabel={`${formatBalance(roundDown(maxRedeemCurrency), state.poolCurrency?.symbol, 2)} available`}
               autoFocus={autoFocus}
             />
           )}
@@ -661,7 +693,12 @@ function RedeemForm({ onCancel, autoFocus }: RedeemFormProps) {
               <Text variant="body3">Token amount</Text>
               <Text variant="body3" width={12} variance={0}>
                 {!state.tokenPrice.isZero() &&
-                  `~${formatBalance(Dec(form.values.amount).div(state.tokenPrice), tokenSymbol)}`}
+                  `~${formatBalance(
+                    form.values.amount instanceof Decimal
+                      ? form.values.amount
+                      : Dec(form.values.amount).div(state.tokenPrice),
+                    tokenSymbol
+                  )}`}
               </Text>
             </Shelf>
           </Stack>
@@ -709,7 +746,7 @@ function RedeemForm({ onCancel, autoFocus }: RedeemFormProps) {
             </Stack>
           </Stack>
         ) : changeOrderFormShown ? (
-          state.needsTrancheTokenApproval ? (
+          state.needsTrancheTokenApproval(inputToNumber(form.values.amount)) ? (
             renderInput(onCancel, { onClick: actions.approveTrancheToken, loading: isApproving })
           ) : (
             renderInput(onCancel)
@@ -718,6 +755,7 @@ function RedeemForm({ onCancel, autoFocus }: RedeemFormProps) {
           <PendingOrder
             type="redeem"
             pool={pool}
+            state={state}
             amount={pendingRedeem.mul(state.tokenPrice)}
             onCancelOrder={() => actions.cancelRedeem()}
             isCancelling={isCancelling}
@@ -727,7 +765,7 @@ function RedeemForm({ onCancel, autoFocus }: RedeemFormProps) {
               setChangeOrderFormShown(true)
             }}
           />
-        ) : state.needsTrancheTokenApproval ? (
+        ) : state.needsTrancheTokenApproval(toNumber(form.values.amount)) ? (
           renderInput(onCancel, { onClick: actions.approveTrancheToken, loading: isApproving })
         ) : (
           renderInput(onCancel)
@@ -769,39 +807,15 @@ const SuccessBanner: React.FC<{ title: string; body?: string }> = ({ title, body
   )
 }
 
-const LightButton = styled.button<{ $left?: boolean }>(
-  {
-    display: 'flex',
-    justifyContent: 'center',
-    alignItems: 'center',
-    border: 0,
-    appearance: 'none',
-    height: 36,
-    cursor: 'pointer',
-  },
-  (props) =>
-    css({
-      color: 'textPrimary',
-      borderBottomLeftRadius: props.$left ? 'card' : undefined,
-      borderBottomRightRadius: props.$left ? undefined : 'card',
-      backgroundColor: 'secondarySelectedBackground',
-      '&:hover, &:focus-visible': {
-        color: 'textSelected',
-      },
-      '&:disabled': {
-        cursor: 'not-allowed',
-      },
-    })
-)
-
 const PendingOrder: React.FC<{
   type: 'invest' | 'redeem'
   amount: Decimal
   pool: Pool | TinlakePool
+  state: InvestRedeemContextState
   onCancelOrder: () => void
   isCancelling: boolean
   onChangeOrder: () => void
-}> = ({ type, amount, pool, onCancelOrder, isCancelling, onChangeOrder }) => {
+}> = ({ type, amount, pool, state, onCancelOrder, isCancelling, onChangeOrder }) => {
   const { message: epochTimeRemaining } = useEpochTimeCountdown(pool.id!)
   const calculatingOrders = pool.epoch.status !== 'ongoing'
   return (
@@ -818,7 +832,7 @@ const PendingOrder: React.FC<{
           <Shelf gap={1}>
             <IconClock size="iconSmall" />
             <Text variant="body2" fontWeight={500}>
-              {formatBalance(amount, pool.currency.symbol)} locked
+              {formatBalance(amount, state.poolCurrency?.symbol)} locked
             </Text>
           </Shelf>
           <Text variant="body3">
@@ -827,21 +841,25 @@ const PendingOrder: React.FC<{
             <AnchorTextLink href="https://docs.centrifuge.io/learn/epoch/">Learn more</AnchorTextLink>
           </Text>
         </Stack>
-        <Grid gap="1px" columns={2} equalColumns>
-          <LightButton type="button" $left onClick={onCancelOrder} disabled={isCancelling || calculatingOrders}>
-            {isCancelling ? (
-              <Spinner size="iconSmall" />
-            ) : (
+        <Grid gap="1px" columns={state.canChangeOrder && state.canCancelOrder ? 2 : 1} equalColumns>
+          {state.canCancelOrder && (
+            <LightButton type="button" onClick={onCancelOrder} disabled={isCancelling || calculatingOrders}>
+              {isCancelling ? (
+                <Spinner size="iconSmall" />
+              ) : (
+                <Text variant="body2" color="inherit">
+                  Cancel
+                </Text>
+              )}
+            </LightButton>
+          )}
+          {state.canChangeOrder && (
+            <LightButton type="button" onClick={onChangeOrder} disabled={isCancelling || calculatingOrders}>
               <Text variant="body2" color="inherit">
-                Cancel
+                Change order
               </Text>
-            )}
-          </LightButton>
-          <LightButton type="button" onClick={onChangeOrder} disabled={isCancelling || calculatingOrders}>
-            <Text variant="body2" color="inherit">
-              Change order
-            </Text>
-          </LightButton>
+            </LightButton>
+          )}
         </Grid>
       </Stack>
       <TransactionsLink />
diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeemCentrifugeProvider.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeemCentrifugeProvider.tsx
index 449cf540ee..ff4e56e886 100644
--- a/centrifuge-app/src/components/InvestRedeem/InvestRedeemCentrifugeProvider.tsx
+++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeemCentrifugeProvider.tsx
@@ -23,7 +23,7 @@ export function InvestRedeemCentrifugeProvider({ poolId, trancheId, children }:
   const tranche = pool.tranches.find((t) => t.id === trancheId)
   const { data: metadata, isLoading: isMetadataLoading } = usePoolMetadata(pool)
   const trancheMeta = metadata?.tranches?.[trancheId]
-  const { state: liquidityState } = useLiquidityRewards()
+  const liquidityState = useLiquidityRewards().state
 
   if (!tranche) throw new Error(`Token not found. Pool id: ${poolId}, token id: ${trancheId}`)
 
@@ -95,7 +95,7 @@ export function InvestRedeemCentrifugeProvider({ poolId, trancheId, children }:
     ).toDecimal(),
     nativeBalance: balances?.native.balance.toDecimal() ?? Dec(0),
     poolCurrencyBalance: poolCurBalance,
-    poolCUrrencyBalanceWithPending: poolCurBalanceCombined,
+    poolCurrencyBalanceWithPending: poolCurBalanceCombined,
     trancheBalance,
     trancheBalanceWithPending: combinedBalance,
     investmentValue,
@@ -113,10 +113,12 @@ export function InvestRedeemCentrifugeProvider({ poolId, trancheId, children }:
     collectAmount: Dec(0),
     collectType: null,
     needsToCollectBeforeOrder: false,
-    needsPoolCurrencyApproval: false,
-    needsTrancheTokenApproval: false,
+    needsPoolCurrencyApproval: () => false,
+    needsTrancheTokenApproval: () => false,
+    canChangeOrder: true,
+    canCancelOrder: true,
     pendingAction,
-    pendingTransaction: pendingAction && txActions[pendingAction]?.lastCreatedTransaction,
+    pendingTransaction,
   }
 
   const actions: InvestRedeemActions = {
diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeemLiquidityPoolsProvider.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeemLiquidityPoolsProvider.tsx
new file mode 100644
index 0000000000..504d1e1f1a
--- /dev/null
+++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeemLiquidityPoolsProvider.tsx
@@ -0,0 +1,211 @@
+import { CurrencyBalance, Pool } from '@centrifuge/centrifuge-js'
+import { useCentrifuge, useEvmNativeBalance, useEvmNativeCurrency, useEvmProvider } from '@centrifuge/centrifuge-react'
+import { TransactionRequest } from '@ethersproject/providers'
+import BN from 'bn.js'
+import * as React from 'react'
+import { Dec } from '../../utils/Decimal'
+import { useEvmTransaction } from '../../utils/tinlake/useEvmTransaction'
+import { useAddress } from '../../utils/useAddress'
+import { useLiquidityPoolInvestment, useLiquidityPools, useLPEvents } from '../../utils/useLiquidityPools'
+import { usePendingCollect, usePool, usePoolMetadata } from '../../utils/usePools'
+import { InvestRedeemContext } from './InvestRedeemProvider'
+import { InvestRedeemAction, InvestRedeemActions, InvestRedeemProviderProps as Props, InvestRedeemState } from './types'
+
+export function InvestRedeemLiquidityPoolsProvider({ poolId, trancheId, children }: Props) {
+  const centAddress = useAddress('substrate')
+  const evmAddress = useAddress('evm')
+
+  const { data: evmNativeBalance } = useEvmNativeBalance(evmAddress)
+  const evmNativeCurrency = useEvmNativeCurrency()
+  const centOrder = usePendingCollect(poolId, trancheId, centAddress)
+  const pool = usePool(poolId) as Pool
+  const cent = useCentrifuge()
+  const [pendingActionState, setPendingAction] = React.useState<InvestRedeemAction | 'investWithPermit'>()
+  const { isLoading: isLpsLoading } = useLiquidityPools(poolId, trancheId)
+  const {
+    data: lpInvest,
+    refetch: refetchInvest,
+    isLoading: isInvestmentLoading,
+  } = useLiquidityPoolInvestment(poolId, trancheId)
+  const provider = useEvmProvider()
+
+  const { data: lpEvents } = useLPEvents(poolId, trancheId, lpInvest?.lpAddress)
+  const isAllowedToInvest = lpInvest?.isAllowedToInvest
+  const tranche = pool.tranches.find((t) => t.id === trancheId)
+  const { data: metadata, isLoading: isMetadataLoading } = usePoolMetadata(pool)
+  const trancheMeta = metadata?.tranches?.[trancheId]
+
+  if (!tranche) throw new Error(`Token not found. Pool id: ${poolId}, token id: ${trancheId}`)
+
+  const trancheBalance = lpInvest?.tokenBalance?.toDecimal() ?? Dec(0)
+
+  const price = tranche?.tokenPrice?.toDecimal() ?? Dec(1)
+  const investToCollect = lpInvest?.maxMint.toDecimal() ?? Dec(0)
+  const currencyToCollect = lpInvest?.maxWithdraw.toDecimal() ?? Dec(0)
+  const pendingRedeem = lpInvest?.pendingRedeem.toDecimal() ?? Dec(0)
+  const combinedTrancheBalance = trancheBalance.add(investToCollect).add(pendingRedeem)
+  const investmentValue = combinedTrancheBalance.mul(price)
+  const poolCurBalance = lpInvest?.currencyBalance.toDecimal() ?? Dec(0)
+  const poolCurBalanceCombined = poolCurBalance.add(currencyToCollect).add(lpInvest?.pendingInvest.toDecimal() ?? 0)
+
+  const isCalculatingOrders = pool.epoch.status !== 'ongoing'
+
+  const collectType = currencyToCollect.gt(0) ? 'redeem' : investToCollect.gt(0) ? 'invest' : null
+
+  const invest = useEvmTransaction('Invest', (cent) => cent.liquidityPools.increaseInvestOrder)
+  const investWithPermit = useEvmTransaction('Invest', (cent) => cent.liquidityPools.increaseInvestOrderWithPermit)
+  const redeem = useEvmTransaction('Redeem', (cent) => cent.liquidityPools.increaseRedeemOrder)
+  const collectInvest = useEvmTransaction('Collect', (cent) => cent.liquidityPools.mint)
+  const collectRedeem = useEvmTransaction('Withdraw', (cent) => cent.liquidityPools.withdraw)
+  const approve = useEvmTransaction('Approve', (cent) => cent.liquidityPools.approveForCurrency)
+  const cancelInvest = useEvmTransaction('Cancel order', (cent) => cent.liquidityPools.cancelInvestOrder)
+  const cancelRedeem = useEvmTransaction('Cancel order', (cent) => cent.liquidityPools.cancelRedeemOrder)
+
+  const txActions = {
+    invest,
+    investWithPermit,
+    redeem,
+    collect: collectType === 'invest' ? collectInvest : collectRedeem,
+    approvePoolCurrency: approve,
+    approveTrancheToken: approve,
+    cancelInvest,
+    cancelRedeem,
+  }
+  const pendingAction = pendingActionState === 'investWithPermit' ? 'invest' : pendingActionState
+  const pendingTransaction = pendingActionState && txActions[pendingActionState]?.lastCreatedTransaction
+  let statusMessage
+  if (
+    lpInvest?.pendingInvest &&
+    !lpInvest.pendingInvest.isZero() &&
+    lpEvents?.find((e) => e.event === 'CancelDepositRequest')
+  ) {
+    statusMessage = 'Order cancellation is currently being bridged and will show up soon'
+  } else if (
+    lpInvest?.pendingRedeem &&
+    !lpInvest.pendingRedeem.isZero() &&
+    lpEvents?.find((e) => e.event === 'CancelRedeemRequest')
+  ) {
+    statusMessage = 'Order cancellation is currently being bridged and will show up soon'
+  }
+
+  function doAction<T = any>(
+    name: InvestRedeemAction,
+    fn: (arg: T) => any[] | Promise<any[]>,
+    opt?: TransactionRequest
+  ): (args?: T) => void {
+    return (args) => {
+      txActions[name]?.execute(fn(args!) as any, opt)
+      setPendingAction(name)
+    }
+  }
+
+  React.useEffect(() => {
+    if (pendingAction && pendingTransaction?.status === 'succeeded') {
+      refetchInvest()
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [pendingTransaction?.status])
+
+  function useActionSucceeded(cb: (action: InvestRedeemAction) => void) {
+    React.useEffect(() => {
+      if (pendingAction && pendingTransaction?.status === 'succeeded') {
+        cb(pendingAction)
+      }
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [pendingTransaction?.status])
+  }
+
+  const state: InvestRedeemState = {
+    poolId,
+    trancheId,
+    isDataLoading: isLpsLoading || isInvestmentLoading || isMetadataLoading,
+    isAllowedToInvest,
+    isPoolBusy: isCalculatingOrders,
+    isFirstInvestment: centOrder?.submittedAt === 0 && centOrder.investCurrency.isZero(),
+    nativeCurrency: evmNativeCurrency,
+    trancheCurrency: tranche.currency,
+    poolCurrency: lpInvest && {
+      decimals: lpInvest.currencyDecimals,
+      symbol: lpInvest.currencySymbol,
+    },
+    capacity: tranche.capacity.toDecimal(),
+    minInitialInvestment: new CurrencyBalance(
+      trancheMeta?.minInitialInvestment ?? 0,
+      pool.currency.decimals
+    ).toDecimal(),
+    nativeBalance: evmNativeBalance?.toDecimal() ?? Dec(0),
+    poolCurrencyBalance: poolCurBalance,
+    poolCurrencyBalanceWithPending: poolCurBalanceCombined,
+    trancheBalance,
+    trancheBalanceWithPending: combinedTrancheBalance,
+    investmentValue,
+    tokenPrice: price,
+    order:
+      lpInvest && (!lpInvest?.pendingInvest.isZero() || !lpInvest?.pendingRedeem.isZero())
+        ? {
+            investCurrency: lpInvest.pendingInvest.toDecimal(),
+            redeemToken: lpInvest.pendingRedeem.toDecimal(),
+            payoutCurrencyAmount: lpInvest.maxWithdraw.toDecimal(),
+            payoutTokenAmount: lpInvest.maxMint.toDecimal(),
+            remainingInvestCurrency: lpInvest.pendingInvest.toDecimal(),
+            remainingRedeemToken: lpInvest.pendingRedeem.toDecimal(),
+          }
+        : null,
+    collectAmount: investToCollect.gt(0) ? investToCollect : currencyToCollect,
+    collectType,
+    needsToCollectBeforeOrder: false,
+    needsPoolCurrencyApproval: (amount) =>
+      lpInvest ? lpInvest.lpCurrencyAllowance.toFloat() < amount && !lpInvest.currencySupportsPermit : false,
+    needsTrancheTokenApproval: () => false,
+    canChangeOrder: false,
+    canCancelOrder: true,
+    pendingAction,
+    pendingTransaction,
+    statusMessage,
+  }
+
+  const actions: InvestRedeemActions = {
+    invest: async (newOrder: BN) => {
+      if (!lpInvest) return
+      // If the last tx was an approve, we may not have refetched the allowance yet,
+      // so assume the allowance is enough to do a normal invest
+      if (
+        lpInvest.lpCurrencyAllowance.lt(newOrder) &&
+        lpInvest.currencySupportsPermit &&
+        pendingAction !== 'approvePoolCurrency'
+      ) {
+        const signer = provider!.getSigner()
+        const connectedCent = cent.connectEvm(evmAddress!, signer)
+        const permit = await connectedCent.liquidityPools.signPermit([
+          lpInvest.lpAddress,
+          lpInvest.currencyAddress,
+          newOrder,
+        ])
+        console.log('permit', permit)
+        investWithPermit.execute([lpInvest.lpAddress, newOrder, permit])
+        setPendingAction('investWithPermit')
+      } else {
+        invest.execute([lpInvest.lpAddress, newOrder])
+        setPendingAction('invest')
+      }
+    },
+    redeem: async (newOrder: BN) => {
+      if (!lpInvest) return
+      redeem.execute([lpInvest.lpAddress, newOrder])
+      setPendingAction('redeem')
+    },
+    collect: doAction('collect', () =>
+      collectType === 'invest' ? [lpInvest?.lpAddress, lpInvest?.maxMint] : [lpInvest?.lpAddress, lpInvest?.maxWithdraw]
+    ),
+    approvePoolCurrency: doAction('approvePoolCurrency', () => [lpInvest?.managerAddress, lpInvest?.currencyAddress]),
+    approveTrancheToken: doAction('approveTrancheToken', () => [lpInvest?.managerAddress, lpInvest?.lpAddress]),
+    cancelInvest: doAction('cancelInvest', () => [lpInvest?.lpAddress]),
+    cancelRedeem: doAction('cancelRedeem', () => [lpInvest?.lpAddress]),
+  }
+
+  const hooks = {
+    useActionSucceeded,
+  }
+
+  return <InvestRedeemContext.Provider value={{ state, actions, hooks }}>{children}</InvestRedeemContext.Provider>
+}
diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeemProvider.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeemProvider.tsx
index 1db477855f..16ada3c9ee 100644
--- a/centrifuge-app/src/components/InvestRedeem/InvestRedeemProvider.tsx
+++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeemProvider.tsx
@@ -1,5 +1,7 @@
+import { useWallet } from '@centrifuge/centrifuge-react'
 import * as React from 'react'
 import { InvestRedeemCentrifugeProvider } from './InvestRedeemCentrifugeProvider'
+import { InvestRedeemLiquidityPoolsProvider } from './InvestRedeemLiquidityPoolsProvider'
 import { InvestRedeemTinlakeProvider } from './InvestRedeemTinlakeProvider'
 import { InvestRedeemContext as InvestRedeemContextType, InvestRedeemProviderProps as Props } from './types'
 
@@ -13,8 +15,12 @@ export function useInvestRedeem() {
 
 export function InvestRedeemProvider(props: Props) {
   const isTinlakePool = props.poolId.startsWith('0x')
-
-  const Comp = isTinlakePool ? InvestRedeemTinlakeProvider : InvestRedeemCentrifugeProvider
+  const { connectedType, isEvmOnSubstrate } = useWallet()
+  const Comp = isTinlakePool
+    ? InvestRedeemTinlakeProvider
+    : connectedType === 'evm' && !isEvmOnSubstrate
+    ? InvestRedeemLiquidityPoolsProvider
+    : InvestRedeemCentrifugeProvider
 
   return <Comp {...props} />
 }
diff --git a/centrifuge-app/src/components/InvestRedeem/InvestRedeemTinlakeProvider.tsx b/centrifuge-app/src/components/InvestRedeem/InvestRedeemTinlakeProvider.tsx
index ec245f876d..dbfa7478dc 100644
--- a/centrifuge-app/src/components/InvestRedeem/InvestRedeemTinlakeProvider.tsx
+++ b/centrifuge-app/src/components/InvestRedeem/InvestRedeemTinlakeProvider.tsx
@@ -72,13 +72,18 @@ export function InvestRedeemTinlakeProvider({ poolId, trancheId, children }: Pro
       setPendingAction(name)
     }
   }
+  React.useEffect(() => {
+    if (pendingAction && pendingTransaction?.status === 'succeeded') {
+      refetchInvestment()
+      refetchBalance()
+      refetchBalances()
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [pendingTransaction?.status])
 
   function useActionSucceeded(cb: (action: InvestRedeemAction) => void) {
     React.useEffect(() => {
       if (pendingAction && pendingTransaction?.status === 'succeeded') {
-        refetchInvestment()
-        refetchBalance()
-        refetchBalances()
         cb(pendingAction)
       }
       // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -102,7 +107,7 @@ export function InvestRedeemTinlakeProvider({ poolId, trancheId, children }: Pro
     ).toDecimal(),
     nativeBalance: nativeBalance?.toDecimal() || Dec(0),
     poolCurrencyBalance: poolCurrencyBalance,
-    poolCUrrencyBalanceWithPending: poolCurrencyBalance.add(disburse?.remainingInvestCurrency || 0),
+    poolCurrencyBalanceWithPending: poolCurrencyBalance.add(disburse?.remainingInvestCurrency || 0),
     trancheBalance,
     trancheBalanceWithPending: combinedBalance,
     investmentValue,
@@ -118,10 +123,12 @@ export function InvestRedeemTinlakeProvider({ poolId, trancheId, children }: Pro
     collectAmount,
     collectType: disburse?.payoutCurrencyAmount.isZero() ? 'invest' : 'redeem',
     needsToCollectBeforeOrder: !collectAmount.isZero(),
-    needsPoolCurrencyApproval: !!trancheInvestment?.poolCurrencyAllowance.isZero(),
-    needsTrancheTokenApproval: !!trancheInvestment?.tokenAllowance.isZero(),
+    needsPoolCurrencyApproval: () => !!trancheInvestment?.poolCurrencyAllowance.isZero(),
+    needsTrancheTokenApproval: () => !!trancheInvestment?.tokenAllowance.isZero(),
+    canChangeOrder: true,
+    canCancelOrder: true,
     pendingAction,
-    pendingTransaction: pendingAction && txActions[pendingAction]?.lastCreatedTransaction,
+    pendingTransaction,
   }
 
   const actions: InvestRedeemActions = {
diff --git a/centrifuge-app/src/components/LiquidityRewards/LightButton.tsx b/centrifuge-app/src/components/InvestRedeem/LightButton.tsx
similarity index 70%
rename from centrifuge-app/src/components/LiquidityRewards/LightButton.tsx
rename to centrifuge-app/src/components/InvestRedeem/LightButton.tsx
index df172430fa..f27f08589a 100644
--- a/centrifuge-app/src/components/LiquidityRewards/LightButton.tsx
+++ b/centrifuge-app/src/components/InvestRedeem/LightButton.tsx
@@ -1,7 +1,7 @@
 import css from '@styled-system/css'
 import styled from 'styled-components'
 
-export const LightButton = styled.button<{ $left?: boolean; $right?: boolean }>(
+export const LightButton = styled.button(
   {
     display: 'flex',
     justifyContent: 'center',
@@ -14,8 +14,6 @@ export const LightButton = styled.button<{ $left?: boolean; $right?: boolean }>(
   (props) =>
     css({
       color: 'textPrimary',
-      borderBottomLeftRadius: props.$left ? 'card' : undefined,
-      borderBottomRightRadius: props.$right ? 'card' : undefined,
       backgroundColor: 'secondarySelectedBackground',
       '&:hover, &:focus-visible': {
         color: 'textSelected',
@@ -23,5 +21,11 @@ export const LightButton = styled.button<{ $left?: boolean; $right?: boolean }>(
       '&:disabled': {
         cursor: 'not-allowed',
       },
+      '&:first-child': {
+        borderBottomLeftRadius: 'card',
+      },
+      '&:last-child': {
+        borderBottomRightRadius: 'card',
+      },
     })
 )
diff --git a/centrifuge-app/src/components/InvestRedeem/types.ts b/centrifuge-app/src/components/InvestRedeem/types.ts
index 53779119b2..29918ade0d 100644
--- a/centrifuge-app/src/components/InvestRedeem/types.ts
+++ b/centrifuge-app/src/components/InvestRedeem/types.ts
@@ -29,7 +29,7 @@ export type InvestRedeemState = {
   minInitialInvestment: Decimal
   nativeBalance: Decimal
   poolCurrencyBalance: Decimal
-  poolCUrrencyBalanceWithPending: Decimal
+  poolCurrencyBalanceWithPending: Decimal
   trancheBalance: Decimal
   trancheBalanceWithPending: Decimal
   investmentValue: Decimal
@@ -45,10 +45,13 @@ export type InvestRedeemState = {
   collectAmount: Decimal
   collectType: 'invest' | 'redeem' | null
   needsToCollectBeforeOrder: boolean
-  needsPoolCurrencyApproval: boolean
-  needsTrancheTokenApproval: boolean
+  needsPoolCurrencyApproval: (amount: number) => boolean
+  needsTrancheTokenApproval: (amount: number) => boolean
+  canChangeOrder: boolean
+  canCancelOrder: boolean
   pendingAction?: InvestRedeemAction | null
   pendingTransaction?: Transaction | null
+  statusMessage?: string
 }
 
 export type ActionOptions = {
diff --git a/centrifuge-app/src/components/LayoutBase/index.tsx b/centrifuge-app/src/components/LayoutBase/index.tsx
index 742e4dce78..617b17635c 100644
--- a/centrifuge-app/src/components/LayoutBase/index.tsx
+++ b/centrifuge-app/src/components/LayoutBase/index.tsx
@@ -1,5 +1,5 @@
 import { WalletMenu } from '@centrifuge/centrifuge-react'
-import { Box } from '@centrifuge/fabric'
+import { Box, Stack, Text } from '@centrifuge/fabric'
 import * as React from 'react'
 import { Footer } from '../Footer'
 import { LoadBoundary } from '../LoadBoundary'
@@ -7,6 +7,7 @@ import { LogoLink } from '../LogoLink'
 import { Menu } from '../Menu'
 import { OnboardingStatus } from '../OnboardingStatus'
 import { SideDrawerProps } from '../SideDrawer'
+import { BasePadding } from './BasePadding'
 import {
   FooterContainer,
   HeaderBackground,
@@ -61,3 +62,32 @@ export function LayoutBase({ children, sideDrawer }: LayoutBaseProps) {
     </Root>
   )
 }
+
+export function LayoutMain({
+  title,
+  subtitle,
+  children,
+}: {
+  title: string
+  subtitle?: string
+  children: React.ReactNode
+}) {
+  return (
+    <BasePadding>
+      <Stack gap={4}>
+        <Stack>
+          <Text as="h1" variant="heading1">
+            {title}
+          </Text>
+          {subtitle && (
+            <Text as="p" variant="heading6">
+              {subtitle}
+            </Text>
+          )}
+        </Stack>
+
+        {children}
+      </Stack>
+    </BasePadding>
+  )
+}
diff --git a/centrifuge-app/src/components/LiquidityRewards/LiquidityRewardsProvider.tsx b/centrifuge-app/src/components/LiquidityRewards/LiquidityRewardsProvider.tsx
index 18eb845d6b..ec7f9fd274 100644
--- a/centrifuge-app/src/components/LiquidityRewards/LiquidityRewardsProvider.tsx
+++ b/centrifuge-app/src/components/LiquidityRewards/LiquidityRewardsProvider.tsx
@@ -17,7 +17,7 @@ export function LiquidityRewardsProvider(props: LiquidityRewardsProviderProps) {
 function Provider({ poolId, trancheId, children }: LiquidityRewardsProviderProps) {
   const pool = usePool(poolId) as Pool
   const consts = useCentrifugeConsts()
-  const address = useAddress()
+  const address = useAddress('substrate')
   const order = usePendingCollect(poolId, trancheId, address)
   const stakes = useAccountStakes(address, poolId, trancheId)
   const rewards = useComputeLiquidityRewards(address, [{ poolId, trancheId }])
diff --git a/centrifuge-app/src/components/LiquidityRewards/LiquidityRewardsStaker.tsx b/centrifuge-app/src/components/LiquidityRewards/LiquidityRewardsStaker.tsx
index 0e8407ce65..012556ea4d 100644
--- a/centrifuge-app/src/components/LiquidityRewards/LiquidityRewardsStaker.tsx
+++ b/centrifuge-app/src/components/LiquidityRewards/LiquidityRewardsStaker.tsx
@@ -2,8 +2,8 @@ import { Box, Divider, Grid, IconCheckInCircle, Shelf, Stack, Text } from '@cent
 import * as React from 'react'
 import { millisecondsToDays } from '../../utils/date'
 import { formatBalance } from '../../utils/formatting'
+import { LightButton } from '../InvestRedeem/LightButton'
 import { useActiveEpochData } from './hooks'
-import { LightButton } from './LightButton'
 import { useLiquidityRewards } from './LiquidityRewardsContext'
 
 export function LiquidityRewardsStaker() {
@@ -69,19 +69,14 @@ export function LiquidityRewardsStaker() {
 
       <Grid mt="1px" gap="1px" columns={canStake && canUnstake ? 2 : 1}>
         {canStake && (
-          <LightButton onClick={stake} $left $right={!canUnstake} disabled={isLoading.unstake || isLoading.stake}>
+          <LightButton onClick={stake} disabled={isLoading.unstake || isLoading.stake}>
             <Text variant="body2" color="inherit">
               Stake
             </Text>
           </LightButton>
         )}
         {canUnstake && (
-          <LightButton
-            onClick={() => unstake()}
-            $left={!canStake}
-            $right
-            disabled={isLoading.unstake || isLoading.stake}
-          >
+          <LightButton onClick={() => unstake()} disabled={isLoading.unstake || isLoading.stake}>
             <Text variant="body2" color="inherit">
               Unstake
             </Text>
diff --git a/centrifuge-app/src/components/LiquidityRewards/hooks.ts b/centrifuge-app/src/components/LiquidityRewards/hooks.ts
index 44d422a30c..af4bb86b18 100644
--- a/centrifuge-app/src/components/LiquidityRewards/hooks.ts
+++ b/centrifuge-app/src/components/LiquidityRewards/hooks.ts
@@ -7,7 +7,6 @@ export function useAccountStakes(address?: string, poolId?: string, trancheId?:
     ['stakes', address, poolId, trancheId],
     (cent) => cent.rewards.getAccountStakes([address!, poolId!, trancheId!]),
     {
-      suspense: true,
       enabled: !!address && !!poolId && !!trancheId,
     }
   )
diff --git a/centrifuge-app/src/components/Menu/index.tsx b/centrifuge-app/src/components/Menu/index.tsx
index 4fd89bd618..4c9a345e64 100644
--- a/centrifuge-app/src/components/Menu/index.tsx
+++ b/centrifuge-app/src/components/Menu/index.tsx
@@ -5,6 +5,7 @@ import {
   IconInvestments,
   IconNft,
   IconPieChart,
+  IconSwitch,
   Menu as Panel,
   MenuItemGroup,
   Shelf,
@@ -25,7 +26,7 @@ export function Menu() {
   const pools = usePoolsThatAnyConnectedAddressHasPermissionsFor() || []
   const isLarge = useIsAboveBreakpoint('L')
   const address = useAddress('substrate')
-  const { showPortfolio, showPrime } = useDebugFlags()
+  const { showSwaps, showPortfolio, showPrime } = useDebugFlags()
 
   return (
     <Shelf
@@ -103,6 +104,13 @@ export function Menu() {
           )}
         </IssuerMenu>
       )}
+
+      {showSwaps && (
+        <PageLink to="/swaps" stacked={!isLarge}>
+          <IconSwitch />
+          Swaps
+        </PageLink>
+      )}
     </Shelf>
   )
 }
diff --git a/centrifuge-app/src/components/PoolsTokensShared.tsx b/centrifuge-app/src/components/PoolsTokensShared.tsx
index 3696f271bc..d39179099f 100644
--- a/centrifuge-app/src/components/PoolsTokensShared.tsx
+++ b/centrifuge-app/src/components/PoolsTokensShared.tsx
@@ -37,7 +37,6 @@ export function PoolsTokensShared({ title, children }: PoolsTokensSharedProps) {
         <Stack alignItems="end">
           <MenuSwitch />
         </Stack>
-
         {children}
       </Stack>
     </BasePadding>
diff --git a/centrifuge-app/src/components/Root.tsx b/centrifuge-app/src/components/Root.tsx
index 41736f4bd8..45d941409b 100644
--- a/centrifuge-app/src/components/Root.tsx
+++ b/centrifuge-app/src/components/Root.tsx
@@ -7,6 +7,8 @@ import {
   WalletProvider,
 } from '@centrifuge/centrifuge-react'
 import { FabricProvider, GlobalStyle as FabricGlobalStyle } from '@centrifuge/fabric'
+import arbitrumLogo from '@centrifuge/fabric/assets/logos/arbitrum.svg'
+import baseLogo from '@centrifuge/fabric/assets/logos/base.svg'
 import ethereumLogo from '@centrifuge/fabric/assets/logos/ethereum.svg'
 import goerliLogo from '@centrifuge/fabric/assets/logos/goerli.svg'
 import * as React from 'react'
@@ -59,17 +61,13 @@ const centConfig: UserProvidedConfig = {
 
 const infuraKey = import.meta.env.REACT_APP_INFURA_KEY
 
-const evmChains: EvmChains =
+const baseEvmChains: EvmChains =
   ethConfig.network === 'mainnet'
     ? {
         1: {
           urls: [`https://mainnet.infura.io/v3/${infuraKey}`],
           iconUrl: ethereumLogo,
         },
-        8453: {
-          urls: ['https://mainnet.base.org'],
-          iconUrl: 'https://docs.base.org/img/logo_dark.svg',
-        },
       }
     : {
         1: {
@@ -80,20 +78,49 @@ const evmChains: EvmChains =
           urls: [`https://goerli.infura.io/v3/${infuraKey}`],
           iconUrl: goerliLogo,
         },
-        8453: {
-          urls: ['https://mainnet.base.org'],
-          iconUrl: 'https://docs.base.org/img/logo.svg',
-        },
-        84531: {
-          urls: ['https://goerli.base.org'],
-          iconUrl: 'https://docs.base.org/img/logo.svg',
-        },
       }
-
+const evmChains = {
+  ...baseEvmChains,
+  8453: {
+    name: 'Base',
+    nativeCurrency: { name: 'Base', symbol: 'bETH', decimals: 18 },
+    blockExplorerUrl: 'https://basescan.org/',
+    urls: ['https://mainnet.base.org'],
+    iconUrl: baseLogo,
+  },
+  84531: {
+    name: 'Base Goerli',
+    nativeCurrency: { name: 'Base Goerli', symbol: 'gbETH', decimals: 18 },
+    blockExplorerUrl: 'https://goerli.basescan.org/',
+    urls: ['https://goerli.base.org'],
+    iconUrl: baseLogo,
+  },
+  42161: {
+    name: 'Arbitrum One',
+    nativeCurrency: {
+      name: 'Ether',
+      symbol: 'ETH',
+      decimals: 18,
+    },
+    blockExplorerUrl: 'https://arbiscan.io/',
+    urls: ['https://arb1.arbitrum.io/rpc'],
+    iconUrl: arbitrumLogo,
+  },
+  421613: {
+    name: 'Arbitrum Goerli',
+    nativeCurrency: {
+      name: 'Ether',
+      symbol: 'ETH',
+      decimals: 18,
+    },
+    blockExplorerUrl: 'https://goerli.arbiscan.io/',
+    urls: ['https://goerli-rollup.arbitrum.io/rpc'],
+    iconUrl: arbitrumLogo,
+  },
+}
 export function Root() {
-  const [isThemeToggled, setIsThemeToggled] = React.useState(!!initialFlagsState.alternativeTheme)
-  const [showAdvancedAccounts, setShowAdvancedAccounts] = React.useState(!!initialFlagsState.showAdvancedAccounts)
-  const [showBase, setShowBase] = React.useState(!!initialFlagsState.showBase)
+  const [debugState, setDebugState] = React.useState(initialFlagsState)
+  const isThemeToggled = debugState.alternativeTheme
 
   return (
     <>
@@ -113,36 +140,32 @@ export function Root() {
           <GlobalStyle />
           <FabricGlobalStyle />
           <CentrifugeProvider config={centConfig}>
-            <DemoBanner />
-            <SupportedBrowserBanner />
-            <WalletProvider
-              evmChains={evmChains}
-              subscanUrl={import.meta.env.REACT_APP_SUBSCAN_URL}
-              walletConnectId={import.meta.env.REACT_APP_WALLETCONNECT_ID}
-              showAdvancedAccounts={showAdvancedAccounts}
-              showBase={showBase}
-            >
-              <OnboardingAuthProvider>
-                <OnboardingProvider>
-                  <DebugFlags
-                    onChange={(state) => {
-                      setIsThemeToggled(!!state.alternativeTheme)
-                      setShowAdvancedAccounts(!!state.showAdvancedAccounts)
-                      setShowBase(!!state.showBase)
-                    }}
-                  >
-                    <TransactionProvider>
-                      <TransactionToasts />
-                      <Router>
+            <Router>
+              <DemoBanner />
+              <SupportedBrowserBanner />
+              <WalletProvider
+                evmChains={evmChains}
+                subscanUrl={import.meta.env.REACT_APP_SUBSCAN_URL}
+                walletConnectId={import.meta.env.REACT_APP_WALLETCONNECT_ID}
+                showAdvancedAccounts={debugState.showAdvancedAccounts as any}
+                showBase={debugState.showBase as any}
+                showArbitrum={debugState.showArbitrum as any}
+                showTestNets={debugState.showTestNets as any}
+              >
+                <OnboardingAuthProvider>
+                  <OnboardingProvider>
+                    <DebugFlags onChange={(state) => setDebugState(state)}>
+                      <TransactionProvider>
+                        <TransactionToasts />
                         <LoadBoundary>
                           <Routes />
                         </LoadBoundary>
-                      </Router>
-                    </TransactionProvider>
-                  </DebugFlags>
-                </OnboardingProvider>
-              </OnboardingAuthProvider>
-            </WalletProvider>
+                      </TransactionProvider>
+                    </DebugFlags>
+                  </OnboardingProvider>
+                </OnboardingAuthProvider>
+              </WalletProvider>
+            </Router>
           </CentrifugeProvider>
         </FabricProvider>
       </QueryClientProvider>
@@ -166,6 +189,7 @@ const OnboardingPage = React.lazy(() => import('../pages/Onboarding'))
 const EmailVerified = React.lazy(() => import('../pages/Onboarding/EmailVerified'))
 const UpdateInvestorStatus = React.lazy(() => import('../pages/Onboarding/UpdateInvestorStatus'))
 const PoolDetailPage = React.lazy(() => import('../pages/Pool'))
+const SwapsPage = React.lazy(() => import('../pages/Swaps'))
 const PortfolioPage = React.lazy(() => import('../pages/Portfolio'))
 const TransactionHistoryPage = React.lazy(() => import('../pages/Portfolio/TransactionHistory'))
 const TokenOverviewPage = React.lazy(() => import('../pages/Tokens'))
@@ -241,6 +265,9 @@ function Routes() {
       <Route exact path="/multisig-approval">
         <MultisigApprovalPage />
       </Route>
+      <Route path="/swaps">
+        <SwapsPage />
+      </Route>
       <Route exact path="/">
         <Redirect to="/pools" />
       </Route>
diff --git a/centrifuge-app/src/components/Swaps/Orders.tsx b/centrifuge-app/src/components/Swaps/Orders.tsx
new file mode 100644
index 0000000000..4439f14fa0
--- /dev/null
+++ b/centrifuge-app/src/components/Swaps/Orders.tsx
@@ -0,0 +1,330 @@
+import {
+  addressToHex,
+  CurrencyBalance,
+  CurrencyKey,
+  CurrencyMetadata,
+  findBalance,
+  findCurrency,
+  getCurrencyChainId,
+  isSameCurrency,
+  parseCurrencyKey,
+  Rate,
+} from '@centrifuge/centrifuge-js'
+import {
+  truncateAddress,
+  useBalances,
+  useCentrifuge,
+  useCentrifugeApi,
+  useCentrifugeQuery,
+  useCentrifugeTransaction,
+  useCentrifugeUtils,
+  useGetNetworkName,
+} from '@centrifuge/centrifuge-react'
+import {
+  Box,
+  Button,
+  Card,
+  Checkbox,
+  Dialog,
+  IconArrowRight,
+  IconButton,
+  IconCopy,
+  Shelf,
+  Stack,
+  Text,
+  TextInput,
+} from '@centrifuge/fabric'
+import { isAddress as isEvmAddress } from '@ethersproject/address'
+import * as React from 'react'
+import { filter, map, repeatWhen, switchMap } from 'rxjs'
+import { copyToClipboard } from '../../utils/copyToClipboard'
+import { Dec } from '../../utils/Decimal'
+import { formatBalance } from '../../utils/formatting'
+import { useCurrencies } from '../../utils/useCurrencies'
+import { useSuitableAccounts } from '../../utils/usePermissions'
+import { ButtonGroup } from '../ButtonGroup'
+import { Column, DataTable } from '../DataTable'
+import { PageSection } from '../PageSection'
+
+export type OrdersProps = {
+  buyOrSell?: CurrencyKey
+}
+
+export type SwapOrder = {
+  id: string
+  account: string
+  buyAmount: CurrencyBalance
+  sellAmount: CurrencyBalance
+  price: Rate
+  buyCurrency: CurrencyMetadata
+  sellCurrency: CurrencyMetadata
+}
+
+export function Orders({ buyOrSell }: OrdersProps) {
+  const cent = useCentrifuge()
+  const currencies = useCurrencies()
+  const utils = useCentrifugeUtils()
+  const [selectedOrder, setSelectedOrder] = React.useState<SwapOrder>()
+
+  const columns: Column[] = React.useMemo(
+    () => [
+      {
+        align: 'left',
+        header: 'Pair',
+        cell: (row: SwapOrder) => `${row.sellCurrency.symbol} <> ${row.buyCurrency.symbol}`,
+        flex: '1',
+      },
+      {
+        align: 'left',
+        header: 'Amount',
+        cell: (row: SwapOrder) => formatBalance(row.buyAmount, row.buyCurrency, 2, 0),
+        flex: '1',
+      },
+      {
+        align: 'left',
+        header: 'Price',
+        cell: (row: SwapOrder) => formatBalance(row.price, row.sellCurrency, 4),
+        flex: '1',
+      },
+      {
+        align: 'left',
+        header: 'Account',
+        cell: (row: SwapOrder) => truncateAddress(utils.formatAddress(row.account)),
+        flex: '1',
+      },
+      {
+        align: 'left',
+        header: '',
+        cell: (row: SwapOrder) => (
+          <Button
+            variant="secondary"
+            onClick={() => {
+              setSelectedOrder(row)
+            }}
+            small
+          >
+            Fulfill order
+          </Button>
+        ),
+        flex: '1',
+      },
+    ],
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    []
+  )
+
+  const [orders] = useCentrifugeQuery(
+    ['swapOrders'],
+    () => {
+      const $events = cent.getEvents().pipe(
+        filter(({ api, events }) => {
+          return events.some(
+            ({ event }) =>
+              api.events.orderBook.OrderCreated.is(event) ||
+              api.events.orderBook.OrderCancelled.is(event) ||
+              api.events.orderBook.OrderUpdated.is(event) ||
+              api.events.orderBook.OrderFulfillment.is(event)
+          )
+        })
+      )
+      return cent.getApi().pipe(
+        switchMap((api) => api.query.orderBook.orders.entries()),
+        map((rawOrders) => {
+          return rawOrders.map(([, value]) => {
+            const order = value.toPrimitive() as {
+              orderId: number
+              placingAccount: string
+              assetInId: CurrencyKey
+              assetOutId: CurrencyKey
+              buyAmount: string
+              initialBuyAmount: string
+              maxSellRate: string
+              minFullfillmentAmount: string
+              maxSellAmount: string
+            }
+
+            const assetInId = parseCurrencyKey(order.assetInId)
+            const assetOutId = parseCurrencyKey(order.assetOutId)
+            const buyCurrency = findCurrency(currencies!, assetInId)!
+            const sellCurrency = findCurrency(currencies!, assetOutId)!
+            return {
+              id: String(order.orderId),
+              account: addressToHex(order.placingAccount),
+              buyAmount: new CurrencyBalance(order.buyAmount, buyCurrency!.decimals),
+              sellAmount: new CurrencyBalance(order.maxSellAmount, sellCurrency!.decimals),
+              price: new Rate(order.maxSellRate),
+              buyCurrency,
+              sellCurrency,
+            }
+          })
+        }),
+        repeatWhen(() => $events)
+      )
+    },
+    { enabled: !!currencies }
+  )
+
+  const filtered = orders?.filter(
+    (order) =>
+      !buyOrSell ||
+      isSameCurrency(buyOrSell, order.buyCurrency.key) ||
+      isSameCurrency(buyOrSell, order.sellCurrency.key)
+  )
+  return (
+    <PageSection>
+      <DataTable data={filtered || []} columns={columns} />
+      {selectedOrder && <SwapAndSendDialog order={selectedOrder} open onClose={() => setSelectedOrder(undefined)} />}
+    </PageSection>
+  )
+}
+
+export function SwapAndSendDialog({ open, onClose, order }: { open: boolean; onClose: () => void; order: SwapOrder }) {
+  const [account] = useSuitableAccounts({})
+  const utils = useCentrifugeUtils()
+  const balances = useBalances(account?.actingAddress)
+  const api = useCentrifugeApi()
+  const [isTransferEnabled, setIsTransferEnabled] = React.useState(false)
+  const [tranferReceiverAddress, setTranferReceiverAddress] = React.useState('')
+  const [tranferReceiverAddressTouched, setTranferReceiverAddressTouched] = React.useState(false)
+  const getNetworkName = useGetNetworkName()
+
+  const balanceDec =
+    (balances && findBalance(balances.currencies, order.buyCurrency.key))?.balance.toDecimal() || Dec(0)
+  const orderBuyDec = order.buyAmount.toDecimal()
+  let orderBuyCurrencyEVMChain = getCurrencyChainId(order.buyCurrency)
+  let orderSellCurrencyEVMChain = getCurrencyChainId(order.sellCurrency)
+
+  const { execute, reset, isLoading, lastCreatedTransaction } = useCentrifugeTransaction(
+    'Fulfill order',
+    (cent) => (args: [transferTo: string | null], options) => {
+      const [transferTo] = args
+      const swapTx = api.tx.orderBook.fillOrderFull(order.id)
+
+      let tx = swapTx
+      if (transferTo) {
+        tx = api.tx.utility.batchAll([
+          swapTx,
+          api.tx.liquidityPools.transfer(
+            order.sellCurrency.key,
+            { EVM: [orderSellCurrencyEVMChain, transferTo] },
+            order.sellAmount
+          ),
+        ])
+      }
+
+      return cent.wrapSignAndSend(api, tx, options)
+    }
+  )
+
+  React.useEffect(() => {
+    if (lastCreatedTransaction?.status === 'pending') {
+      close()
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [lastCreatedTransaction?.status])
+
+  function submit(e: React.FormEvent) {
+    e.preventDefault()
+    if (isTransferEnabled && !isEvmAddress(tranferReceiverAddress)) return
+
+    execute([isTransferEnabled ? tranferReceiverAddress : null], { account })
+  }
+
+  function close() {
+    reset()
+    onClose()
+  }
+
+  const balanceLow = balanceDec.lt(orderBuyDec)
+
+  const disabled = balanceLow || (isTransferEnabled && !isEvmAddress(tranferReceiverAddress))
+
+  if (!account) return null
+
+  return (
+    <Dialog isOpen={open} onClose={close} title="Fulfill order">
+      <form onSubmit={submit}>
+        <Stack gap={3}>
+          <Stack alignSelf="center" gap={5}>
+            <Shelf alignItems="center" alignSelf="center" gap={4} flexWrap="nowrap" mb={2}>
+              <Text variant="heading3" style={{ position: 'relative' }}>
+                <Text fontSize={24}>{formatBalance(order.buyAmount)}</Text> {order.buyCurrency.symbol}
+                <Box position="absolute" top="100%" left={0}>
+                  <Text
+                    variant="label2"
+                    color={balanceLow ? 'statusCritical' : undefined}
+                    style={{ whiteSpace: 'nowrap' }}
+                  >
+                    {formatBalance(balanceDec, order.buyCurrency.symbol)} available
+                  </Text>
+                </Box>
+              </Text>
+              <IconArrowRight />
+              <Text variant="heading3">
+                <Text fontSize={24}>{formatBalance(order.sellAmount)}</Text> {order.sellCurrency.symbol}
+              </Text>
+            </Shelf>
+            {balanceLow && (
+              <TextInput
+                label={
+                  orderBuyCurrencyEVMChain
+                    ? `Send ${order.buyCurrency.symbol} from ${getNetworkName(
+                        Number(orderBuyCurrencyEVMChain)
+                      )} to this address on Centrifuge Chain`
+                    : `Send ${order.buyCurrency.symbol} to this address on Centrifuge Chain`
+                }
+                value={utils.formatAddress(account.actingAddress)}
+                readOnly
+                rightElement={
+                  <IconButton
+                    onClick={() => copyToClipboard(utils.formatAddress(account.actingAddress))}
+                    title="Copy address to clipboard"
+                  >
+                    <IconCopy />
+                  </IconButton>
+                }
+              />
+            )}
+          </Stack>
+
+          {orderSellCurrencyEVMChain && (
+            <Card p={2}>
+              <Stack gap={2}>
+                <Checkbox
+                  label={`Transfer swapped funds to ${getNetworkName(Number(orderSellCurrencyEVMChain))}`}
+                  checked={isTransferEnabled}
+                  onChange={(e) => setIsTransferEnabled(e.target.checked)}
+                />
+                <Stack as="fieldset" disabled={!isTransferEnabled} gap={2} minWidth={0} m={0} p={0} border={0}>
+                  <TextInput
+                    label="Receiver EVM address"
+                    value={tranferReceiverAddress}
+                    placeholder="0x..."
+                    onChange={(e) => {
+                      setTranferReceiverAddress(e.target.value)
+                      setTranferReceiverAddressTouched(true)
+                    }}
+                    disabled={!isTransferEnabled}
+                    errorMessage={
+                      tranferReceiverAddressTouched && !isEvmAddress(tranferReceiverAddress)
+                        ? 'Not a valid address'
+                        : undefined
+                    }
+                  />
+                </Stack>
+              </Stack>
+            </Card>
+          )}
+          <ButtonGroup>
+            <Button variant="secondary" onClick={close}>
+              Cancel
+            </Button>
+            <Button type="submit" disabled={disabled} loading={isLoading}>
+              Swap {isTransferEnabled && 'and transfer'}
+            </Button>
+          </ButtonGroup>
+        </Stack>
+      </form>
+    </Dialog>
+  )
+}
diff --git a/centrifuge-app/src/components/Swaps/Swap.tsx b/centrifuge-app/src/components/Swaps/Swap.tsx
new file mode 100644
index 0000000000..10cd9435be
--- /dev/null
+++ b/centrifuge-app/src/components/Swaps/Swap.tsx
@@ -0,0 +1,125 @@
+import { CurrencyBalance, CurrencyKey, findBalance, findCurrency, Rate } from '@centrifuge/centrifuge-js'
+import { useBalances, useCentrifugeApi, useCentrifugeTransaction } from '@centrifuge/centrifuge-react'
+import { CentrifugeTransactionOptions } from '@centrifuge/centrifuge-react/dist/hooks/useCentrifugeTransaction'
+import { Button, Card, CurrencyInput, SelectInner, Stack } from '@centrifuge/fabric'
+import Decimal from 'decimal.js-light'
+import * as React from 'react'
+import { Dec } from '../../utils/Decimal'
+import { formatBalance, roundDown } from '../../utils/formatting'
+import { useCurrencies } from '../../utils/useCurrencies'
+import { useSuitableAccountPicker } from '../../utils/usePermissions'
+
+type SwapProps = {
+  defaultBuy?: CurrencyKey
+  defaultSell?: CurrencyKey
+}
+
+export function Swap({ defaultBuy, defaultSell }: SwapProps) {
+  const [account, accountPicker] = useSuitableAccountPicker({})
+  const [buyCurrencyKey, setBuyCurrency] = React.useState(defaultBuy)
+  const [sellCurrencyKey, setSellCurrency] = React.useState(defaultSell)
+  const [buy, setBuy] = React.useState(0)
+  const [sell, setSell] = React.useState<number | Decimal>(0)
+  const [price, setPrice] = React.useState(1)
+  const [lastChanged, setLastChanged] = React.useState<'buy' | 'sell'>('buy')
+  const api = useCentrifugeApi()
+  const balances = useBalances(account?.actingAddress)
+
+  const sellBalance =
+    (balances && sellCurrencyKey && findBalance(balances.currencies, sellCurrencyKey)?.balance.toDecimal()) || Dec(0)
+
+  const allCurrencies = useCurrencies()
+  const currencies = allCurrencies?.filter((cur) => typeof cur.key === 'object' && 'ForeignAsset' in cur.key)
+
+  const { execute, isLoading } = useCentrifugeTransaction(
+    'Place order',
+    (cent) => (_: [], options?: CentrifugeTransactionOptions) => {
+      const buyDec = lastChanged === 'buy' ? buy : Dec(sell).div(price)
+      const buyAmount = CurrencyBalance.fromFloat(buyDec, buyCurrency!.decimals)
+      const buyPrice = Rate.fromFloat(price)
+      return cent.wrapSignAndSend(
+        api,
+        api.tx.orderBook.createOrderV1(buyCurrencyKey, sellCurrencyKey, buyAmount, buyPrice),
+        options
+      )
+    }
+  )
+
+  const buyCurrency = buyCurrencyKey ? findCurrency(currencies ?? [], buyCurrencyKey) : undefined
+  const sellCurrency = sellCurrencyKey ? findCurrency(currencies ?? [], sellCurrencyKey) : undefined
+
+  const buyAmount = lastChanged === 'buy' ? buy : toNumber(sell) / price
+  const sellAmount = lastChanged === 'sell' ? toNumber(sell) : buy * price
+
+  return (
+    <Card p={2}>
+      <Stack gap={1}>
+        {accountPicker}
+        <CurrencyInput
+          label="Buy"
+          value={buyAmount}
+          onChange={(val) => {
+            setBuy(val)
+            setSell(val * price)
+            setLastChanged('buy')
+          }}
+          currency={
+            <SelectInner
+              value={buyCurrency?.symbol ?? ''}
+              options={[
+                { label: 'Select', value: '', disabled: true },
+                ...(currencies?.map((cur) => ({ label: cur.symbol, value: cur.symbol })) ?? []),
+              ]}
+              onChange={(e) => {
+                const key = currencies?.find((cur) => cur.symbol === e.target.value)?.key
+                if (key) setBuyCurrency(key)
+              }}
+              style={{ textAlign: 'right' }}
+            />
+          }
+        />
+        <CurrencyInput
+          label="Price"
+          value={price}
+          onChange={(val) => {
+            setPrice(val)
+          }}
+          currency={sellCurrency?.symbol}
+        />
+        <CurrencyInput
+          label="Sell"
+          value={sellAmount}
+          onChange={(val) => {
+            setSell(val)
+            setLastChanged('sell')
+          }}
+          secondaryLabel={sellCurrency && `${formatBalance(roundDown(sellBalance), sellCurrency, 2)} available`}
+          onSetMax={() => {
+            setSell(sellBalance)
+            setLastChanged('sell')
+          }}
+          currency={
+            <SelectInner
+              value={sellCurrency?.symbol ?? ''}
+              options={[
+                { label: 'Select', value: '' },
+                ...(currencies?.map((cur) => ({ label: cur.symbol, value: cur.symbol })) ?? []),
+              ]}
+              onChange={(e) => {
+                const key = currencies?.find((cur) => cur.symbol === e.target.value)?.key
+                if (key) setSellCurrency(key)
+              }}
+              style={{ textAlign: 'right' }}
+            />
+          }
+        />
+        <Button loading={isLoading} onClick={() => execute([], { account })}>
+          Submit
+        </Button>
+      </Stack>
+    </Card>
+  )
+}
+function toNumber(n: '' | number | Decimal) {
+  return n instanceof Decimal ? n.toNumber() : Number(n)
+}
diff --git a/centrifuge-app/src/config.ts b/centrifuge-app/src/config.ts
index c7d9bf31a5..ecf13a4b84 100644
--- a/centrifuge-app/src/config.ts
+++ b/centrifuge-app/src/config.ts
@@ -74,6 +74,7 @@ type EnvironmentConfig = {
 
 const poolCreationType = import.meta.env.REACT_APP_POOL_CREATION_TYPE || 'immediate'
 const defaultPodUrl = import.meta.env.REACT_APP_DEFAULT_NODE_URL || ''
+export const isTestEnv = window.location.hostname.endsWith('k-f.dev') || window.location.hostname === 'localhost'
 
 const ALTAIR: EnvironmentConfig = {
   name: 'Pools on Altair',
diff --git a/centrifuge-app/src/pages/IssuerPool/Investors/InvestorStatus.tsx b/centrifuge-app/src/pages/IssuerPool/Investors/InvestorStatus.tsx
index 739b0e0324..c245c45203 100644
--- a/centrifuge-app/src/pages/IssuerPool/Investors/InvestorStatus.tsx
+++ b/centrifuge-app/src/pages/IssuerPool/Investors/InvestorStatus.tsx
@@ -1,5 +1,11 @@
 import { findBalance, Pool, Token } from '@centrifuge/centrifuge-js'
-import { useBalances, useCentrifugeTransaction } from '@centrifuge/centrifuge-react'
+import {
+  getChainInfo,
+  useBalances,
+  useCentrifugeTransaction,
+  useCentrifugeUtils,
+  useWallet,
+} from '@centrifuge/centrifuge-react'
 import {
   Button,
   Grid,
@@ -9,27 +15,39 @@ import {
   IconMinus,
   IconPlus,
   SearchInput,
+  Select,
   Shelf,
   Stack,
   Text,
   TextWithPlaceholder,
 } from '@centrifuge/fabric'
+import { isAddress as isEvmAddress } from '@ethersproject/address'
 import { isAddress } from '@polkadot/util-crypto'
 import React from 'react'
 import { useParams } from 'react-router'
 import { DataTable } from '../../../components/DataTable'
+import { useDebugFlags } from '../../../components/DebugFlags'
 import { PageSection } from '../../../components/PageSection'
 import { usePermissions, useSuitableAccounts } from '../../../utils/usePermissions'
 import { useOrder, usePool } from '../../../utils/usePools'
 
 const SevenDaysMs = (7 * 24 + 1) * 60 * 60 * 1000 // 1 hour margin
 
-export const InvestorStatus: React.FC = () => {
+export function InvestorStatus() {
+  const {
+    evm: { chains },
+  } = useWallet()
   const { pid: poolId } = useParams<{ pid: string }>()
   const [address, setAddress] = React.useState('')
-  const validAddress = isAddress(address) ? address : undefined
-  const permissions = usePermissions(validAddress)
+  const [chain, setChain] = React.useState<number | ''>('')
+  const validator = chain ? isEvmAddress : isAddress
+  const validAddress = validator(address) ? address : undefined
+  const utils = useCentrifugeUtils()
+  const centAddress = chain && validAddress ? utils.evmToSubstrateAddress(address, chain) : validAddress
+  const permissions = usePermissions(centAddress)
+
   const [pendingTrancheId, setPendingTrancheId] = React.useState('')
+  const { showLiquidityPoolsOptions } = useDebugFlags()
 
   const [account] = useSuitableAccounts({ poolId, poolRole: ['InvestorAdmin'] })
 
@@ -45,15 +63,20 @@ export const InvestorStatus: React.FC = () => {
   const pool = usePool(poolId) as Pool
 
   function toggleAllowed(trancheId: string) {
-    if (!validAddress) return
+    if (!centAddress || !validAddress) return
     const isAllowed = allowedTranches.includes(trancheId)
     const OneHundredYearsFromNow = Math.floor(Date.now() / 1000 + 10 * 365 * 24 * 60 * 60)
     const SevenDaysFromNow = Math.floor((Date.now() + SevenDaysMs) / 1000)
+    const domains = chain ? [[chain, validAddress]] : undefined
 
     if (isAllowed) {
-      execute([poolId, [], [[validAddress, { TrancheInvestor: [trancheId, OneHundredYearsFromNow] }]]], { account })
+      execute([poolId, [], [[centAddress, { TrancheInvestor: [trancheId, SevenDaysFromNow, domains as any] }]]], {
+        account,
+      })
     } else {
-      execute([poolId, [[validAddress, { TrancheInvestor: [trancheId, SevenDaysFromNow] }]], []], { account })
+      execute([poolId, [[centAddress, { TrancheInvestor: [trancheId, OneHundredYearsFromNow, domains as any] }]], []], {
+        account,
+      })
     }
     setPendingTrancheId(trancheId)
   }
@@ -71,6 +94,21 @@ export const InvestorStatus: React.FC = () => {
             placeholder="Enter address..."
             clear={() => setAddress('')}
           />
+          {showLiquidityPoolsOptions && (
+            <Select
+              value={chain}
+              options={[
+                { value: '', label: 'Centrifuge' },
+                ...Object.keys(chains).map((chainId) => ({
+                  value: chainId,
+                  label: `${chainId} - ${getChainInfo(chains, Number(chainId)).name}`,
+                })),
+              ]}
+              onChange={(e) => {
+                setChain(e.target.value as any)
+              }}
+            />
+          )}
           {address && !validAddress ? (
             <Text variant="label2" color="statusCritical">
               <Shelf gap={1}>
@@ -97,7 +135,7 @@ export const InvestorStatus: React.FC = () => {
             ) : null)
           )}
         </Grid>
-        {pool?.tranches && validAddress && permissions && (
+        {pool?.tranches && centAddress && permissions && (
           <DataTable
             data={pool.tranches}
             columns={[
@@ -113,7 +151,7 @@ export const InvestorStatus: React.FC = () => {
               {
                 align: 'left',
                 header: 'Investment',
-                cell: (row: Token) => <InvestedCell address={validAddress} poolId={poolId} trancheId={row.id} />,
+                cell: (row: Token) => <InvestedCell address={centAddress} poolId={poolId} trancheId={row.id} />,
               },
               {
                 header: '',
diff --git a/centrifuge-app/src/pages/IssuerPool/Investors/LiquidityPools.tsx b/centrifuge-app/src/pages/IssuerPool/Investors/LiquidityPools.tsx
new file mode 100644
index 0000000000..b7d3e0d439
--- /dev/null
+++ b/centrifuge-app/src/pages/IssuerPool/Investors/LiquidityPools.tsx
@@ -0,0 +1,185 @@
+import {
+  ConnectionGuard,
+  useCentrifugeTransaction,
+  useGetExplorerUrl,
+  useGetNetworkName,
+  useNetworkName,
+} from '@centrifuge/centrifuge-react'
+import { Accordion, Button, IconExternalLink, Shelf, Stack, Text } from '@centrifuge/fabric'
+import React from 'react'
+import { useParams } from 'react-router'
+import { PageSection } from '../../../components/PageSection'
+import { AnchorTextLink } from '../../../components/TextLink'
+import { find } from '../../../utils/helpers'
+import { useEvmTransaction } from '../../../utils/tinlake/useEvmTransaction'
+import { Domain, useActiveDomains } from '../../../utils/useLiquidityPools'
+import { useSuitableAccounts } from '../../../utils/usePermissions'
+import { usePool } from '../../../utils/usePools'
+
+function getDomainStatus(domain: Domain) {
+  if (!domain.isActive) {
+    return 'inactive'
+  }
+  if (Object.values(domain.liquidityPools).every((t) => Object.values(t).every((p) => !!p))) {
+    return 'deployed'
+  }
+  return 'deploying'
+}
+
+export function LiquidityPools() {
+  const { pid: poolId } = useParams<{ pid: string }>()
+  const { data: domains, refetch } = useActiveDomains(poolId)
+  const getName = useGetNetworkName()
+
+  const titles = {
+    inactive: 'Not active',
+    deploying: 'Action needed',
+    deployed: 'Active',
+  }
+
+  return (
+    <PageSection
+      title="Connected blockchains"
+      subtitle="View liquidity on all blockchains that this pool is connected to, and enable investments on new blockchains."
+    >
+      <Accordion
+        items={
+          domains?.map((domain) => ({
+            title: (
+              <>
+                {getName(domain.chainId)} <Text fontWeight={400}>- {titles[getDomainStatus(domain)]}</Text>
+              </>
+            ),
+            body: <PoolDomain poolId={poolId} domain={domain} refetch={refetch} />,
+          })) ?? []
+        }
+      />
+    </PageSection>
+  )
+}
+
+function PoolDomain({ poolId, domain, refetch }: { poolId: string; domain: Domain; refetch: () => void }) {
+  const pool = usePool(poolId)
+  const getName = useGetNetworkName()
+  const explorer = useGetExplorerUrl(domain.chainId)
+
+  const status = getDomainStatus(domain)
+
+  return (
+    <Stack>
+      {status === 'inactive' ? (
+        <EnableButton poolId={poolId} domain={domain} />
+      ) : status === 'deploying' ? (
+        <ConnectionGuard networks={[domain.chainId]} body="Connect to the right network to continue" variant="plain">
+          {pool.tranches.map((t) => (
+            <React.Fragment key={t.id}>
+              {domain.undeployedTranches[t.id] && (
+                <DeployTrancheButton poolId={poolId} trancheId={t.id} domain={domain} onSuccess={refetch} />
+              )}
+              {domain.currencies.map((currency, i) => (
+                <React.Fragment key={i}>
+                  {domain.trancheTokens[t.id] && !domain.liquidityPools[t.id][currency.address] && (
+                    <DeployLPButton
+                      poolId={poolId}
+                      trancheId={t.id}
+                      domain={domain}
+                      currencyIndex={i}
+                      onSuccess={refetch}
+                    />
+                  )}
+                </React.Fragment>
+              ))}
+            </React.Fragment>
+          ))}
+        </ConnectionGuard>
+      ) : (
+        pool.tranches.map((tranche) => (
+          <AnchorTextLink href={explorer.address(domain.trancheTokens[tranche.id])}>
+            <Shelf gap={1}>
+              <span>
+                See {tranche.currency.name} token on {getName(domain.chainId)}
+              </span>
+              <IconExternalLink size="iconSmall" />
+            </Shelf>
+          </AnchorTextLink>
+        ))
+      )}
+    </Stack>
+  )
+}
+
+function DeployTrancheButton({
+  poolId,
+  trancheId,
+  domain,
+  onSuccess,
+}: {
+  poolId: string
+  trancheId: string
+  domain: Domain
+  onSuccess: () => void
+}) {
+  const pool = usePool(poolId)
+  const { execute, isLoading } = useEvmTransaction(`Deploy tranche`, (cent) => cent.liquidityPools.deployTranche, {
+    onSuccess,
+  })
+  const tranche = find(pool.tranches, (t) => t.id === trancheId)!
+
+  return (
+    <Button loading={isLoading} onClick={() => execute([domain.poolManager, poolId, trancheId])} small>
+      Deploy tranche: {tranche.currency.name}
+    </Button>
+  )
+}
+
+function DeployLPButton({
+  poolId,
+  trancheId,
+  currencyIndex,
+  domain,
+  onSuccess,
+}: {
+  poolId: string
+  trancheId: string
+  domain: Domain
+  currencyIndex: number
+  onSuccess: () => void
+}) {
+  const pool = usePool(poolId)
+
+  const { execute, isLoading } = useEvmTransaction(
+    `Deploy liquidity pool`,
+    (cent) => cent.liquidityPools.deployLiquidityPool,
+    { onSuccess }
+  )
+  const tranche = find(pool.tranches, (t) => t.id === trancheId)!
+
+  return (
+    <Button
+      loading={isLoading}
+      onClick={() => execute([domain.poolManager, poolId, trancheId, domain.currencies[currencyIndex].address])}
+      small
+    >
+      Deploy tranche/currency liquidity pool: {tranche.currency.name} / {domain.currencies[currencyIndex].name}
+    </Button>
+  )
+}
+
+function EnableButton({ poolId, domain }: { poolId: string; domain: Domain }) {
+  const [account] = useSuitableAccounts({ poolId, poolRole: ['PoolAdmin'] })
+  const name = useNetworkName(domain.chainId)
+  const { execute, isLoading } = useCentrifugeTransaction(
+    `Enable ${name}`,
+    (cent) => cent.liquidityPools.enablePoolOnDomain
+  )
+
+  const currenciesToAdd = domain.currencies
+    .filter((cur) => domain.currencyNeedsAdding[cur.address])
+    .map((cur) => cur.key)
+
+  return (
+    <Button loading={isLoading} onClick={() => execute([poolId, domain.chainId, currenciesToAdd], { account })} small>
+      Enable
+    </Button>
+  )
+}
diff --git a/centrifuge-app/src/pages/IssuerPool/Investors/index.tsx b/centrifuge-app/src/pages/IssuerPool/Investors/index.tsx
index 0573531a1f..bf1bc96549 100644
--- a/centrifuge-app/src/pages/IssuerPool/Investors/index.tsx
+++ b/centrifuge-app/src/pages/IssuerPool/Investors/index.tsx
@@ -6,6 +6,7 @@ import { PendingMultisigs } from '../../../components/PendingMultisigs'
 import { useSuitableAccounts } from '../../../utils/usePermissions'
 import { IssuerPoolHeader } from '../Header'
 import { InvestorStatus } from './InvestorStatus'
+import { LiquidityPools } from './LiquidityPools'
 import { OnboardingSettings } from './OnboardingSettings'
 
 export function IssuerPoolInvestorsPage() {
@@ -28,6 +29,7 @@ function IssuerPoolInvestors() {
   return (
     <>
       {canEditInvestors && <InvestorStatus />}
+      {isPoolAdmin && <LiquidityPools />}
       {isPoolAdmin && <OnboardingSettings />}
     </>
   )
diff --git a/centrifuge-app/src/pages/Pool/Overview/index.tsx b/centrifuge-app/src/pages/Pool/Overview/index.tsx
index d7f8f5f8e3..bdabd3700e 100644
--- a/centrifuge-app/src/pages/Pool/Overview/index.tsx
+++ b/centrifuge-app/src/pages/Pool/Overview/index.tsx
@@ -1,4 +1,4 @@
-import { Network, useWallet } from '@centrifuge/centrifuge-react'
+import { useWallet } from '@centrifuge/centrifuge-react'
 import { Button, Shelf, Stack, Text, TextWithPlaceholder } from '@centrifuge/fabric'
 import * as React from 'react'
 import { useLocation, useParams } from 'react-router'
@@ -13,7 +13,6 @@ import { PageWithSideBar } from '../../../components/PageWithSideBar'
 import { PoolToken } from '../../../components/PoolToken'
 import { Spinner } from '../../../components/Spinner'
 import { Tooltips } from '../../../components/Tooltips'
-import { ethConfig } from '../../../config'
 import { formatDate, getAge } from '../../../utils/date'
 import { Dec } from '../../../utils/Decimal'
 import { formatBalance, formatBalanceAbbreviated, formatPercentage } from '../../../utils/formatting'
@@ -63,19 +62,8 @@ export function PoolDetailSideBar({
   investRef?: ActionsRef
 }) {
   const { pid: poolId } = useParams<{ pid: string }>()
-  const isTinlakePool = poolId.startsWith('0x')
-  const tinlakeNetworks = [ethConfig.network === 'goerli' ? 5 : 1] as Network[]
-  // TODO: fetch supported networks from centrifuge chain
-  const centrifugeNetworks = ['centrifuge'] as Network[]
-
   return (
-    <InvestRedeem
-      poolId={poolId}
-      trancheId={selectedToken}
-      onSetTrancheId={setSelectedToken}
-      networks={isTinlakePool ? tinlakeNetworks : centrifugeNetworks}
-      actionsRef={investRef}
-    />
+    <InvestRedeem poolId={poolId} trancheId={selectedToken} onSetTrancheId={setSelectedToken} actionsRef={investRef} />
   )
 }
 
diff --git a/centrifuge-app/src/pages/Pool/index.tsx b/centrifuge-app/src/pages/Pool/index.tsx
index deb7abeabb..5484d6b7c9 100644
--- a/centrifuge-app/src/pages/Pool/index.tsx
+++ b/centrifuge-app/src/pages/Pool/index.tsx
@@ -1,26 +1,12 @@
-import { useWallet } from '@centrifuge/centrifuge-react'
 import * as React from 'react'
-import { Route, Switch, useParams, useRouteMatch } from 'react-router'
-import { ethConfig } from '../../config'
+import { Route, Switch, useRouteMatch } from 'react-router'
 import { PoolDetailAssetsTab } from './Assets'
 import { PoolDetailLiquidityTab } from './Liquidity'
 import { PoolDetailOverviewTab } from './Overview'
 import { PoolDetailReportingTab } from './Reporting'
 
 export default function PoolDetailPage() {
-  const { pid } = useParams<{ pid: string }>()
-  const isTinlakePool = pid.startsWith('0x')
-  const { setScopedNetworks } = useWallet()
   const { path } = useRouteMatch()
-
-  React.useEffect(() => {
-    setScopedNetworks(isTinlakePool ? [ethConfig.network === 'goerli' ? 5 : 1] : ['centrifuge'])
-
-    return () => setScopedNetworks(null)
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [])
-
   return (
     <Switch>
       <Route path={`${path}/reporting`} component={PoolDetailReportingTab} />
diff --git a/centrifuge-app/src/pages/Swaps.tsx b/centrifuge-app/src/pages/Swaps.tsx
new file mode 100644
index 0000000000..6af2528592
--- /dev/null
+++ b/centrifuge-app/src/pages/Swaps.tsx
@@ -0,0 +1,12 @@
+import { LayoutBase, LayoutMain } from '../components/LayoutBase'
+import { Orders } from '../components/Swaps/Orders'
+
+export function SwapsPage() {
+  return (
+    <LayoutBase>
+      <LayoutMain title="Open swap orders">
+        <Orders />
+      </LayoutMain>
+    </LayoutBase>
+  )
+}
diff --git a/centrifuge-app/src/utils/tinlake/useEvmTransaction.ts b/centrifuge-app/src/utils/tinlake/useEvmTransaction.ts
index c75de85be6..8f2330b588 100644
--- a/centrifuge-app/src/utils/tinlake/useEvmTransaction.ts
+++ b/centrifuge-app/src/utils/tinlake/useEvmTransaction.ts
@@ -16,7 +16,7 @@ export function useEvmTransaction<T extends Array<any>>(
   transactionCallback: (
     centrifuge: Centrifuge
   ) => (args: T, options?: TransactionRequest) => Observable<TransactionResponse>,
-  options: { onSuccess?: (args: T, result: any) => void; onError?: (error: any) => void } = {}
+  options: { onSuccess?: (args: T, result: any) => void; onError?: (error: any) => void; chainId?: number } = {}
 ) {
   const { addOrUpdateTransaction, updateTransaction } = useTransactions()
   const { showWallets, evm, walletDialog } = useWallet()
@@ -64,7 +64,7 @@ export function useEvmTransaction<T extends Array<any>>(
 
     if (!selectedAddress || !provider) {
       pendingTransaction.current = { id, args, options }
-      showWallets(1)
+      showWallets(chainId ?? 1)
     } else {
       doTransaction(id, args, options)
     }
diff --git a/centrifuge-app/src/utils/useAddress.ts b/centrifuge-app/src/utils/useAddress.ts
index a42f811866..c77dc573b8 100644
--- a/centrifuge-app/src/utils/useAddress.ts
+++ b/centrifuge-app/src/utils/useAddress.ts
@@ -3,11 +3,10 @@ import { useDebugFlags } from '../components/DebugFlags'
 
 export function useAddress(typeOverride?: 'substrate' | 'evm') {
   const { address: debugSubstrateAddress, evmAddress: debugEvmAddress } = useDebugFlags()
-  const { connectedType } = useWallet()
   const address = useWalletAddress(typeOverride)
   const { isEvmOnSubstrate } = useWallet()
   const debugAddress =
-    typeOverride === 'evm' || (connectedType === 'evm' && !isEvmOnSubstrate) ? debugEvmAddress : debugSubstrateAddress
+    typeOverride === 'evm' || (!typeOverride && !isEvmOnSubstrate) ? debugEvmAddress : debugSubstrateAddress
 
   return (debugAddress as string) || address
 }
diff --git a/centrifuge-app/src/utils/useLiquidityPools.ts b/centrifuge-app/src/utils/useLiquidityPools.ts
new file mode 100644
index 0000000000..cb23db97a7
--- /dev/null
+++ b/centrifuge-app/src/utils/useLiquidityPools.ts
@@ -0,0 +1,136 @@
+import Centrifuge from '@centrifuge/centrifuge-js'
+import { useCentrifuge, useCentrifugeQuery, useWallet } from '@centrifuge/centrifuge-react'
+import { useQuery } from 'react-query'
+
+export function useDomainRouters(suspense?: boolean) {
+  const [data] = useCentrifugeQuery(['domainRouters'], (cent) => cent.liquidityPools.getDomainRouters(), { suspense })
+
+  return data
+}
+
+export type Domain = (ReturnType<Centrifuge['liquidityPools']['getPool']> extends Promise<infer T> ? T : never) & {
+  chainId: number
+  managerAddress: string
+}
+
+export function useActiveDomains(poolId: string, suspense?: boolean) {
+  const {
+    evm: { getProvider },
+  } = useWallet()
+  const cent = useCentrifuge()
+  const routers = useDomainRouters(suspense)
+  const query = useQuery(
+    ['activeDomains', poolId, routers?.length],
+    async () => {
+      const results = await Promise.allSettled(
+        routers!.map(async (r) => {
+          const rpcProvider = getProvider(r.chainId)
+          const manager = await cent.liquidityPools.getManagerFromRouter([r.router], {
+            rpcProvider,
+          })
+          const pool = await cent.liquidityPools.getPool([r.chainId, manager, poolId], { rpcProvider })
+          return [manager, pool] as const
+        })
+      )
+      return results
+        .map((result, i) => {
+          if (result.status === 'rejected') {
+            console.error(result.reason)
+            return null as never
+          }
+          const [manager, pool] = result.value
+          const router = routers![i]
+          const domain: Domain = {
+            ...pool,
+            chainId: router.chainId,
+            managerAddress: manager,
+          }
+          return domain
+        })
+        .filter(Boolean)
+    },
+    {
+      enabled: !!routers?.length && !poolId.startsWith('0x'),
+      staleTime: Infinity,
+      suspense,
+    }
+  )
+
+  return query
+}
+
+export function useLiquidityPools(poolId: string, trancheId: string) {
+  const {
+    evm: { chainId, getProvider },
+  } = useWallet()
+  const cent = useCentrifuge()
+  const { data: domains } = useActiveDomains(poolId)
+  const managerAddress = domains?.find((d) => d.chainId === chainId)?.managerAddress
+
+  const query = useQuery(
+    ['lps', poolId, trancheId, chainId],
+    () =>
+      cent.liquidityPools.getLiquidityPools([managerAddress!, poolId, trancheId, chainId!], {
+        rpcProvider: getProvider(chainId!),
+      }),
+    {
+      enabled: !!managerAddress,
+      staleTime: Infinity,
+    }
+  )
+
+  return query
+}
+
+export function useLPEvents(poolId: string, trancheId: string, lpAddress?: string) {
+  const {
+    evm: { chainId, getProvider, selectedAddress },
+  } = useWallet()
+  const cent = useCentrifuge()
+  const { data: lps } = useLiquidityPools(poolId, trancheId)
+  const lp = lps?.find((l) => l.lpAddress === lpAddress)
+
+  const query = useQuery(
+    ['lpDepositedEvents', chainId, lp?.lpAddress, selectedAddress],
+    () =>
+      cent.liquidityPools.getRecentLPEvents([lp!.lpAddress, selectedAddress!], {
+        rpcProvider: getProvider(chainId!),
+      }),
+
+    {
+      enabled: !!lp && !!selectedAddress,
+    }
+  )
+  return query
+}
+
+export function useLiquidityPoolInvestment(poolId: string, trancheId: string, lpIndex?: number) {
+  const {
+    evm: { chainId, getProvider, selectedAddress },
+  } = useWallet()
+  const cent = useCentrifuge()
+  const { data: domains } = useActiveDomains(poolId)
+  const managerAddress = domains?.find((d) => d.chainId === chainId)?.managerAddress
+
+  const { data: lps } = useLiquidityPools(poolId, trancheId)
+  const lp = lps?.[lpIndex ?? 0]
+
+  const query = useQuery(
+    ['lpInvestment', chainId, lp?.lpAddress, selectedAddress],
+    async () => ({
+      ...(await cent.liquidityPools.getLiquidityPoolInvestment(
+        [selectedAddress!, managerAddress!, lp!.lpAddress, lp!.currencyAddress],
+        {
+          rpcProvider: getProvider(chainId!),
+        }
+      )),
+      ...lp!,
+    }),
+
+    {
+      enabled: !!lp && !!selectedAddress,
+    }
+  )
+
+  return query
+}
diff --git a/centrifuge-app/src/utils/usePermissions.ts b/centrifuge-app/src/utils/usePermissions.tsx
similarity index 90%
rename from centrifuge-app/src/utils/usePermissions.ts
rename to centrifuge-app/src/utils/usePermissions.tsx
index f961aa7eba..2c450f5e53 100644
--- a/centrifuge-app/src/utils/usePermissions.ts
+++ b/centrifuge-app/src/utils/usePermissions.tsx
@@ -6,8 +6,15 @@ import {
   isSameAddress,
   PoolRoles,
 } from '@centrifuge/centrifuge-js'
-import { useCentrifugeQuery, useWallet } from '@centrifuge/centrifuge-react'
-import { useMemo } from 'react'
+import {
+  CombinedSubstrateAccount,
+  truncateAddress,
+  useCentrifugeQuery,
+  useCentrifugeUtils,
+  useWallet,
+} from '@centrifuge/centrifuge-react'
+import { Select } from '@centrifuge/fabric'
+import * as React from 'react'
 import { combineLatest, filter, map, repeatWhen, switchMap } from 'rxjs'
 import { diffPermissions } from '../pages/IssuerPool/Configuration/Admins'
 import { useCollections } from './useCollections'
@@ -106,6 +113,28 @@ type SuitableConfig = {
   proxyType?: string[] | ((accountProxyTypes: string[]) => boolean)
 }
 
+export function useSuitableAccountPicker(config: SuitableConfig) {
+  const accounts = useSuitableAccounts(config)
+  const [account, setAccount] = React.useState<CombinedSubstrateAccount | undefined>(accounts[0])
+  const utils = useCentrifugeUtils()
+
+  const pickerElement =
+    accounts?.length > 1 ? (
+      <Select
+        label="Select acting account"
+        options={accounts.map((acc, i) => ({
+          label: `${truncateAddress(utils.formatAddress(acc.actingAddress))}`,
+          value: i.toString(),
+        }))}
+        onChange={(e) => {
+          setAccount(accounts[Number(e.target.value)])
+        }}
+      />
+    ) : null
+
+  return [account, pickerElement, accounts] as const
+}
+
 export function useSuitableAccounts(config: SuitableConfig) {
   const { actingAddress, poolId, poolRole, proxyType } = config
   const {
@@ -261,7 +290,7 @@ export function usePoolAccess(poolId: string) {
 
   return {
     admin,
-    multisig: useMemo(
+    multisig: React.useMemo(
       () => (metadata?.adminMultisig && computeMultisig(metadata.adminMultisig)) || null,
       [metadata?.adminMultisig]
     ),
@@ -269,7 +298,7 @@ export function usePoolAccess(poolId: string) {
     missingPermissions: [...missingAdminPermissions, ...missingManagerPermissions],
     missingAdminPermissions,
     missingManagerPermissions,
-    assetOriginators: useMemo(
+    assetOriginators: React.useMemo(
       () =>
         aoProxies.map((addr, i) => ({
           address: addr,
diff --git a/centrifuge-js/package.json b/centrifuge-js/package.json
index 003cf3e85f..2904498233 100644
--- a/centrifuge-js/package.json
+++ b/centrifuge-js/package.json
@@ -28,6 +28,8 @@
     "lint": "eslint src/**/*.ts"
   },
   "dependencies": {
+    "@ethersproject/abi": "^5.6.0",
+    "@ethersproject/bignumber": "^5.7.0",
     "@ethersproject/contracts": "^5.6.0",
     "@ethersproject/providers": "^5.6.0",
     "@polkadot/api": "~10.3.4",
@@ -36,12 +38,15 @@
     "@stablelib/blake2b": "^1.0.1",
     "clp-wasm": "^0.0.15",
     "decimal.js-light": "^2.5.1",
+    "eth-permit": "^0.2.3",
     "isomorphic-fetch": "^3.0.0",
-    "jw3t": "^1.0.8"
+    "jw3t": "^1.0.8",
+    "lodash": "^4.17.21"
   },
   "devDependencies": {
     "@types/isomorphic-fetch": "^0.0.36",
     "@types/jest": "^27.0.3",
+    "@types/lodash": "^4",
     "@types/node": "^16.11.12",
     "@typescript-eslint/eslint-plugin": "^4.32.0",
     "@typescript-eslint/parser": "^4.32.0",
diff --git a/centrifuge-js/src/Centrifuge.ts b/centrifuge-js/src/Centrifuge.ts
index eb50b018ef..58c04f0059 100644
--- a/centrifuge-js/src/Centrifuge.ts
+++ b/centrifuge-js/src/Centrifuge.ts
@@ -3,6 +3,7 @@ import { AddressOrPair } from '@polkadot/api/types'
 import { Signer } from '@polkadot/types/types'
 import { CentrifugeBase, UserProvidedConfig } from './CentrifugeBase'
 import { getAuthModule } from './modules/auth'
+import { getLiquidityPoolsModule } from './modules/liquidityPools'
 import { getMetadataModule } from './modules/metadata'
 import { getMultisigModule } from './modules/multisig'
 import { getNftsModule } from './modules/nfts'
@@ -18,6 +19,7 @@ import { getUtilsModule } from './modules/utils'
 export class Centrifuge extends CentrifugeBase {
   nfts = getNftsModule(this)
   pools = getPoolsModule(this)
+  liquidityPools = getLiquidityPoolsModule(this)
   utils = getUtilsModule(this)
   proxies = getProxiesModule(this)
   metadata = getMetadataModule(this)
diff --git a/centrifuge-js/src/CentrifugeBase.ts b/centrifuge-js/src/CentrifugeBase.ts
index 1e631e9da6..9691a27ad8 100644
--- a/centrifuge-js/src/CentrifugeBase.ts
+++ b/centrifuge-js/src/CentrifugeBase.ts
@@ -197,6 +197,23 @@ const parachainRuntimeApi: DefinitionsCall = {
       version: 1,
     },
   ],
+  AccountConversionApi: [
+    {
+      methods: {
+        conversion_of: {
+          description: 'Get converted address',
+          params: [
+            {
+              name: 'location',
+              type: 'XcmV3MultiLocation',
+            },
+          ],
+          type: 'Option<AccountId32>',
+        },
+      },
+      version: 1,
+    },
+  ],
 }
 
 type Events = ISubmittableResult['events']
@@ -568,13 +585,18 @@ export class CentrifugeBase {
     }
   }
 
-  getSignerAddress(type?: 'substrate') {
+  getSignerAddress(type?: 'substrate' | 'evm') {
     const { signingAddress, evmSigningAddress } = this.config
 
+    if (type === 'evm') {
+      if (!evmSigningAddress) throw new Error('no signer set')
+      return evmSigningAddress
+    }
     if (!signingAddress) {
-      if (evmSigningAddress && this.config.substrateEvmChainId) {
+      if (evmSigningAddress) {
+        if (type === 'substrate' && !this.config.substrateEvmChainId) throw new Error('no signer set')
         return type === 'substrate'
-          ? evmToSubstrateAddress(evmSigningAddress, this.config.substrateEvmChainId)
+          ? evmToSubstrateAddress(evmSigningAddress, this.config.substrateEvmChainId!)
           : evmSigningAddress
       }
       throw new Error('no signer set')
diff --git a/centrifuge-js/src/index.ts b/centrifuge-js/src/index.ts
index 594b1daca8..c73744beba 100644
--- a/centrifuge-js/src/index.ts
+++ b/centrifuge-js/src/index.ts
@@ -1,5 +1,6 @@
 import { Centrifuge } from './Centrifuge'
 export type { UserProvidedConfig } from './CentrifugeBase'
+export * from './modules/liquidityPools'
 export * from './modules/multisig'
 export type { Collection, NFT } from './modules/nfts'
 export * from './modules/pools'
diff --git a/centrifuge-js/src/modules/liquidityPools.ts b/centrifuge-js/src/modules/liquidityPools.ts
new file mode 100644
index 0000000000..bf870398e8
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools.ts
@@ -0,0 +1,569 @@
+import { BigNumber } from '@ethersproject/bignumber'
+import { Contract, ContractInterface } from '@ethersproject/contracts'
+import type { JsonRpcProvider, TransactionRequest, TransactionResponse } from '@ethersproject/providers'
+import BN from 'bn.js'
+import { signERC2612Permit } from 'eth-permit'
+import { combineLatestWith, firstValueFrom, from, map, startWith, switchMap } from 'rxjs'
+import { Centrifuge } from '../Centrifuge'
+import { TransactionOptions } from '../types'
+import { CurrencyBalance, TokenBalance } from '../utils/BN'
+import { Call, multicall } from '../utils/evmMulticall'
+import * as ABI from './liquidityPools/abi'
+import { CurrencyKey, CurrencyMetadata } from './pools'
+
+const maxUint256 = '115792089237316195423570985008687907853269984665640564039457584007913129639935'
+const PERMIT_TYPEHASH = '0x6e71edae12b1b97f4d1f60370fef10105fa2faae0126114a169c64845d6126c9'
+const NULL_ADDRESS = '0x0000000000000000000000000000000000000000'
+
+type EvmQueryOptions = {
+  rpcProvider?: JsonRpcProvider
+}
+
+export type Permit = {
+  deadline: number | string
+  r: string
+  s: string
+  v: number
+}
+const toCurrencyBalance = (decimals: number) => (val: BigNumber) => new CurrencyBalance(val.toString(), decimals)
+const toTokenBalance = (decimals: number) => (val: BigNumber) => new TokenBalance(val.toString(), decimals)
+
+export function getLiquidityPoolsModule(inst: Centrifuge) {
+  function contract(contractAddress: string, abi: ContractInterface, options?: EvmQueryOptions) {
+    const provider = inst.config.evmSigner ?? options?.rpcProvider
+    if (!provider) throw new Error('Needs provider')
+    return new Contract(contractAddress, abi, provider)
+  }
+
+  function pending(txPromise: Promise<TransactionResponse>) {
+    return from(txPromise).pipe(
+      switchMap((response) => {
+        return from(response.wait()).pipe(
+          map(() => response),
+          startWith(response)
+        )
+      })
+    )
+  }
+
+  function getProvider(options?: EvmQueryOptions) {
+    return options?.rpcProvider ?? inst.config.evmSigner?.provider
+  }
+
+  function enablePoolOnDomain(
+    args: [poolId: string, chainId: number, currencyKeysToAdd: CurrencyKey[]],
+    options?: TransactionOptions
+  ) {
+    const [poolId, chainId, currencyKeysToAdd] = args
+    const $api = inst.getApi()
+
+    return getDomainCurrencies([chainId]).pipe(
+      combineLatestWith($api),
+      switchMap(([currencies, api]) => {
+        return api.query.poolSystem.pool(poolId).pipe(
+          switchMap((rawPool) => {
+            const pool = rawPool.toPrimitive() as any
+            const tx = api.tx.utility.batchAll([
+              ...(currencyKeysToAdd?.map((key) => api.tx.liquidityPools.addCurrency(key)) ?? []),
+              api.tx.liquidityPools.addPool(poolId, { EVM: chainId }),
+              ...pool.tranches.ids.flatMap((trancheId: string) => [
+                api.tx.liquidityPools.addTranche(poolId, trancheId, { EVM: chainId }),
+                // Ensure the domain currencies are enabled
+                // Using a batch, because theoretically they could have been enabled already for a different domain
+                api.tx.utility.batch(
+                  currencies.map((cur) => api.tx.liquidityPools.allowInvestmentCurrency(poolId, trancheId, cur.key))
+                ),
+              ]),
+            ])
+            return inst.wrapSignAndSend(api, tx, options)
+          })
+        )
+      })
+    )
+  }
+
+  function deployTranche(
+    args: [poolManager: string, poolId: string, trancheId: string],
+    options: TransactionRequest = {}
+  ) {
+    const [poolManager, poolId, trancheId] = args
+    return pending(
+      contract(poolManager, ABI.PoolManager).deployTranche(poolId, trancheId, { ...options, gasLimit: 5000000 })
+    )
+  }
+
+  function deployLiquidityPool(
+    args: [poolManager: string, poolId: string, trancheId: string, currencyAddress: string],
+    options: TransactionRequest = {}
+  ) {
+    const [poolManager, poolId, trancheId, currencyAddress] = args
+    return pending(
+      contract(poolManager, ABI.PoolManager).deployLiquidityPool(poolId, trancheId, currencyAddress, {
+        ...options,
+        gasLimit: 5000000,
+      })
+    )
+  }
+
+  function approveForCurrency(args: [address: string, currencyAddress: string], options: TransactionRequest = {}) {
+    const [address, currencyAddress] = args
+    return pending(contract(currencyAddress, ABI.Currency).approve(address, maxUint256, options))
+  }
+
+  async function signPermit(args: [spender: string, currencyAddress: string, amount: BN]) {
+    const [spender, currencyAddress, amount] = args
+    if (!inst.config.evmSigner) throw new Error('EVM signer not set')
+    const chainId = await inst.config.evmSigner.getChainId()
+    const domain = { name: 'Centrifuge', version: '1', chainId, verifyingContract: currencyAddress }
+    const permit = await signERC2612Permit(
+      inst.config.evmSigner,
+      domain,
+      inst.getSignerAddress('evm'),
+      spender,
+      amount.toString()
+    )
+    return permit as Permit
+  }
+
+  function increaseInvestOrder(args: [lpAddress: string, order: BN], options: TransactionRequest = {}) {
+    const [lpAddress, order] = args
+    const user = inst.getSignerAddress('evm')
+    return pending(
+      contract(lpAddress, ABI.LiquidityPool).requestDeposit(order.toString(), user, { ...options, gasLimit: 300000 })
+    )
+  }
+
+  function increaseRedeemOrder(args: [lpAddress: string, order: BN], options: TransactionRequest = {}) {
+    const [lpAddress, order] = args
+    const user = inst.getSignerAddress('evm')
+    return pending(
+      contract(lpAddress, ABI.LiquidityPool).requestRedeem(order.toString(), user, user, {
+        ...options,
+        gasLimit: 300000,
+      })
+    )
+  }
+
+  function increaseInvestOrderWithPermit(
+    args: [lpAddress: string, order: BN, permit: Permit],
+    options: TransactionRequest = {}
+  ) {
+    const [lpAddress, order, { deadline, r, s, v }] = args
+    return pending(
+      contract(lpAddress, ABI.LiquidityPool).requestDepositWithPermit(order.toString(), deadline, v, r, s, {
+        ...options,
+        gasLimit: 300000,
+      })
+    )
+  }
+
+  function cancelRedeemOrder(args: [lpAddress: string], options: TransactionRequest = {}) {
+    const [lpAddress] = args
+    return pending(contract(lpAddress, ABI.LiquidityPool).cancelRedeemRequest(options))
+  }
+
+  function cancelInvestOrder(args: [lpAddress: string], options: TransactionRequest = {}) {
+    const [lpAddress] = args
+    return pending(contract(lpAddress, ABI.LiquidityPool).cancelDepositRequest(options))
+  }
+
+  function mint(args: [lpAddress: string, mint: BN, receiver?: string], options: TransactionRequest = {}) {
+    const [lpAddress, mint, receiver] = args
+    const user = inst.getSignerAddress('evm')
+    return pending(
+      contract(lpAddress, ABI.LiquidityPool).mint(mint.toString(), receiver ?? user, {
+        ...options,
+        gasLimit: 200000,
+      })
+    )
+  }
+
+  function withdraw(args: [lpAddress: string, withdraw: BN, receiver?: string], options: TransactionRequest = {}) {
+    const [lpAddress, withdraw, receiver] = args
+    const user = inst.getSignerAddress('evm')
+    return pending(
+      contract(lpAddress, ABI.LiquidityPool).withdraw(withdraw.toString(), receiver ?? user, user, {
+        ...options,
+        gasLimit: 200000,
+      })
+    )
+  }
+
+  function getDomainRouters() {
+    return inst.getApi().pipe(
+      switchMap((api) => api.query.liquidityPoolsGateway.domainRouters.entries()),
+      map((rawRouters) => {
+        return rawRouters
+          .map(([rawKey, rawValue]) => {
+            const key = (rawKey.toHuman() as ['Centrifuge' | { EVM: string }])[0]
+            if (typeof key === 'string') return null
+            const value = rawValue.toPrimitive() as any
+            const chainId = Number(key.EVM.replace(/\D/g, ''))
+            const router = 'axelarXCM' in value ? value.axelarXCM.axelarTargetContract : ''
+            if (!router) return null
+
+            return {
+              chainId,
+              router,
+            }
+          })
+          .filter(Boolean) as { chainId: number; router: string }[]
+      })
+    )
+  }
+
+  async function getManagerFromRouter(args: [router: string], options?: EvmQueryOptions) {
+    const [router] = args
+    const gatewayAddress = await contract(router, ABI.Router, options).gateway()
+    const managerAddress = await contract(gatewayAddress, ABI.Gateway, options).investmentManager()
+    return managerAddress as string
+  }
+
+  async function getRecentLPEvents(args: [lpAddress: string, user: string], options?: EvmQueryOptions) {
+    const [lpAddress, user] = args
+    const blockNumber = await getProvider(options)!.getBlockNumber()
+    const cont = contract(lpAddress, ABI.LiquidityPool, options)
+    const depositFilter = cont.filters.DepositRequest(user)
+    const redeemFilter = cont.filters.RedeemRequest(user)
+    const cancelDepositFilter = cont.filters.CancelDepositRequest(user)
+    const cancelRedeemFilter = cont.filters.CancelRedeemRequest(user)
+    const events = await Promise.all([
+      cont.queryFilter(depositFilter, blockNumber - 300),
+      cont.queryFilter(redeemFilter, blockNumber - 300),
+      cont.queryFilter(cancelDepositFilter, blockNumber - 300),
+      cont.queryFilter(cancelRedeemFilter, blockNumber - 300),
+    ])
+    return events.flat()
+  }
+
+  async function getPool(
+    args: [chainId: number, investmentManager: string, poolId: string],
+    options?: EvmQueryOptions
+  ) {
+    const [chainId, investmentManager, poolId] = args
+
+    const trancheIds = await firstValueFrom(
+      inst.getApi().pipe(
+        switchMap((api) => api.query.poolSystem.pool(poolId)),
+        map((rawPool) => {
+          const pool = rawPool.toPrimitive() as any
+          return pool.tranches.ids as string[]
+        })
+      )
+    )
+
+    const currencies = await firstValueFrom(getDomainCurrencies([chainId]))
+
+    const poolManager = (await contract(investmentManager, ABI.InvestmentManager, options).poolManager()) as string
+
+    const poolData = await multicall<{
+      isActive: boolean
+      undeployedTranches: Record<string, boolean>
+      trancheTokens: Record<string, string>
+      liquidityPools: Record<string, Record<string, string | null>>
+      currencyNeedsAdding: Record<string, boolean>
+    }>(
+      [
+        ...trancheIds.flatMap(
+          (trancheId) =>
+            [
+              {
+                target: poolManager,
+                call: [
+                  'function undeployedTranches(uint64,bytes16) view returns (uint8,string,string)',
+                  poolId,
+                  trancheId,
+                ],
+                returns: [[`undeployedTranches[${trancheId}]`, (dec) => !!dec]],
+              },
+              {
+                target: poolManager,
+                call: ['function getTrancheToken(uint64,bytes16) view returns (address)', poolId, trancheId],
+                returns: [[`trancheTokens[${trancheId}]`, (addr) => (addr !== NULL_ADDRESS ? addr : null)]],
+              },
+              ...(currencies.flatMap((currency) => ({
+                target: poolManager,
+                call: [
+                  'function getLiquidityPool(uint64,bytes16,address) view returns (address)',
+                  poolId,
+                  trancheId,
+                  currency.address,
+                ],
+                returns: [
+                  [
+                    `liquidityPools[${trancheId}][${currency.address}]`,
+                    (addr) => (addr !== NULL_ADDRESS ? addr : null),
+                  ],
+                ],
+              })) as Call[]),
+            ] as Call[]
+        ),
+        {
+          target: poolManager,
+          call: ['function pools(uint64) view returns (uint256)', poolId],
+          returns: [['isActive', (createdAt: BigNumber) => !createdAt.isZero()]],
+        },
+        ...(currencies.flatMap((currency) => ({
+          target: poolManager,
+          call: ['function currencyAddressToId(address) view returns (uint128)', currency.address],
+          returns: [[`currencyNeedsAdding[${currency.address}]`, (id) => !id]],
+        })) as Call[]),
+      ],
+      {
+        rpcProvider: getProvider(options)!,
+      }
+    )
+
+    return { ...poolData, poolManager, currencies }
+  }
+
+  function getDomainCurrencies(args: [chainId: number]) {
+    const [chainId] = args
+    return inst.pools.getCurrencies().pipe(
+      map((currencies) => {
+        return currencies
+          .filter(
+            (cur) =>
+              getCurrencyChainId(cur) === chainId &&
+              !!getCurrencyEvmAddress(cur) &&
+              typeof cur.key === 'object' &&
+              'ForeignAsset' in cur.key
+          )
+          .map((cur) => ({ ...cur, address: getCurrencyEvmAddress(cur)! }))
+      })
+    )
+  }
+
+  async function getLiquidityPools(
+    args: [managerAddress: string, poolId: string, trancheId: string, chainId: number],
+    options?: EvmQueryOptions
+  ) {
+    const [managerAddress, poolId, trancheId, chainId] = args
+
+    const currencies = await firstValueFrom(getDomainCurrencies([chainId]))
+
+    const poolManager: string = await contract(managerAddress, ABI.InvestmentManager, options).poolManager()
+
+    if (!currencies?.length) return []
+
+    const lpData = await multicall<{ lps?: string[] }>(
+      [
+        ...currencies.map(
+          (currency, i) =>
+            ({
+              target: poolManager,
+              call: [
+                'function getLiquidityPool(uint64, bytes16, address) view returns (address)',
+                poolId,
+                trancheId,
+                currency.address,
+              ],
+              returns: [[`lps[${i}]`]],
+            } as Call)
+        ),
+      ],
+      {
+        rpcProvider: getProvider(options)!,
+      }
+    )
+
+    const lps = lpData.lps?.filter((lp) => lp !== NULL_ADDRESS)
+    if (!lps?.length) return []
+
+    const assetData = await multicall<{ assets?: string[]; share: string }>(
+      [
+        ...lps.map(
+          (lpAddress, i) =>
+            ({
+              target: lpAddress,
+              call: ['function asset() view returns (address)'],
+              returns: [[`assets[${i}]`]],
+            } as Call)
+        ),
+        {
+          target: lps[0],
+          call: ['function share() view returns (address)'],
+          returns: [['share']],
+        },
+      ],
+      {
+        rpcProvider: getProvider(options)!,
+      }
+    )
+
+    if (!assetData.assets?.length) return []
+
+    const currencyData = await multicall<{
+      currencies: { currencySymbol: string; currencyDecimals: number; currencySupportsPermit?: boolean }[]
+      trancheTokenSymbol: string
+      trancheTokenDecimals: number
+    }>(
+      [
+        ...assetData.assets.flatMap(
+          (assetAddress, i) =>
+            [
+              {
+                target: assetAddress,
+                call: ['function symbol() view returns (string)'],
+                returns: [[`currencies[${i}].currencySymbol`]],
+              },
+              {
+                target: assetAddress,
+                call: ['function decimals() view returns (uint8)'],
+                returns: [[`currencies[${i}].currencyDecimals`]],
+              },
+              // TODO: Enable again after testing that it works
+              {
+                target: assetAddress,
+                call: ['function PERMIT_TYPEHASH() view returns (bytes32)'],
+                returns: [
+                  [`currencies[${i}].currencySupportsPermit`, (typeHash: string) => typeHash === PERMIT_TYPEHASH],
+                ],
+                allowFailure: true,
+              },
+            ] as Call[]
+        ),
+        {
+          target: assetData.share,
+          call: ['function symbol() view returns (string)'],
+          returns: [['trancheTokenSymbol']],
+        },
+        {
+          target: assetData.share,
+          call: ['function decimals() view returns (uint8)'],
+          returns: [['trancheTokenDecimals']],
+        },
+      ],
+      {
+        rpcProvider: options?.rpcProvider ?? inst.config.evmSigner?.provider!,
+      }
+    )
+
+    const result = lps.map((addr, i) => ({
+      lpAddress: addr,
+      currencyAddress: assetData.assets![i],
+      managerAddress,
+      trancheTokenSymbol: currencyData.trancheTokenSymbol,
+      trancheTokenDecimals: currencyData.trancheTokenDecimals,
+      ...currencyData.currencies[i],
+    }))
+    return result
+  }
+
+  async function getLiquidityPoolInvestment(
+    args: [user: string, managerAddress: string, lpAddress: string, currencyAddress: string],
+    options?: EvmQueryOptions
+  ) {
+    const [user, manager, lp, currencyAddress] = args
+
+    const currency = await multicall<{ trancheDecimals: number; currencyDecimals: number; tokenAddress: string }>(
+      [
+        {
+          target: currencyAddress,
+          call: ['function decimals() view returns (uint8)'],
+          returns: [['currencyDecimals']],
+        },
+        {
+          target: lp,
+          call: ['function decimals() view returns (uint8)'],
+          returns: [['trancheDecimals']],
+        },
+        {
+          target: lp,
+          call: ['function share() view returns (address)'],
+          returns: [['tokenAddress']],
+        },
+      ],
+      {
+        rpcProvider: options?.rpcProvider ?? inst.config.evmSigner?.provider!,
+      }
+    )
+
+    const calls: Call[] = [
+      {
+        target: currency.tokenAddress,
+        call: ['function checkTransferRestriction(address, address, uint) view returns (bool)', NULL_ADDRESS, user, 0],
+        returns: [['isAllowedToInvest']],
+      },
+      {
+        target: lp,
+        call: ['function balanceOf(address) view returns (uint256)', user],
+        returns: [['tokenBalance', toTokenBalance(currency.trancheDecimals)]],
+      },
+      {
+        target: currencyAddress,
+        call: ['function balanceOf(address) view returns (uint256)', user],
+        returns: [['currencyBalance', toCurrencyBalance(currency.currencyDecimals)]],
+      },
+      {
+        target: currencyAddress,
+        call: ['function allowance(address, address) view returns (uint)', user, manager],
+        returns: [['lpCurrencyAllowance', toCurrencyBalance(currency.currencyDecimals)]],
+      },
+      {
+        target: manager,
+        call: [
+          'function investments(address, address) view returns (uint128, uint256, uint128, uint256, uint128, uint128, bool)',
+          lp,
+          user,
+        ],
+        returns: [
+          ['maxMint', toCurrencyBalance(currency.currencyDecimals)],
+          [],
+          ['maxWithdraw', toCurrencyBalance(currency.currencyDecimals)],
+          [],
+          ['pendingInvest', toCurrencyBalance(currency.currencyDecimals)],
+          ['pendingRedeem', toCurrencyBalance(currency.currencyDecimals)],
+          ['hasInvested'],
+        ],
+      },
+    ]
+
+    const pool = await multicall<{
+      isAllowedToInvest: boolean
+      hasInvested: boolean
+      tokenBalance: TokenBalance
+      maxMint: TokenBalance
+      currencyBalance: CurrencyBalance
+      maxWithdraw: CurrencyBalance
+      lpCurrencyAllowance: CurrencyBalance
+      managerTrancheTokenAllowance: CurrencyBalance
+      pendingInvest: CurrencyBalance
+      pendingRedeem: TokenBalance
+    }>(calls, {
+      rpcProvider: options?.rpcProvider ?? inst.config.evmSigner?.provider!,
+    })
+
+    return pool
+  }
+
+  return {
+    enablePoolOnDomain,
+    deployTranche,
+    deployLiquidityPool,
+    increaseInvestOrder,
+    increaseRedeemOrder,
+    increaseInvestOrderWithPermit,
+    cancelInvestOrder,
+    cancelRedeemOrder,
+    mint,
+    withdraw,
+    approveForCurrency,
+    signPermit,
+    getDomainRouters,
+    getManagerFromRouter,
+    getPool,
+    getLiquidityPools,
+    getLiquidityPoolInvestment,
+    getRecentLPEvents,
+  }
+}
+
+export function getCurrencyChainId(currency: CurrencyMetadata) {
+  const chainId = currency.location?.v3?.interior?.x3?.[1]?.globalConsensus?.ethereum?.chainId
+  return chainId != null ? Number(chainId) : undefined
+}
+
+export function getCurrencyEvmAddress(currency: CurrencyMetadata) {
+  return currency.location?.v3?.interior?.x3?.[2]?.accountKey20?.key as string | undefined
+}
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/Currency.abi.json b/centrifuge-js/src/modules/liquidityPools/abi/Currency.abi.json
new file mode 100644
index 0000000000..42055b5c21
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/Currency.abi.json
@@ -0,0 +1 @@
+["function approve(address, uint) external returns (bool)"]
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/Gateway.abi.json b/centrifuge-js/src/modules/liquidityPools/abi/Gateway.abi.json
new file mode 100644
index 0000000000..4dac24fd35
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/Gateway.abi.json
@@ -0,0 +1 @@
+["function investmentManager() view returns (address)"]
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/InvestmentManager.abi.json b/centrifuge-js/src/modules/liquidityPools/abi/InvestmentManager.abi.json
new file mode 100644
index 0000000000..06adf46e1a
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/InvestmentManager.abi.json
@@ -0,0 +1 @@
+["function poolManager() view returns (address)"]
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/LiquidityPool.abi.json b/centrifuge-js/src/modules/liquidityPools/abi/LiquidityPool.abi.json
new file mode 100644
index 0000000000..10aebd804f
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/LiquidityPool.abi.json
@@ -0,0 +1,13 @@
+[
+  "event DepositRequest(address indexed, address, uint256)",
+  "event RedeemRequest(address indexed, address, address, uint256)",
+  "event CancelDepositRequest(address indexed)",
+  "event CancelRedeemRequest(address indexed)",
+  "function mint(uint256, address) public returns (uint256)",
+  "function withdraw(uint256, address, address) public returns (uint256)",
+  "function requestDeposit(uint256, address) public",
+  "function requestRedeem(uint256, address, address) public",
+  "function requestDepositWithPermit(uint256, uint256, uint8, bytes32, bytes32) public",
+  "function cancelDepositRequest() public",
+  "function cancelRedeemRequest() public"
+]
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/Permit.abi.json b/centrifuge-js/src/modules/liquidityPools/abi/Permit.abi.json
new file mode 100644
index 0000000000..f78c411ab0
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/Permit.abi.json
@@ -0,0 +1 @@
+["function PERMIT_TYPEHASH() view returns (bytes32)"]
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/PoolManager.abi.json b/centrifuge-js/src/modules/liquidityPools/abi/PoolManager.abi.json
new file mode 100644
index 0000000000..89825a3dcf
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/PoolManager.abi.json
@@ -0,0 +1,5 @@
+[
+  "function pools(uint64) view returns (uint64, uint256)",
+  "function deployTranche(uint64, bytes16) public",
+  "function deployLiquidityPool(uint64, bytes16, address) public"
+]
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/Router.abi.json b/centrifuge-js/src/modules/liquidityPools/abi/Router.abi.json
new file mode 100644
index 0000000000..e43227e052
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/Router.abi.json
@@ -0,0 +1 @@
+["function gateway() view returns (address)"]
diff --git a/centrifuge-js/src/modules/liquidityPools/abi/index.ts b/centrifuge-js/src/modules/liquidityPools/abi/index.ts
new file mode 100644
index 0000000000..d40d66ef3b
--- /dev/null
+++ b/centrifuge-js/src/modules/liquidityPools/abi/index.ts
@@ -0,0 +1,9 @@
+import Currency from './Currency.abi.json'
+import Gateway from './Gateway.abi.json'
+import InvestmentManager from './InvestmentManager.abi.json'
+import LiquidityPool from './LiquidityPool.abi.json'
+import Permit from './Permit.abi.json'
+import PoolManager from './PoolManager.abi.json'
+import Router from './Router.abi.json'
+
+export { LiquidityPool, Currency, InvestmentManager, PoolManager, Router, Gateway, Permit }
diff --git a/centrifuge-js/src/modules/pools.ts b/centrifuge-js/src/modules/pools.ts
index 8a277054c1..3f7fa0b370 100644
--- a/centrifuge-js/src/modules/pools.ts
+++ b/centrifuge-js/src/modules/pools.ts
@@ -41,7 +41,15 @@ type AdminRole =
 
 type CurrencyRole = 'PermissionedAssetManager' | 'PermissionedAssetIssuer'
 
-export type PoolRoleInput = AdminRole | { TrancheInvestor: [trancheId: string, permissionedTill: number] }
+export type PoolRoleInput =
+  | AdminRole
+  | {
+      TrancheInvestor: [
+        trancheId: string,
+        permissionedTill: number,
+        evmDomains?: [chainId: number, domainAddress: string][]
+      ]
+    }
 
 export type CurrencyKey = string | { ForeignAsset: string } | { Tranche: [string, string] }
 
@@ -52,6 +60,8 @@ export type CurrencyMetadata = {
   symbol: string
   isPoolCurrency: boolean
   isPermissioned: boolean
+  additional?: any
+  location?: any
 }
 
 const AdminRoleBits = {
@@ -881,22 +891,34 @@ export function getPoolsModule(inst: Centrifuge) {
     return $api.pipe(
       switchMap((api) => {
         const submittable = api.tx.utility.batchAll([
-          ...add.map(([addr, role]) =>
-            api.tx.permissions.add(
-              { PoolRole: typeof role === 'string' ? 'PoolAdmin' : 'InvestorAdmin' },
-              addr,
-              { Pool: poolId },
-              { PoolRole: role }
-            )
-          ),
-          ...sortedRemove.map(([addr, role]) =>
-            api.tx.permissions.remove(
-              { PoolRole: typeof role === 'string' ? 'PoolAdmin' : 'InvestorAdmin' },
-              addr,
-              { Pool: poolId },
-              { PoolRole: role }
-            )
-          ),
+          ...add.flatMap(([addr, role]) => {
+            const [trancheId, validTill, evmDomains = []] = typeof role === 'string' ? [] : role.TrancheInvestor
+            return [
+              api.tx.permissions.add(
+                { PoolRole: typeof role === 'string' ? 'PoolAdmin' : 'InvestorAdmin' },
+                addr,
+                { Pool: poolId },
+                { PoolRole: typeof role === 'string' ? role : { TrancheInvestor: role.TrancheInvestor.slice(0, 2) } }
+              ),
+              ...evmDomains.map((domain) =>
+                api.tx.liquidityPools.updateMember(poolId, trancheId, { EVM: domain }, validTill)
+              ),
+            ]
+          }),
+          ...sortedRemove.flatMap(([addr, role]) => {
+            const [trancheId, validTill, evmDomains = []] = typeof role === 'string' ? [] : role.TrancheInvestor
+            return [
+              api.tx.permissions.remove(
+                { PoolRole: typeof role === 'string' ? 'PoolAdmin' : 'InvestorAdmin' },
+                addr,
+                { Pool: poolId },
+                { PoolRole: role }
+              ),
+              ...evmDomains.map((domain) =>
+                api.tx.liquidityPools.updateMember(poolId, trancheId, { EVM: domain }, validTill)
+              ),
+            ]
+          }),
         ])
         return inst.wrapSignAndSend(api, submittable, options)
       })
@@ -1765,6 +1787,8 @@ export function getPoolsModule(inst: Centrifuge) {
                   symbol: value.symbol,
                   isPoolCurrency: value.additional.poolCurrency,
                   isPermissioned: value.additional.permissioned,
+                  additional: value.additional,
+                  location: value.location,
                 }
                 return currency
               })
@@ -2197,6 +2221,8 @@ export function getPoolsModule(inst: Centrifuge) {
             symbol: value.symbol,
             isPoolCurrency: value.additional.poolCurrency,
             isPermissioned: value.additional.permissioned,
+            additional: value.additional,
+            location: value.location,
           }
           return currency
         })
@@ -2404,6 +2430,7 @@ export function getPoolsModule(inst: Centrifuge) {
         (api, poolValue) => ({ api, poolValue })
       ),
       switchMap(({ api, poolValue }) => {
+        if (!poolValue.toPrimitive()) return of([])
         return combineLatest([
           api.query.loans.createdLoan.entries(poolId),
           api.query.loans.activeLoans(poolId),
@@ -2975,6 +3002,10 @@ export function parseCurrencyKey(key: CurrencyKey | { foreignAsset: number | str
   return key
 }
 
+export function isSameCurrency(a: CurrencyKey, b: CurrencyKey) {
+  return looksLike(parseCurrencyKey(a), parseCurrencyKey(b))
+}
+
 function looksLike(a: any, b: any): boolean {
   return isPrimitive(b)
     ? b === a
diff --git a/centrifuge-js/src/utils/evmMulticall.ts b/centrifuge-js/src/utils/evmMulticall.ts
new file mode 100644
index 0000000000..0cb8b2e8a7
--- /dev/null
+++ b/centrifuge-js/src/utils/evmMulticall.ts
@@ -0,0 +1,79 @@
+import { Interface } from '@ethersproject/abi'
+import { Contract } from '@ethersproject/contracts'
+import { JsonRpcProvider } from '@ethersproject/providers'
+import set from 'lodash/set'
+
+const MULTICALL_ABI = [
+  // 'function aggregate(tuple(address target, bytes callData)[] calls) payable returns (uint256 blockNumber, bytes[] returnData)',
+  'function aggregate3(tuple(address target, bool allowFailure, bytes callData)[] calls) payable returns (tuple(bool success, bytes returnData)[] returnData)',
+  // 'function aggregate3Value(tuple(address target, bool allowFailure, uint256 value, bytes callData)[] calls) payable returns (tuple(bool success, bytes returnData)[] returnData)',
+  // 'function blockAndAggregate(tuple(address target, bytes callData)[] calls) payable returns (uint256 blockNumber, bytes32 blockHash, tuple(bool success, bytes returnData)[] returnData)',
+  // 'function getBasefee() view returns (uint256 basefee)',
+  // 'function getBlockHash(uint256 blockNumber) view returns (bytes32 blockHash)',
+  // 'function getBlockNumber() view returns (uint256 blockNumber)',
+  // 'function getChainId() view returns (uint256 chainid)',
+  // 'function getCurrentBlockCoinbase() view returns (address coinbase)',
+  // 'function getCurrentBlockDifficulty() view returns (uint256 difficulty)',
+  // 'function getCurrentBlockGasLimit() view returns (uint256 gaslimit)',
+  // 'function getCurrentBlockTimestamp() view returns (uint256 timestamp)',
+  // 'function getEthBalance(address addr) view returns (uint256 balance)',
+  // 'function getLastBlockHash() view returns (bytes32 blockHash)',
+  // 'function tryAggregate(bool requireSuccess, tuple(address target, bytes callData)[] calls) payable returns (tuple(bool success, bytes returnData)[] returnData)',
+  // 'function tryBlockAndAggregate(bool requireSuccess, tuple(address target, bytes callData)[] calls) payable returns (uint256 blockNumber, bytes32 blockHash, tuple(bool success, bytes returnData)[] returnData)',
+]
+// Same address on Ethereum, Moonbeam, Base, etc.
+const MULTICALL_ADDRESS = '0xcA11bde05977b3631167028862bE2a173976CA11'
+
+type AggregateOptions = {
+  rpcProvider: JsonRpcProvider
+  allowFailure?: boolean
+}
+
+type PostProcess<T = any> = (v: any) => T
+
+type Return = [string] | [string, PostProcess] | []
+
+export type Call = {
+  target: string
+  call: (string | number)[]
+  returns: Return[]
+  allowFailure?: boolean
+}
+
+const identity = (v: any) => v
+const multicallContracts = new WeakMap<JsonRpcProvider, Contract>()
+
+export async function multicall<T = Record<string, any>>(calls: Call[], options: AggregateOptions) {
+  let contract = multicallContracts.get(options.rpcProvider)
+  if (!contract) {
+    contract = new Contract(MULTICALL_ADDRESS, MULTICALL_ABI, options.rpcProvider)
+    multicallContracts.set(options.rpcProvider, contract)
+  }
+
+  const interfaces = calls.map((c) => {
+    const int = new Interface([c.call[0] as string])
+    return [int, int.fragments[0].name] as const
+  })
+  const encoded = calls.map((c, i) => ({
+    target: c.target,
+    allowFailure: c.allowFailure ?? options.allowFailure ?? false,
+    callData: interfaces[i][0].encodeFunctionData(interfaces[i][1], c.call.slice(1)),
+  }))
+
+  const results = await contract.callStatic.aggregate3(encoded)
+
+  const transformed: Record<string, any> = {}
+  calls.forEach((c, i) => {
+    const { returnData, success } = results[i]
+    if (!success) return
+    const [int, name] = interfaces[i]
+    const parsed = int.decodeFunctionResult(name, returnData)
+    parsed.forEach((value, j) => {
+      const [key, transform] = c.returns[j] ?? []
+      if (!key) return
+      set(transformed, key, (transform ?? identity)(value))
+    })
+  })
+
+  return transformed as T
+}
diff --git a/centrifuge-js/src/utils/index.ts b/centrifuge-js/src/utils/index.ts
index 2d826349a2..d094563865 100644
--- a/centrifuge-js/src/utils/index.ts
+++ b/centrifuge-js/src/utils/index.ts
@@ -139,7 +139,7 @@ export function computeMultisig(multisig: Multisig): ComputedMultisig {
 export function evmToSubstrateAddress(address: string, chainId: number) {
   // Bytes EVM\0 as suffix
   const suffix = '45564d00'
-  const chainHex = chainId.toString(16).padStart(4, '0')
+  const chainHex = chainId.toString(16).padStart(16, '0')
 
-  return `0x${address.substring(2).toLowerCase()}000000000000${chainHex}${suffix}`
+  return `0x${address.substring(2).toLowerCase()}${chainHex}${suffix}`
 }
diff --git a/centrifuge-react/src/components/WalletMenu/WalletMenu.tsx b/centrifuge-react/src/components/WalletMenu/WalletMenu.tsx
index e89b89fe06..b6670d01f7 100644
--- a/centrifuge-react/src/components/WalletMenu/WalletMenu.tsx
+++ b/centrifuge-react/src/components/WalletMenu/WalletMenu.tsx
@@ -192,7 +192,7 @@ function ConnectedMenu({ menuItems }: WalletMenuProps) {
                   </Shelf>
                 </Box>
               )}
-              {connectedType === 'substrate' ? (
+              {connectedType === 'substrate' || (evm.accounts && evm.accounts.length > 1) ? (
                 <MenuItem
                   label="Switch account"
                   icon={<IconSwitch size="iconSmall" />}
diff --git a/centrifuge-react/src/components/WalletProvider/AccountButton.tsx b/centrifuge-react/src/components/WalletProvider/AccountButton.tsx
index b818c5b6b6..6e836d5d45 100644
--- a/centrifuge-react/src/components/WalletProvider/AccountButton.tsx
+++ b/centrifuge-react/src/components/WalletProvider/AccountButton.tsx
@@ -1,9 +1,11 @@
 import { ComputedMultisig } from '@centrifuge/centrifuge-js'
-import { Box, Shelf, Text } from '@centrifuge/fabric'
+import { Box, Flex, Shelf, Text } from '@centrifuge/fabric'
 import Identicon from '@polkadot/react-identicon'
+import { IconTheme } from '@polkadot/react-identicon/types'
 import { WalletAccount } from '@subwallet/wallet-connect/types'
 import * as React from 'react'
 import styled, { useTheme } from 'styled-components'
+import { useEvmNativeBalance, useEvmNativeCurrency } from '.'
 import { useBalances } from '../../hooks/useBalances'
 import { formatBalanceAbbreviated, truncateAddress } from '../../utils/formatting'
 import { useCentrifugeUtils } from '../CentrifugeProvider'
@@ -37,10 +39,11 @@ const Root = styled(Shelf)<{ selected: boolean }>`
   }
 `
 
-const IdenticonWrapper = styled.span`
-  display: block;
-  pointer-events: none;
-`
+const IdenticonWrapper = styled(Flex)({
+  borderRadius: '50%',
+  overflow: 'hidden',
+  pointerEvents: 'none',
+})
 
 export function AccountButton({
   address,
@@ -53,9 +56,11 @@ export function AccountButton({
 }: AccountButtonProps) {
   const { connectedType } = useWallet()
   const balances = useBalances(connectedType === 'substrate' ? address : undefined)
-  const balance = balances
-    ? formatBalanceAbbreviated(balances.native.balance, balances.native.currency.symbol)
-    : undefined
+  const { data: evmBalance } = useEvmNativeBalance(connectedType === 'evm' ? address : undefined)
+  const evmCurrency = useEvmNativeCurrency()
+  const balance = connectedType === 'substrate' ? balances?.native.balance : evmBalance
+  const symbol = connectedType === 'substrate' ? balances?.native.currency.symbol : evmCurrency?.symbol
+  const formattedBalance = balance ? formatBalanceAbbreviated(balance, symbol) : undefined
   const utils = useCentrifugeUtils()
 
   return (
@@ -111,21 +116,21 @@ export function AccountButton({
         )}
       </Box>
 
-      {balance && (
+      {formattedBalance && (
         <Text as="span" variant="body2" fontWeight={400} textAlign="right">
-          {balance}
+          {formattedBalance}
         </Text>
       )}
     </Root>
   )
 }
 
-export function AccountIcon({ id }: { id: string }) {
+export function AccountIcon({ id, theme = 'polkadot' }: { id: string; theme?: IconTheme }) {
   const { sizes } = useTheme()
 
   return (
     <IdenticonWrapper>
-      <Identicon value={id} size={sizes.iconRegular as number} theme="polkadot" />
+      <Identicon value={id} size={sizes.iconRegular as number} theme={theme} />
     </IdenticonWrapper>
   )
 }
diff --git a/centrifuge-react/src/components/WalletProvider/ConnectionGuard.tsx b/centrifuge-react/src/components/WalletProvider/ConnectionGuard.tsx
index e5d00f68f1..ba58d6cd1b 100644
--- a/centrifuge-react/src/components/WalletProvider/ConnectionGuard.tsx
+++ b/centrifuge-react/src/components/WalletProvider/ConnectionGuard.tsx
@@ -8,9 +8,10 @@ type Props = {
   networks: Network[]
   children: React.ReactNode
   body?: string
+  variant?: 'card' | 'plain'
 }
 
-export function ConnectionGuard({ networks, children, body = 'Unsupported network.' }: Props) {
+export function ConnectionGuard({ networks, children, variant = 'card', body = 'Unsupported network.' }: Props) {
   const {
     isEvmOnSubstrate,
     connectedType,
@@ -42,45 +43,46 @@ export function ConnectionGuard({ networks, children, body = 'Unsupported networ
 
   const name = getName(networks[0])
 
-  if (connectedNetwork) {
-    return (
-      <Card p={2}>
-        <Stack gap={2} pb={3}>
-          <Text variant="body3">{body}</Text>
-          {networks.length === 1 ? (
-            <Button onClick={() => switchNetwork(networks[0])}>Switch to {name}</Button>
-          ) : (
-            <Popover
-              renderTrigger={(props, ref, state) => (
-                <Stack ref={ref} width="100%" alignItems="stretch">
-                  <Button iconRight={IconChevronDown} active={state.isOpen} {...props}>
-                    Switch Network
-                  </Button>
-                </Stack>
-              )}
-              renderContent={(props, ref, state) => (
-                <div {...props} ref={ref}>
-                  <Menu>
-                    <MenuItemGroup>
-                      {networks.map((network) => (
-                        <MenuItem
-                          label={getName(network)}
-                          onClick={() => {
-                            state.close()
-                            switchNetwork(network)
-                          }}
-                          key={network}
-                        />
-                      ))}
-                    </MenuItemGroup>
-                  </Menu>
-                </div>
-              )}
-            />
+  const element = (
+    <Stack gap={2} pb={3}>
+      <Text variant="body3">{body}</Text>
+      {networks.length === 1 ? (
+        <Button onClick={() => switchNetwork(networks[0])}>Switch to {name}</Button>
+      ) : (
+        <Popover
+          renderTrigger={(props, ref, state) => (
+            <Stack ref={ref} width="100%" alignItems="stretch">
+              <Button iconRight={IconChevronDown} active={state.isOpen} {...props}>
+                Switch Network
+              </Button>
+            </Stack>
+          )}
+          renderContent={(props, ref, state) => (
+            <div {...props} ref={ref}>
+              <Menu>
+                <MenuItemGroup>
+                  {networks.map((network) => (
+                    <MenuItem
+                      label={getName(network)}
+                      onClick={() => {
+                        state.close()
+                        switchNetwork(network)
+                      }}
+                      key={network}
+                    />
+                  ))}
+                </MenuItemGroup>
+              </Menu>
+            </div>
           )}
-        </Stack>
-      </Card>
-    )
+        />
+      )}
+    </Stack>
+  )
+
+  if (connectedNetwork) {
+    if (variant === 'card') return <Card p={2}>{element}</Card>
+    return element
   }
 
   return null
diff --git a/centrifuge-react/src/components/WalletProvider/WalletDialog.tsx b/centrifuge-react/src/components/WalletProvider/WalletDialog.tsx
index 2a2a4282b1..fcbdd9c37a 100644
--- a/centrifuge-react/src/components/WalletProvider/WalletDialog.tsx
+++ b/centrifuge-react/src/components/WalletProvider/WalletDialog.tsx
@@ -17,6 +17,7 @@ import centrifugeLogo from '@centrifuge/fabric/assets/logos/centrifuge.svg'
 import { Wallet } from '@subwallet/wallet-connect/types'
 import { MetaMask } from '@web3-react/metamask'
 import * as React from 'react'
+import { Network } from '.'
 import { AccountButton, AccountIcon, AccountName } from './AccountButton'
 import { EvmChains, getChainInfo } from './evm/chains'
 import { EvmConnectorMeta } from './evm/connectors'
@@ -30,6 +31,8 @@ type Props = {
   evmChains: EvmChains
   showAdvancedAccounts?: boolean
   showBase?: boolean
+  showArbitrum?: boolean
+  showTestNets?: boolean
 }
 
 const title = {
@@ -38,9 +41,17 @@ const title = {
   accounts: 'Choose account',
 }
 
-export function WalletDialog({ evmChains: allEvmChains, showAdvancedAccounts, showBase }: Props) {
+export function WalletDialog({
+  evmChains: allEvmChains,
+  showAdvancedAccounts,
+  showBase,
+  showArbitrum,
+  showTestNets,
+}: Props) {
   const evmChains = Object.keys(allEvmChains)
     .filter((chain) => (!showBase ? !['8453', '84531'].includes(chain) : true))
+    .filter((chain) => (!showArbitrum ? !['42161', '421613'].includes(chain) : true))
+    .filter((chain) => (!showTestNets ? !['5', '84531', '421613', '43113'].includes(chain) : true))
     .reduce((obj, key) => {
       obj[key] = allEvmChains[key]
       return obj
@@ -48,6 +59,7 @@ export function WalletDialog({ evmChains: allEvmChains, showAdvancedAccounts, sh
   const ctx = useWallet()
   const centEvmChainId = useCentEvmChainId()
   const {
+    connectedType,
     pendingConnect: { isConnecting, wallet: pendingWallet, isError: isConnectError },
     walletDialog: { view, network: selectedNetwork, wallet: selectedWallet },
     dispatch,
@@ -86,12 +98,9 @@ export function WalletDialog({ evmChains: allEvmChains, showAdvancedAccounts, sh
     }
   }
 
-  function walletButtonMuted() {
-    return Boolean(
-      scopedNetworks &&
-        ((isCentChainSelected && !scopedNetworks.includes('centrifuge')) ||
-          (typeof selectedNetwork === 'number' && !scopedNetworks.includes(selectedNetwork)))
-    )
+  function isMuted(network: Network) {
+    if (!scopedNetworks) return false
+    return !scopedNetworks.includes(network)
   }
 
   return (
@@ -128,23 +137,24 @@ export function WalletDialog({ evmChains: allEvmChains, showAdvancedAccounts, sh
               logo={<Logo icon={centrifugeLogo} />}
               onClick={() => showWallets('centrifuge')}
               active={isCentChainSelected}
-              muted={Boolean(scopedNetworks && !scopedNetworks.includes('centrifuge'))}
+              muted={isMuted('centrifuge')}
             >
               {getNetworkName('centrifuge')}
             </SelectButton>
 
-            {Object.entries(evmChains).map(([chainId, chain]) => {
-              const info = getChainInfo(evmChains, Number(chainId))
+            {Object.entries(evmChains).map(([chainIdString, chain]) => {
+              const chainId = Number(chainIdString)
+              const info = getChainInfo(evmChains, chainId)
 
-              if (Number(chainId) === evmChainId) return null
+              if (chainId === evmChainId) return null
 
               return (
                 <SelectButton
                   key={chainId}
                   logo={chain.iconUrl ? <Logo icon={chain.iconUrl} /> : undefined}
-                  onClick={() => showWallets(Number(chainId))}
-                  active={selectedNetwork === Number(chainId)}
-                  muted={Boolean(scopedNetworks && scopedNetworks.includes('centrifuge'))}
+                  onClick={() => showWallets(chainId)}
+                  active={selectedNetwork === chainId}
+                  muted={isMuted(chainId)}
                 >
                   {info.name}
                 </SelectButton>
@@ -198,7 +208,7 @@ export function WalletDialog({ evmChains: allEvmChains, showAdvancedAccounts, sh
                       }}
                       loading={isConnecting && wallet === pendingWallet}
                       active={selectedWallet === wallet}
-                      muted={walletButtonMuted()}
+                      muted={isMuted(selectedNetwork!)}
                     >
                       {wallet.title}
                     </SelectButton>
@@ -208,7 +218,7 @@ export function WalletDialog({ evmChains: allEvmChains, showAdvancedAccounts, sh
                       href={wallet.installUrl}
                       logo={<Logo icon={wallet.logo.src} />}
                       iconRight={<IconDownload size="iconSmall" color="textPrimary" />}
-                      muted={walletButtonMuted()}
+                      muted={isMuted(selectedNetwork!)}
                     >
                       {wallet.title}
                     </SelectAnchor>
@@ -246,7 +256,9 @@ export function WalletDialog({ evmChains: allEvmChains, showAdvancedAccounts, sh
                 )
               }
             >
-              <SubstrateAccounts onClose={close} showAdvancedAccounts={showAdvancedAccounts} />
+              {connectedType === 'substrate' ? (
+                <SubstrateAccounts onClose={close} showAdvancedAccounts={showAdvancedAccounts} />
+              ) : null}
             </SelectionStep>
           </>
         )}
diff --git a/centrifuge-react/src/components/WalletProvider/WalletProvider.tsx b/centrifuge-react/src/components/WalletProvider/WalletProvider.tsx
index 4a59873f08..cc8cfe3d06 100644
--- a/centrifuge-react/src/components/WalletProvider/WalletProvider.tsx
+++ b/centrifuge-react/src/components/WalletProvider/WalletProvider.tsx
@@ -1,4 +1,5 @@
 import { addressToHex, ComputedMultisig, evmToSubstrateAddress, Multisig } from '@centrifuge/centrifuge-js'
+import { JsonRpcProvider } from '@ethersproject/providers'
 import { isWeb3Injected } from '@polkadot/extension-dapp'
 import { getWallets } from '@subwallet/wallet-connect/dotsama/wallets'
 import { Wallet } from '@subwallet/wallet-connect/types'
@@ -61,6 +62,7 @@ export type WalletContextType = {
     chains: EvmChains
     selectedWallet: EvmConnectorMeta | null
     selectedAddress: string | null
+    getProvider(chainId: number): JsonRpcProvider
   }
 }
 
@@ -76,17 +78,17 @@ export function useWallet() {
 
 export function useAddress(type?: 'substrate' | 'evm') {
   const { connectedType, evm, substrate, isEvmOnSubstrate } = useWallet()
-  if (type === 'evm') {
-    return evm.accounts?.[0]
+  if (type === 'evm' || (!type && connectedType === 'evm' && !isEvmOnSubstrate)) {
+    return evm.accounts?.[0] ?? undefined
   }
   if (isEvmOnSubstrate) {
     return (
       substrate.selectedCombinedAccount?.actingAddress ||
-      (evm.accounts?.[0] ? evmToSubstrateAddress(evm.accounts[0], substrate.evmChainId!) : undefined)
+      (evm.accounts?.[0] ? evmToSubstrateAddress(evm.accounts?.[0], substrate.evmChainId!) : undefined)
     )
   }
-  if (connectedType === 'evm') {
-    return evm.accounts?.[0]
+  if (type === 'substrate' && connectedType === 'evm') {
+    return evm.accounts?.[0] ? evmToSubstrateAddress(evm.accounts?.[0], evm.chainId!) : undefined
   }
   return substrate.selectedCombinedAccount?.actingAddress || substrate.selectedAccount?.address
 }
@@ -125,9 +127,12 @@ type WalletProviderProps = {
   subscanUrl?: string
   showAdvancedAccounts?: boolean
   showBase?: boolean
+  showArbitrum?: boolean
+  showTestNets?: boolean
 }
 
 let cachedEvmConnectors: EvmConnectorMeta[] | undefined = undefined
+const cachedProviders: Record<number, JsonRpcProvider> = {}
 
 export function WalletProvider({
   children,
@@ -141,6 +146,8 @@ export function WalletProvider({
   subscanUrl,
   showAdvancedAccounts,
   showBase,
+  showArbitrum,
+  showTestNets,
 }: WalletProviderProps) {
   if (!evmChainsProp[1]?.urls[0]) throw new Error('Mainnet should be defined in EVM Chains')
 
@@ -255,13 +262,6 @@ export function WalletProvider({
     })
   }
 
-  const selectAccount = React.useCallback((address: string, proxies?: string[] | null, multisig?: string | null) => {
-    dispatch({
-      type: 'substrateSetState',
-      payload: { selectedAccountAddress: address, proxyAddresses: proxies ?? null, multisigAddress: multisig ?? null },
-    })
-  }, [])
-
   const {
     execute: setPendingConnect,
     args: connectingArgs,
@@ -438,7 +438,16 @@ export function WalletProvider({
         selectedCombinedAccount:
           ((state.substrate.multisigAddress || state.substrate.proxyAddresses) && selectedCombinedAccount) || null,
         isWeb3Injected,
-        selectAccount,
+        selectAccount: (address: string, proxies?: string[] | null, multisig?: string | null) => {
+          dispatch({
+            type: 'substrateSetState',
+            payload: {
+              selectedAccountAddress: address,
+              proxyAddresses: proxies ?? null,
+              multisigAddress: multisig ?? null,
+            },
+          })
+        },
         addMultisig: (multisig) => {
           dispatch({
             type: 'substrateAddMultisig',
@@ -453,17 +462,30 @@ export function WalletProvider({
       },
       evm: {
         ...state.evm,
+        accounts: state.evm.accounts && [state.evm.accounts?.[0]],
         selectedAddress: state.evm.accounts?.[0] || null,
         connectors: evmConnectors,
         chains: evmChains,
+        getProvider: (chainId: number) => {
+          return (
+            cachedProviders[chainId] ||
+            (cachedProviders[chainId] = new JsonRpcProvider(evmChains[chainId].urls[0], chainId))
+          )
+        },
       },
     }
-  }, [connect, disconnect, selectAccount, proxies, state, isConnectError, isConnecting])
+  }, [connect, disconnect, proxies, state, isConnectError, isConnecting])
 
   return (
     <WalletContext.Provider value={ctx}>
       {children}
-      <WalletDialog evmChains={evmChains} showAdvancedAccounts={showAdvancedAccounts} showBase={showBase} />
+      <WalletDialog
+        evmChains={evmChains}
+        showAdvancedAccounts={showAdvancedAccounts}
+        showBase={showBase}
+        showArbitrum={showArbitrum}
+        showTestNets={showTestNets}
+      />
     </WalletContext.Provider>
   )
 }
diff --git a/centrifuge-react/src/components/WalletProvider/evm/chains.ts b/centrifuge-react/src/components/WalletProvider/evm/chains.ts
index 4904303903..b08918c069 100644
--- a/centrifuge-react/src/components/WalletProvider/evm/chains.ts
+++ b/centrifuge-react/src/components/WalletProvider/evm/chains.ts
@@ -11,9 +11,7 @@ type ExtendedChainInformation = BasicChainInformation & {
   blockExplorerUrl: string
 }
 
-export type EvmChains =
-  | { [chainId in 1 | 5 | 8453 | 84531]?: BasicChainInformation }
-  | { [chainId: number]: ExtendedChainInformation }
+export type EvmChains = { [chainId in 1 | 5]?: BasicChainInformation } | { [chainId: number]: ExtendedChainInformation }
 
 export function getAddChainParameters(chains: EvmChains, chainId: number): AddEthereumChainParameter | number {
   const chainInfo = chains[chainId]
@@ -53,16 +51,6 @@ const chainExtendedInfo = {
     nativeCurrency: { name: 'Görli Ether', symbol: 'görETH', decimals: 18 },
     blockExplorerUrl: 'https://goerli.etherscan.io/',
   },
-  8453: {
-    name: 'Base',
-    nativeCurrency: { name: 'Base', symbol: 'bETH', decimals: 18 },
-    blockExplorerUrl: 'https://basescan.org/',
-  },
-  84531: {
-    name: 'Base Goerli',
-    nativeCurrency: { name: 'Base Goerli', symbol: 'gbETH', decimals: 18 },
-    blockExplorerUrl: 'https://goerli.basescan.org/',
-  },
 }
 
 export function getChainInfo(chains: EvmChains, chainId: number): ExtendedChainInformation {
diff --git a/centrifuge-react/src/components/WalletProvider/evm/utils.ts b/centrifuge-react/src/components/WalletProvider/evm/utils.ts
index a4caeb38d3..4f6cad30c4 100644
--- a/centrifuge-react/src/components/WalletProvider/evm/utils.ts
+++ b/centrifuge-react/src/components/WalletProvider/evm/utils.ts
@@ -90,7 +90,7 @@ export function useNativeBalance(address?: string) {
 
 export function useNativeCurrency() {
   const { evm } = useWallet()
-  if (!evm.chainId) return null
+  if (!evm.chainId) return undefined
   const chain = getChainInfo(evm.chains, evm.chainId)
   return chain.nativeCurrency
 }
diff --git a/centrifuge-react/src/components/WalletProvider/index.tsx b/centrifuge-react/src/components/WalletProvider/index.tsx
index d601d36772..cf8088e353 100644
--- a/centrifuge-react/src/components/WalletProvider/index.tsx
+++ b/centrifuge-react/src/components/WalletProvider/index.tsx
@@ -1,5 +1,5 @@
 export { ConnectionGuard } from './ConnectionGuard'
-export type { EvmChains } from './evm/chains'
+export * from './evm/chains'
 export type { EvmConnectorMeta } from './evm/connectors'
 export {
   createConnector,
diff --git a/fabric/assets/logos/arbitrum.svg b/fabric/assets/logos/arbitrum.svg
new file mode 100644
index 0000000000..56ed24c9f2
--- /dev/null
+++ b/fabric/assets/logos/arbitrum.svg
@@ -0,0 +1,37 @@
+<svg xmlns:xodm="http://www.corel.com/coreldraw/odm/2003" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" viewBox="0 0 2500 2500" style="enable-background:new 0 0 2500 2500;" xml:space="preserve"><script xmlns=""/>
+<style type="text/css">
+	.st0{fill:none;}
+	.st1{fill:#213147;}
+	.st2{fill:#12AAFF;}
+	.st3{fill:#9DCCED;}
+	.st4{fill:#FFFFFF;}
+</style>
+<g id="Layer_x0020_1">
+	<g id="_2405588477232">
+		<rect class="st0" width="2500" height="2500"/>
+		<g>
+			<g>
+				<path class="st1" d="M226,760v980c0,63,33,120,88,152l849,490c54,31,121,31,175,0l849-490c54-31,88-89,88-152V760      c0-63-33-120-88-152l-849-490c-54-31-121-31-175,0L314,608c-54,31-87,89-87,152H226z"/>
+				<g>
+					<g>
+						<g>
+							<path class="st2" d="M1435,1440l-121,332c-3,9-3,19,0,29l208,571l241-139l-289-793C1467,1422,1442,1422,1435,1440z"/>
+						</g>
+						<g>
+							<path class="st2" d="M1678,882c-7-18-32-18-39,0l-121,332c-3,9-3,19,0,29l341,935l241-139L1678,883V882z"/>
+						</g>
+					</g>
+				</g>
+				<g>
+					<path class="st3" d="M1250,155c6,0,12,2,17,5l918,530c11,6,17,18,17,30v1060c0,12-7,24-17,30l-918,530c-5,3-11,5-17,5       s-12-2-17-5l-918-530c-11-6-17-18-17-30V719c0-12,7-24,17-30l918-530c5-3,11-5,17-5l0,0V155z M1250,0c-33,0-65,8-95,25L237,555       c-59,34-95,96-95,164v1060c0,68,36,130,95,164l918,530c29,17,62,25,95,25s65-8,95-25l918-530c59-34,95-96,95-164V719       c0-68-36-130-95-164L1344,25c-29-17-62-25-95-25l0,0H1250z"/>
+				</g>
+				<polygon class="st1" points="642,2179 727,1947 897,2088 738,2234     "/>
+				<g>
+					<path class="st4" d="M1172,644H939c-17,0-33,11-39,27L401,2039l241,139l550-1507c5-14-5-28-19-28L1172,644z"/>
+					<path class="st4" d="M1580,644h-233c-17,0-33,11-39,27L738,2233l241,139l620-1701c5-14-5-28-19-28V644z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
\ No newline at end of file
diff --git a/fabric/assets/logos/base.svg b/fabric/assets/logos/base.svg
new file mode 100644
index 0000000000..67c432246a
--- /dev/null
+++ b/fabric/assets/logos/base.svg
@@ -0,0 +1,4 @@
+<svg width="146" height="146" viewBox="0 0 146 146" fill="none" xmlns="http://www.w3.org/2000/svg">
+<circle cx="73" cy="73" r="73" fill="#0052FF"/>
+<path d="M73.323 123.729C101.617 123.729 124.553 100.832 124.553 72.5875C124.553 44.343 101.617 21.4463 73.323 21.4463C46.4795 21.4463 24.4581 42.0558 22.271 68.2887H89.9859V76.8864H22.271C24.4581 103.119 46.4795 123.729 73.323 123.729Z" fill="white"/>
+</svg>
\ No newline at end of file
diff --git a/fabric/src/components/Accordion/index.tsx b/fabric/src/components/Accordion/index.tsx
index adc6f76a3f..f60b1330cb 100644
--- a/fabric/src/components/Accordion/index.tsx
+++ b/fabric/src/components/Accordion/index.tsx
@@ -6,7 +6,7 @@ import { Shelf } from '../Shelf'
 import { Text } from '../Text'
 
 export type AccordionProps = BoxProps & {
-  items: { title: string; body: string }[]
+  items: { title: React.ReactNode; body: React.ReactNode }[]
 }
 
 const Root = styled(Box)`
@@ -74,9 +74,7 @@ function AccordionEntry({ title, body, ...boxProps }: AccordionProps['items'][nu
       </Toggle>
       <Collapsible id={`content-${id}`} open={open}>
         <Box p={2} backgroundColor="backgroundSecondary">
-          <Text variant="body2" as="p">
-            {body}
-          </Text>
+          <Text variant="body2">{body}</Text>
         </Box>
       </Collapsible>
     </Box>
diff --git a/fabric/src/components/Button/IconAction.tsx b/fabric/src/components/Button/IconAction.tsx
index e531a5680c..79d07ef691 100644
--- a/fabric/src/components/Button/IconAction.tsx
+++ b/fabric/src/components/Button/IconAction.tsx
@@ -35,3 +35,6 @@ export const IconAnchor = styled.a`
 export const IconButton = styled.button`
   ${iconActionStyles}
 `
+IconButton.defaultProps = {
+  type: 'button',
+}
diff --git a/fabric/src/components/CurrencyInput/index.tsx b/fabric/src/components/CurrencyInput/index.tsx
index d5fe1f8774..3e753b74b2 100644
--- a/fabric/src/components/CurrencyInput/index.tsx
+++ b/fabric/src/components/CurrencyInput/index.tsx
@@ -7,7 +7,7 @@ import { Text } from '../Text'
 
 export type CurrencyInputProps = Omit<React.InputHTMLAttributes<HTMLInputElement>, 'onChange'> &
   Omit<InputBoxProps, 'inputElement' | 'rightElement'> & {
-    currency?: string
+    currency?: React.ReactNode
     onSetMax?: () => void
     variant?: 'small' | 'large'
     onChange?: (value: number) => void
diff --git a/fabric/src/components/Select/index.tsx b/fabric/src/components/Select/index.tsx
index af5f30e705..1a24bf91b8 100644
--- a/fabric/src/components/Select/index.tsx
+++ b/fabric/src/components/Select/index.tsx
@@ -45,33 +45,36 @@ const Chevron = styled(IconChevronDown)`
   position: absolute;
   top: 0;
   right: 0;
+  bottom: 0;
+  margin-top: auto;
+  margin-bottom: auto;
   pointer-events: none;
 `
 
-export const Select: React.FC<SelectProps> = ({ options, label, placeholder, errorMessage, disabled, ...rest }) => {
+export function SelectInner({ options, placeholder, disabled, ...rest }: Omit<SelectProps, 'label' | 'errorMessage'>) {
+  return (
+    <Box position="relative">
+      <Chevron color={disabled ? 'textSecondary' : 'textPrimary'} />
+      <StyledSelect disabled={disabled} {...rest}>
+        {placeholder && (
+          <option value="" disabled>
+            {placeholder}
+          </option>
+        )}
+        {options.map((option, index) => (
+          <option key={`${index}${option.value}`} value={option.value} disabled={option.disabled}>
+            {option.label}
+          </option>
+        ))}
+      </StyledSelect>
+    </Box>
+  )
+}
+
+export const Select: React.FC<SelectProps> = ({ label, errorMessage, ...rest }) => {
   return (
     <Stack gap={1} width="100%">
-      <InputBox
-        as="div"
-        label={label}
-        inputElement={
-          <>
-            <Chevron color={disabled ? 'textSecondary' : 'textPrimary'} />
-            <StyledSelect disabled={disabled} {...rest}>
-              {placeholder && (
-                <option value="" disabled>
-                  {placeholder}
-                </option>
-              )}
-              {options.map((option, index) => (
-                <option key={`${index}${option.value}`} value={option.value} disabled={option.disabled}>
-                  {option.label}
-                </option>
-              ))}
-            </StyledSelect>
-          </>
-        }
-      />
+      <InputBox as="div" label={label} inputElement={<SelectInner {...rest} />} />
       {errorMessage && (
         <Box px={2}>
           <Text variant="label2" color="statusCritical">
diff --git a/yarn.lock b/yarn.lock
index 14f44b7bf0..34751d3b7b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1862,6 +1862,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@centrifuge/centrifuge-js@workspace:centrifuge-js"
   dependencies:
+    "@ethersproject/abi": ^5.6.0
+    "@ethersproject/bignumber": ^5.7.0
     "@ethersproject/contracts": ^5.6.0
     "@ethersproject/providers": ^5.6.0
     "@polkadot/api": ~10.3.4
@@ -1870,6 +1872,7 @@ __metadata:
     "@stablelib/blake2b": ^1.0.1
     "@types/isomorphic-fetch": ^0.0.36
     "@types/jest": ^27.0.3
+    "@types/lodash": ^4
     "@types/node": ^16.11.12
     "@typescript-eslint/eslint-plugin": ^4.32.0
     "@typescript-eslint/parser": ^4.32.0
@@ -1878,9 +1881,11 @@ __metadata:
     eslint: ^7.32.0
     eslint-config-prettier: ^8.3.0
     eslint-plugin-prettier: ^4.0.0
+    eth-permit: ^0.2.3
     isomorphic-fetch: ^3.0.0
     jest: ^27.4.3
     jw3t: ^1.0.8
+    lodash: ^4.17.21
     npm-run-all: 4.1.5
     ts-jest: ^27.1.1
     typescript: ~4.4.4
@@ -2583,7 +2588,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.7.0":
+"@ethersproject/abi@npm:5.7.0, @ethersproject/abi@npm:^5.6.0, @ethersproject/abi@npm:^5.7.0":
   version: 5.7.0
   resolution: "@ethersproject/abi@npm:5.7.0"
   dependencies:
@@ -8564,6 +8569,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash@npm:^4":
+  version: 4.14.197
+  resolution: "@types/lodash@npm:4.14.197"
+  checksum: 5368b3d8c3ec66d6611acc054f073e2296bfca75442f1c6df1572405efd4b677d2c8412d0b6ff8e87491aac17dd332798ee30757c2b468461ef1fabdd6c68f45
+  languageName: node
+  linkType: hard
+
 "@types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.175":
   version: 4.14.195
   resolution: "@types/lodash@npm:4.14.195"
@@ -15866,6 +15878,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eth-permit@npm:^0.2.3":
+  version: 0.2.3
+  resolution: "eth-permit@npm:0.2.3"
+  dependencies:
+    utf8: ^3.0.0
+  checksum: 101c7dfe69152c7349b4fcbf62aab6bb028c4029d50bcddbeced6be6316040945c0493604c85efbbfe4fb54fd3de23d5ba551545a8462465369a80e0f8052cb6
+  languageName: node
+  linkType: hard
+
 "eth-query@npm:^2.1.2":
   version: 2.1.2
   resolution: "eth-query@npm:2.1.2"
@@ -27471,7 +27492,7 @@ fsevents@^1.2.7:
   languageName: node
   linkType: hard
 
-"utf8@npm:3.0.0":
+"utf8@npm:3.0.0, utf8@npm:^3.0.0":
   version: 3.0.0
   resolution: "utf8@npm:3.0.0"
   checksum: 5a82761c09db35965210fcd10edc92b52a3ed2be7756858856341d5c4cf029a25b2d96b0c79fd1b8cd38a339913d0536e8918130f150e7fe2d9b8e3954bb9dac