diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index b7ea00f5..07c4831a 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -132,14 +132,6 @@ jobs:
           name: robosats-${{ inputs.semver }}-x86_64.apk
           path: mobile/android/app/build/outputs/apk/release/app-x86_64-release.apk
 
-      # Create app-x86-release APK artifact asset for Release
-      - name: 'Upload x86 .apk Release Artifact (for Release)'
-        uses: actions/upload-artifact@v4
-        if: inputs.semver != ''  # If this workflow is called from release.yml
-        with:
-          name: robosats-${{ inputs.semver }}-x86.apk
-          path: mobile/android/app/build/outputs/apk/release/app-x86-release.apk
-
       - name: 'Create Pre-release'
         id: create_release
         if: inputs.semver == ''  # only if this workflow is not called from a push to tag (a Release)
@@ -200,16 +192,3 @@ jobs:
           asset_path: ./mobile/android/app/build/outputs/apk/release/app-x86_64-release.apk
           asset_name: robosats-${{ steps.commit.outputs.short }}-x86_64.apk
           asset_content_type: application/apk
-
-      # Upload x86 APK to pre-release
-      - name: 'Upload x86 Pre-release APK Asset'
-        id: upload-release-x86-apk-asset
-        if: inputs.semver == '' # only if this workflow is not called from a push to tag (a Release)
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./mobile/android/app/build/outputs/apk/release/app-x86-release.apk
-          asset_name: robosats-${{ steps.commit.outputs.short }}-x86.apk
-          asset_content_type: application/apk
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 710d0083..d7b54e10 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -74,7 +74,7 @@ jobs:
     secrets: inherit
     with:
       semver: ${{ needs.check-versions.outputs.semver }}
-  
+
   desktop-build:
     uses: RoboSats/robosats/.github/workflows/desktop-build.yml@main
     needs: [frontend-build, check-versions]
@@ -163,29 +163,12 @@ jobs:
           asset_name: robosats-${{ needs.check-versions.outputs.semver }}-x86_64.apk
           asset_content_type: application/apk
 
-      # Upload app-x86-release APK artifact asset
-      - name: 'Download x86 APK Artifact'
-        uses: actions/download-artifact@v4
-        with:
-          name: robosats-${{ needs.check-versions.outputs.semver }}-x86.apk
-          path: .
-      - name: 'Upload x86 APK Asset'
-        id: upload-x86-release-asset
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create-release.outputs.upload_url }}
-          asset_path: app-x86-release.apk
-          asset_name: robosats-${{ needs.check-versions.outputs.semver }}-x86.apk
-          asset_content_type: application/apk
-      
       - name: 'Download macOS Build Artifact'
         uses: actions/download-artifact@v4
         with:
           name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-mac-darwin-x64.zip
           path: .
-          
+
       - name: 'Upload macOS Build Artifact'
         id: upload-release-mac-zip-asset
         uses: actions/upload-release-asset@v1
@@ -219,7 +202,7 @@ jobs:
         with:
           name: robosats-desktop-${{ needs.check-versions.outputs.semver }}-win32-ia32.zip
           path: .
-          
+
       - name: 'Upload Windows Build Artifact'
         id: upload-release-win-zip-asset
         uses: actions/upload-release-asset@v1
diff --git a/api/nostr.py b/api/nostr.py
index 6c2654b2..75b442ee 100644
--- a/api/nostr.py
+++ b/api/nostr.py
@@ -88,7 +88,7 @@ class Nostr:
                 ]
             ),
             Tag.parse(["y", "robosats", config("COORDINATOR_ALIAS", cast=str).lower()]),
-            Tag.parse(["n", str(config("NETWORK"))]),
+            Tag.parse(["network", str(config("NETWORK"))]),
             Tag.parse(["layer"] + self.get_layer_tag(order)),
             Tag.parse(["bond", str(order.bond_size)]),
             Tag.parse(["z", "order"]),
diff --git a/frontend/src/components/Charts/DepthChart/index.tsx b/frontend/src/components/Charts/DepthChart/index.tsx
index 02ec91c2..475306fc 100644
--- a/frontend/src/components/Charts/DepthChart/index.tsx
+++ b/frontend/src/components/Charts/DepthChart/index.tsx
@@ -55,14 +55,14 @@ const DepthChart: React.FC<DepthChartProps> = ({
   const [rangeSteps, setRangeSteps] = useState<number>(8);
   const [xRange, setXRange] = useState<number>(8);
   const [xType, setXType] = useState<string>('premium');
-  const [currencyCode, setCurrencyCode] = useState<number>(1);
+  const [currencyCode, setCurrencyCode] = useState<number>(0);
   const [center, setCenter] = useState<number>();
 
   const height = maxHeight < 10 ? 10 : maxHeight;
   const width = maxWidth < 10 ? 10 : maxWidth > 72.8 ? 72.8 : maxWidth;
 
   useEffect(() => {
-    setCurrencyCode(fav.currency === 0 ? 1 : fav.currency);
+    setCurrencyCode(fav.currency);  // as selected in BookControl
   }, [fav.currency]);
 
   useEffect(() => {
@@ -74,7 +74,7 @@ const DepthChart: React.FC<DepthChartProps> = ({
           const originalPrice =
             (limits[order.currency]?.price ?? 0) * (1 + parseFloat(order.premium) / 100);
           const currencyPrice =
-            (limits[currencyCode]?.price ?? 0) * (1 + parseFloat(order.premium) / 100);
+            (limits[currencyCode || 1]?.price ?? 0) * (1 + parseFloat(order.premium) / 100);
 
           const originalAmount =
             order.has_range && order.max_amount
@@ -124,10 +124,22 @@ const DepthChart: React.FC<DepthChartProps> = ({
   const generateSeries: () => void = () => {
     const sortedOrders: PublicOrder[] =
       xType === 'base_price'
-        ? enrichedOrders.sort(
-            (order1, order2) => (order1?.base_price ?? 0) - (order2?.base_price ?? 0),
-          )
-        : enrichedOrders.sort((order1, order2) => order1?.premium - order2?.premium);
+        ? enrichedOrders
+            .filter(
+              (order: PublicOrder | null) => currencyCode === 0 || order?.currency == currencyCode,
+            )
+            .sort(
+              (order1: PublicOrder | null, order2: PublicOrder | null) =>
+                (order1?.base_price ?? 0) - (order2?.base_price ?? 0),
+            )
+        : enrichedOrders
+            .filter(
+              (order: PublicOrder | null) => currencyCode === 0 || order?.currency == currencyCode,
+            )
+            .sort(
+              (order1: PublicOrder | null, order2: PublicOrder | null) =>
+                order1?.premium - order2?.premium,
+            );
 
     const sortedBuyOrders: PublicOrder[] = sortedOrders
       .filter((order) => order?.type === 0)
@@ -317,7 +329,7 @@ const DepthChart: React.FC<DepthChartProps> = ({
                 <Grid item>
                   <Box justifyContent='center'>
                     {xType === 'base_price'
-                      ? `${center} ${String(currencyDict[currencyCode])}`
+                      ? `${center} ${String(currencyDict[(currencyCode || 1) as keyof object])}`
                       : `${String(center.toPrecision(3))}%`}
                   </Box>
                 </Grid>
diff --git a/frontend/src/components/Dialogs/Exchange.tsx b/frontend/src/components/Dialogs/Exchange.tsx
index 91f8ed5d..32669465 100644
--- a/frontend/src/components/Dialogs/Exchange.tsx
+++ b/frontend/src/components/Dialogs/Exchange.tsx
@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import {
@@ -35,10 +35,19 @@ interface Props {
 const ExchangeDialog = ({ open = false, onClose }: Props): JSX.Element => {
   const { t } = useTranslation();
   const { federation } = useContext(FederationContext);
+  const [loadingInfo, setLoadingInfo] = useState<boolean>(true);
+
+  useEffect(() => {
+    if (open) federation.loadInfo();
+  }, [open]);
+
+  useEffect(() => {
+    setLoadingInfo(federation.loading);
+  }, [federation.loading]);
 
   return (
     <Dialog open={open} onClose={onClose}>
-      <div style={federation.loading ? {} : { display: 'none' }}>
+      <div style={loadingInfo ? {} : { display: 'none' }}>
         <LinearProgress variant='indeterminate' />
       </div>
       <DialogContent>
diff --git a/frontend/src/components/MakerForm/MakerForm.tsx b/frontend/src/components/MakerForm/MakerForm.tsx
index 06c9932e..e0dc2f15 100644
--- a/frontend/src/components/MakerForm/MakerForm.tsx
+++ b/frontend/src/components/MakerForm/MakerForm.tsx
@@ -86,6 +86,10 @@ const MakerForm = ({
   const minRangeAmountMultiple = 1.6;
   const amountSafeThresholds = [1.03, 0.98];
 
+  useEffect(() => {
+    federation.loadInfo();
+  }, []);
+
   useEffect(() => {
     setCurrencyCode(currencyDict[fav.currency === 0 ? 1 : fav.currency]);
   }, [federationUpdatedAt]);
diff --git a/frontend/src/components/MakerForm/SelectCoordinator.tsx b/frontend/src/components/MakerForm/SelectCoordinator.tsx
index 077c6bd8..fe7208bc 100644
--- a/frontend/src/components/MakerForm/SelectCoordinator.tsx
+++ b/frontend/src/components/MakerForm/SelectCoordinator.tsx
@@ -8,8 +8,9 @@ import {
   Typography,
   type SelectChangeEvent,
   CircularProgress,
+  Stack,
 } from '@mui/material';
-
+import { Bolt, Link, Info } from '@mui/icons-material';
 import RobotAvatar from '../RobotAvatar';
 import { AppContext, type UseAppStoreType } from '../../contexts/AppContext';
 import { useTheme } from '@emotion/react';
@@ -44,35 +45,37 @@ const SelectCoordinator: React.FC<SelectCoordinatorProps> = ({
 
   return (
     <Grid item>
-      <Tooltip
-        placement='top'
-        enterTouchDelay={500}
-        enterDelay={700}
-        enterNextDelay={2000}
-        title={t(
-          'The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!',
-        )}
+      <Box
+        sx={{
+          backgroundColor: 'background.paper',
+          border: '1px solid',
+          borderRadius: '4px',
+          borderColor: theme.palette.mode === 'dark' ? '#434343' : '#c4c4c4',
+          '&:hover': {
+            borderColor: theme.palette.mode === 'dark' ? '#ffffff' : '#2f2f2f',
+          },
+        }}
       >
-        <Box
-          sx={{
-            backgroundColor: 'background.paper',
-            border: '1px solid',
-            borderRadius: '4px',
-            borderColor: theme.palette.mode === 'dark' ? '#434343' : '#c4c4c4',
-            '&:hover': {
-              borderColor: theme.palette.mode === 'dark' ? '#ffffff' : '#2f2f2f',
-            },
-          }}
+        <Tooltip
+          placement='top'
+          enterTouchDelay={500}
+          enterDelay={700}
+          enterNextDelay={2000}
+          title={t(
+            'The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!',
+          )}
         >
-          <Typography variant='caption' color='text.secondary'>
-            &nbsp;{t('Order Host')}
-          </Typography>
-
-          <Grid container>
+          <Grid container style={{ marginTop: 10 }}>
             <Grid
               item
               xs={3}
-              sx={{ cursor: 'pointer', position: 'relative', left: '0.3em', bottom: '0.1em' }}
+              sx={{
+                cursor: 'pointer',
+                position: 'relative',
+                left: '0.3em',
+                bottom: '0.1em',
+                marginBottom: 1,
+              }}
               onClick={() => {
                 onClickCurrentCoordinator(coordinatorAlias);
               }}
@@ -123,8 +126,81 @@ const SelectCoordinator: React.FC<SelectCoordinatorProps> = ({
               </Select>
             </Grid>
           </Grid>
-        </Box>
-      </Tooltip>
+        </Tooltip>
+        <Grid container>
+          <Grid item>
+            <Stack direction='row' alignContent='center' spacing={2} style={{ flexGrow: 1 }}>
+              <Grid item>
+                <Tooltip
+                  placement='top'
+                  enterTouchDelay={500}
+                  enterDelay={700}
+                  enterNextDelay={2000}
+                  title={t('Maker fee')}
+                >
+                  <Typography
+                    color='text.secondary'
+                    variant='caption'
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                    }}
+                  >
+                    &nbsp;{t('Maker')[0]} {((coordinator?.info?.maker_fee ?? 0) * 100).toFixed(3)}%
+                  </Typography>
+                </Tooltip>
+              </Grid>
+              <Grid item>
+                <Tooltip
+                  placement='top'
+                  enterTouchDelay={500}
+                  enterDelay={700}
+                  enterNextDelay={2000}
+                  title={t('Taker fee')}
+                >
+                  <Typography
+                    color='text.secondary'
+                    variant='caption'
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                    }}
+                  >
+                    &nbsp;{t('Taker')[0]} {((coordinator?.info?.taker_fee ?? 0) * 100).toFixed(3)}%
+                  </Typography>
+                </Tooltip>
+              </Grid>
+              <Grid item>
+                <Tooltip
+                  placement='top'
+                  enterTouchDelay={500}
+                  enterDelay={700}
+                  enterNextDelay={2000}
+                  title={
+                    coordinator?.info?.swap_enabled
+                      ? t('Onchain payouts enabled')
+                      : t('Onchain payouts disabled')
+                  }
+                >
+                  <Typography
+                    color={coordinator?.info?.swap_enabled ? 'primary' : 'text.secondary'}
+                    variant='caption'
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center',
+                    }}
+                  >
+                    <Link sx={{ height: 16 }} />{' '}
+                    {coordinator?.info?.swap_enabled
+                      ? `${(coordinator?.info?.current_swap_fee_rate ?? 0).toFixed(1)}%`
+                      : t('Disabled')}
+                  </Typography>
+                </Tooltip>
+              </Grid>
+            </Stack>
+          </Grid>
+        </Grid>
+      </Box>
     </Grid>
   );
 };
diff --git a/frontend/src/models/Federation.model.ts b/frontend/src/models/Federation.model.ts
index ca00304e..14e45818 100644
--- a/frontend/src/models/Federation.model.ts
+++ b/frontend/src/models/Federation.model.ts
@@ -176,10 +176,14 @@ export class Federation {
       lifetime_volume: 0,
       version: { major: 0, minor: 0, patch: 0 },
     };
+    this.loading = true;
+    this.exchange.onlineCoordinators = 0;
+    this.exchange.loadingCoordinators = Object.keys(this.coordinators).length;
     this.updateEnabledCoordinators();
 
     for (const coor of Object.values(this.coordinators)) {
       coor.loadInfo(() => {
+        this.exchange.onlineCoordinators = this.exchange.onlineCoordinators + 1;
         this.onCoordinatorSaved();
       });
     }
@@ -202,14 +206,15 @@ export class Federation {
   loadBook = async (): Promise<void> => {
     if (this.connection !== 'api') return;
 
-    this.loading = true;
     this.book = {};
-    this.triggerHook('onFederationUpdate');
+    this.loading = true;
+    this.exchange.onlineCoordinators = 0;
     this.exchange.loadingCoordinators = Object.keys(this.coordinators).length;
+    this.triggerHook('onFederationUpdate');
     for (const coor of Object.values(this.coordinators)) {
       coor.loadBook(() => {
+        this.exchange.onlineCoordinators = this.exchange.onlineCoordinators + 1;
         this.onCoordinatorSaved();
-        this.triggerHook('onFederationUpdate');
       });
     }
   };
diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json
index 4eb18cff..04554b11 100644
--- a/frontend/static/locales/ca.json
+++ b/frontend/static/locales/ca.json
@@ -412,6 +412,10 @@
   "You send approx {{swapSats}} LN Sats (fees might vary)": "Envies aprox. {{swapSats}} LN Sats (les taxes poden variar)",
   "Your order fixed exchange rate": "La tasa de canvi fixa de la teva ordre",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
+  "Disabled": "Disabled",
+  "Maker": "Creador",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Prenedor",
   "Order Host": "Amfitrió de l'ordre",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "El proveïdor de la infraestructura LN i comunicacions. L'amfitrió serà l'encarregat de donar suport i resoldre disputes. LEs comissions de les transaccions són fixades per l'amfitrió. Assegureu-vos de seleccionar només els amfitrions en què confieu!",
   "#41": "Phrases in components/Notifications/index.tsx",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Fosc",
-  "Disabled": "Disabled",
   "Light": "Clar",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Taxa de canvi del contracte",
   "Coordinator trade revenue": "Ingressos pel coordinador de l'intercanvi",
   "Export trade summary": "Exportar el resumen d'intercanvi",
-  "Maker": "Creador",
   "Maker bond": "Fiança de creador",
   "Mining fee": "Comissió minera",
   "Onchain swap fee": "Taxa de swap onchain",
@@ -529,7 +531,6 @@
   "Routing budget": "Pressupost d'enrutament",
   "Seller": "Venda",
   "Sent": "Enviat",
-  "Taker": "Prenedor",
   "Taker bond": "Fiança de prenedor",
   "Timestamp": "Marca d'hora",
   "Trade Summary": "Resum de l'intercanvi",
diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json
index c75268f7..ccc21430 100644
--- a/frontend/static/locales/cs.json
+++ b/frontend/static/locales/cs.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Pevný směnný kurz tvé nabídky",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Tvůrce",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Příjemce",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Dark",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Contract exchange rate",
   "Coordinator trade revenue": "Coordinator trade revenue",
   "Export trade summary": "Export trade summary",
-  "Maker": "Tvůrce",
   "Maker bond": "Kauce tvůrce",
   "Mining fee": "Těžební poplatek",
   "Onchain swap fee": "Onchain swap poplatek",
@@ -529,7 +531,6 @@
   "Routing budget": "Routing budget",
   "Seller": "Prodavající",
   "Sent": "Odesláno",
-  "Taker": "Příjemce",
   "Taker bond": "Kauce příjemce",
   "Timestamp": "Timestamp",
   "Trade Summary": "Shrnutí obchodu",
diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json
index 4d2f83b3..5359bc6b 100644
--- a/frontend/static/locales/de.json
+++ b/frontend/static/locales/de.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Dein fixierter Order-Kurs",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Maker",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Dark",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Contract exchange rate",
   "Coordinator trade revenue": "Coordinator trade revenue",
   "Export trade summary": "Export trade summary",
-  "Maker": "Maker",
   "Maker bond": "Maker bond",
   "Mining fee": "Mining fee",
   "Onchain swap fee": "Onchain swap fee",
@@ -529,7 +531,6 @@
   "Routing budget": "Routing budget",
   "Seller": "Verkäufer",
   "Sent": "Sent",
-  "Taker": "Taker",
   "Taker bond": "Taker bond",
   "Timestamp": "Timestamp",
   "Trade Summary": "Trade Summary",
diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json
index 98fab6f4..343abb72 100644
--- a/frontend/static/locales/en.json
+++ b/frontend/static/locales/en.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Your order fixed exchange rate",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Maker",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Dark",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Contract exchange rate",
   "Coordinator trade revenue": "Coordinator trade revenue",
   "Export trade summary": "Export trade summary",
-  "Maker": "Maker",
   "Maker bond": "Maker bond",
   "Mining fee": "Mining fee",
   "Onchain swap fee": "Onchain swap fee",
@@ -529,7 +531,6 @@
   "Routing budget": "Routing budget",
   "Seller": "Seller",
   "Sent": "Sent",
-  "Taker": "Taker",
   "Taker bond": "Taker bond",
   "Timestamp": "Timestamp",
   "Trade Summary": "Trade Summary",
diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json
index b5b2f993..fbc5fcfe 100644
--- a/frontend/static/locales/es.json
+++ b/frontend/static/locales/es.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "La tasa de cambio fija de tu orden",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Creador",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Tomador",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Enrutado Lightning fallido",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Oscuro",
-  "Disabled": "Disabled",
   "Light": "Claro",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Tasa de cambio del contrato",
   "Coordinator trade revenue": "Recompensa para el coordinador del intercambio",
   "Export trade summary": "Exportar el resumen de la transacción",
-  "Maker": "Creador",
   "Maker bond": "Fianza de creador",
   "Mining fee": "Comisión minera",
   "Onchain swap fee": "Comisión swap onchain",
@@ -529,7 +531,6 @@
   "Routing budget": "Presupuesto de enrutado",
   "Seller": "Vende",
   "Sent": "Enviado",
-  "Taker": "Tomador",
   "Taker bond": "Fianza de tomador",
   "Timestamp": "Marca de tiempo",
   "Trade Summary": "Resumen del intercambio",
diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json
index 31062642..3629d45d 100644
--- a/frontend/static/locales/eu.json
+++ b/frontend/static/locales/eu.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Zure eskaeraren kanbio-tasa finkoa",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Egile",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Hartzaile",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Dark",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Kontratuaren truke-tasa",
   "Coordinator trade revenue": "Coordinator trade revenue",
   "Export trade summary": "Export trade summary",
-  "Maker": "Egile",
   "Maker bond": "Egile fidantza",
   "Mining fee": "Meatzaritza kuota",
   "Onchain swap fee": "Onchain swap kuota",
@@ -529,7 +531,6 @@
   "Routing budget": "Routing budget",
   "Seller": "Saltzaile",
   "Sent": "Bidalita",
-  "Taker": "Hartzaile",
   "Taker bond": "Hartzaile fidantza",
   "Timestamp": "Amaiera ordua",
   "Trade Summary": "Salerosketaren laburpena",
diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json
index 82b365df..1b41a4b5 100644
--- a/frontend/static/locales/fr.json
+++ b/frontend/static/locales/fr.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Taux de change fixe de votre commande",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Auteur",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Preneur",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Échec routage Lightning",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Sombre",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Taux de change du contrat",
   "Coordinator trade revenue": "Revenue transaction coordinateur",
   "Export trade summary": "Export résumé transaction",
-  "Maker": "Auteur",
   "Maker bond": "Caution de l'auteur",
   "Mining fee": "Frais du minage",
   "Onchain swap fee": "Frais des échanges Onchain",
@@ -529,7 +531,6 @@
   "Routing budget": "Budget de routage",
   "Seller": "Vendeur",
   "Sent": "Envoyé",
-  "Taker": "Preneur",
   "Taker bond": "Preneur de la caution",
   "Timestamp": "Horodatage",
   "Trade Summary": "Résumé transaction",
diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json
index 9fc1aa88..cba7b356 100644
--- a/frontend/static/locales/it.json
+++ b/frontend/static/locales/it.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Il tasso di cambio fisso del tuo ordine",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Maker",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Routing Lightning fallito",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Scuro",
-  "Disabled": "Disabled",
   "Light": "Chiaro",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Tasso di cambio contrattuale",
   "Coordinator trade revenue": "Guadagno del coordinatore",
   "Export trade summary": "Esporta riepilogo dello scambio",
-  "Maker": "Maker",
   "Maker bond": "Cauzione del maker",
   "Mining fee": "Commissione di mining",
   "Onchain swap fee": "Commissione di swap onchain",
@@ -529,7 +531,6 @@
   "Routing budget": "Budget di routing",
   "Seller": "Offerente",
   "Sent": "Inviato",
-  "Taker": "Taker",
   "Taker bond": "Cauzione del taker",
   "Timestamp": "Timestamp",
   "Trade Summary": "Riepilogo dello scambio",
diff --git a/frontend/static/locales/ja.json b/frontend/static/locales/ja.json
index 7d8a412a..fcd621b3 100644
--- a/frontend/static/locales/ja.json
+++ b/frontend/static/locales/ja.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "注文の固定為替レート",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "メーカー",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "テイカー",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "ライトニングのルーティングに失敗しました",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "ダーク",
-  "Disabled": "Disabled",
   "Light": "ライト",
   "Mainnet": "メインネット",
   "Testnet": "テストネット",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "契約為替レート",
   "Coordinator trade revenue": "取引コーディネーターの収益",
   "Export trade summary": "取引概要をエクスポートする",
-  "Maker": "メーカー",
   "Maker bond": "メーカーの担保金",
   "Mining fee": "マイニング手数料",
   "Onchain swap fee": "オンチェーンスワップ手数料",
@@ -529,7 +531,6 @@
   "Routing budget": "ルーティング予算",
   "Seller": "売り手",
   "Sent": "送信",
-  "Taker": "テイカー",
   "Taker bond": "テイカーの担保金",
   "Timestamp": "タイムスタンプ",
   "Trade Summary": "取引概要",
diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json
index aa60ffa6..b5bf7351 100644
--- a/frontend/static/locales/pl.json
+++ b/frontend/static/locales/pl.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Your order fixed exchange rate",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Maker",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Dark",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Contract exchange rate",
   "Coordinator trade revenue": "Coordinator trade revenue",
   "Export trade summary": "Export trade summary",
-  "Maker": "Maker",
   "Maker bond": "Maker bond",
   "Mining fee": "Mining fee",
   "Onchain swap fee": "Onchain swap fee",
@@ -529,7 +531,6 @@
   "Routing budget": "Routing budget",
   "Seller": "Sprzedawca",
   "Sent": "Sent",
-  "Taker": "Taker",
   "Taker bond": "Taker bond",
   "Timestamp": "Timestamp",
   "Trade Summary": "Trade Summary",
diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json
index f76d0fa8..132a612a 100644
--- a/frontend/static/locales/pt.json
+++ b/frontend/static/locales/pt.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Taxa de câmbio fixa do seu pedido",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Maker",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Dark",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Contract exchange rate",
   "Coordinator trade revenue": "Coordinator trade revenue",
   "Export trade summary": "Export trade summary",
-  "Maker": "Maker",
   "Maker bond": "Maker bond",
   "Mining fee": "Taxa de mineração",
   "Onchain swap fee": "Onchain swap fee",
@@ -529,7 +531,6 @@
   "Routing budget": "Routing budget",
   "Seller": "Vedendor",
   "Sent": "Sent",
-  "Taker": "Taker",
   "Taker bond": "Taker bond",
   "Timestamp": "Timestamp",
   "Trade Summary": "Trade Summary",
diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json
index 1389753e..0471375e 100644
--- a/frontend/static/locales/ru.json
+++ b/frontend/static/locales/ru.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Фиксированный курс обмена Вашего ордера",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Мейкер",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Тейкер",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Маршрутизация Lightning не удалась",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Темный",
-  "Disabled": "Disabled",
   "Light": "Светлый",
   "Mainnet": "Основная сеть",
   "Testnet": "Тестовая сеть",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Курс обмена контракта",
   "Coordinator trade revenue": "Доход координатора сделки",
   "Export trade summary": "Экспортировать сводку торговли",
-  "Maker": "Мейкер",
   "Maker bond": "Залог мейкера",
   "Mining fee": "Комиссия майнерам",
   "Onchain swap fee": "Комиссия за ончйн обмен",
@@ -529,7 +531,6 @@
   "Routing budget": "Бюджет маршрутизации",
   "Seller": "Продавец",
   "Sent": "Отправлено",
-  "Taker": "Тейкер",
   "Taker bond": "Залог тейкера",
   "Timestamp": "Временная метка",
   "Trade Summary": "Сводка Сделки",
diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json
index 497132a0..8be59df0 100644
--- a/frontend/static/locales/sv.json
+++ b/frontend/static/locales/sv.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Din orders fasta växelkurs",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Maker",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Dark",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Contract exchange rate",
   "Coordinator trade revenue": "Coordinator trade revenue",
   "Export trade summary": "Export trade summary",
-  "Maker": "Maker",
   "Maker bond": "Maker bond",
   "Mining fee": "Miningavgift",
   "Onchain swap fee": "Onchain swap fee",
@@ -529,7 +531,6 @@
   "Routing budget": "Routing budget",
   "Seller": "Säljare",
   "Sent": "Sent",
-  "Taker": "Taker",
   "Taker bond": "Taker bond",
   "Timestamp": "Timestamp",
   "Trade Summary": "Trade Summary",
diff --git a/frontend/static/locales/sw.json b/frontend/static/locales/sw.json
index c5528803..be9a5c84 100644
--- a/frontend/static/locales/sw.json
+++ b/frontend/static/locales/sw.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "Kiwango chako cha kubadilisha cha amri",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Muumba",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Mpokeaji",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Uhamishaji wa Lightning umeshindwa",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Giza",
-  "Disabled": "Disabled",
   "Light": "Nuru",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "Kiwango cha ubadilishaji wa mkataba",
   "Coordinator trade revenue": "Mapato ya biashara ya mratibu",
   "Export trade summary": "Hamisha muhtasari wa biashara",
-  "Maker": "Muumba",
   "Maker bond": "Dhamana ya Muumba",
   "Mining fee": "Ada ya uchimbaji madini",
   "Onchain swap fee": "Ada ya kubadilisha sarafu kwenye mnyororo",
@@ -529,7 +531,6 @@
   "Routing budget": "Bajeti ya urudishaji",
   "Seller": "Muuzaji",
   "Sent": "Imetumwa",
-  "Taker": "Mpokeaji",
   "Taker bond": "Dhamana ya Mpokeaji",
   "Timestamp": "Timestamp",
   "Trade Summary": "Muhtasari wa Biashara",
diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json
index 35509007..ab2deea3 100644
--- a/frontend/static/locales/th.json
+++ b/frontend/static/locales/th.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "คุณกำหนดอัตราแลกเปลี่ยนคงที่",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "Maker",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "Taker",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "Dark",
-  "Disabled": "Disabled",
   "Light": "Light",
   "Mainnet": "Mainnet",
   "Testnet": "Testnet",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "อัตราแลกเปลี่ยน",
   "Coordinator trade revenue": "Coordinator trade revenue",
   "Export trade summary": "Export trade summary",
-  "Maker": "Maker",
   "Maker bond": "Maker bond",
   "Mining fee": "ค่าธรรมเนียมการขุด",
   "Onchain swap fee": "ค่าธรรมเนียมการสลับ Onchain",
@@ -529,7 +531,6 @@
   "Routing budget": "Routing budget",
   "Seller": "ผู้ขาย",
   "Sent": "ส่งแล้ว",
-  "Taker": "Taker",
   "Taker bond": "Taker bond",
   "Timestamp": "ประทับเวลา",
   "Trade Summary": "สรุปการซื้อขาย",
diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json
index a0551d10..db8c2c8f 100644
--- a/frontend/static/locales/zh-SI.json
+++ b/frontend/static/locales/zh-SI.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "你的订单的固定汇率",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "挂单方",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "吃单方",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "闪电路由失败",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "深色",
-  "Disabled": "Disabled",
   "Light": "浅色",
   "Mainnet": "主网",
   "Testnet": "测试网",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "合约交易率",
   "Coordinator trade revenue": "协调器交易收入",
   "Export trade summary": "导出交易概要",
-  "Maker": "挂单方",
   "Maker bond": "挂单方保证金",
   "Mining fee": "挖矿费",
   "Onchain swap fee": "链上交换费",
@@ -529,7 +531,6 @@
   "Routing budget": "路由预算",
   "Seller": "卖方",
   "Sent": "已发送",
-  "Taker": "吃单方",
   "Taker bond": "吃单方保证金",
   "Timestamp": "时间戳",
   "Trade Summary": "交易概括",
diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json
index e3b129f1..3244a56f 100644
--- a/frontend/static/locales/zh-TR.json
+++ b/frontend/static/locales/zh-TR.json
@@ -413,6 +413,10 @@
   "Your order fixed exchange rate": "你的訂單的固定匯率",
   "#40": "Phrases in components/MakerForm/SelectCoordinator.tsx",
   "Order Host": "Order Host",
+  "Disabled": "Disabled",
+  "Maker": "掛單方",
+  "Onchain payouts enabled": "Onchain payouts enabled",
+  "Taker": "吃單方",
   "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!": "The provider the lightning and communication infrastructure. The host will be in charge of providing support and solving disputes. The trade fees are set by the host. Make sure to only select order hosts that you trust!",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "閃電路由失敗",
@@ -498,7 +502,6 @@
   "API": "API",
   "Build-in": "Build-in",
   "Dark": "深色",
-  "Disabled": "Disabled",
   "Light": "淺色",
   "Mainnet": "主網",
   "Testnet": "測試網",
@@ -521,7 +524,6 @@
   "Contract exchange rate": "合約交易率",
   "Coordinator trade revenue": "協調器交易收入",
   "Export trade summary": "導出交易概要",
-  "Maker": "掛單方",
   "Maker bond": "掛單方保證金",
   "Mining fee": "挖礦費",
   "Onchain swap fee": "鏈上交換費",
@@ -529,7 +531,6 @@
   "Routing budget": "路由預算",
   "Seller": "賣方",
   "Sent": "已發送",
-  "Taker": "吃單方",
   "Taker bond": "吃單方保證金",
   "Timestamp": "時間戳",
   "Trade Summary": "交易概括",
diff --git a/mobile/android/app/build.gradle b/mobile/android/app/build.gradle
index ca8e9077..44bc1ccb 100644
--- a/mobile/android/app/build.gradle
+++ b/mobile/android/app/build.gradle
@@ -124,7 +124,7 @@ def enableHermes = project.ext.react.get("enableHermes", false);
  */
 def reactNativeArchitectures() {
     def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+    return value ? value.split(",") : ["armeabi-v7a", "x86_64", "arm64-v8a"]
 }
 
 android {
@@ -144,7 +144,6 @@ android {
         pickFirst 'lib/armeabi-v7a/libruntimeexecutor.so'
         pickFirst 'lib/arm64-v8a/libruntimeexecutor.so'
         pickFirst 'lib/x86_64/libruntimeexecutor.so'
-        pickFirst 'lib/x86/libruntimeexecutor.so'
     }
 
     defaultConfig {
@@ -264,7 +263,7 @@ android {
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
             // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
-            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
+            def versionCodes = ["armeabi-v7a": 1, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
diff --git a/mobile/android/app/src/main/jniLibs/arm64-v8a/librobohash.so b/mobile/android/app/src/main/jniLibs/arm64-v8a/librobohash.so
index 8bc01999..bbff4071 100755
Binary files a/mobile/android/app/src/main/jniLibs/arm64-v8a/librobohash.so and b/mobile/android/app/src/main/jniLibs/arm64-v8a/librobohash.so differ
diff --git a/mobile/android/app/src/main/jniLibs/arm64-v8a/librobonames.so b/mobile/android/app/src/main/jniLibs/arm64-v8a/librobonames.so
index 3e13c6d8..56655ed8 100755
Binary files a/mobile/android/app/src/main/jniLibs/arm64-v8a/librobonames.so and b/mobile/android/app/src/main/jniLibs/arm64-v8a/librobonames.so differ
diff --git a/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobohash.so b/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobohash.so
index 3775d2f0..373f2b99 100755
Binary files a/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobohash.so and b/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobohash.so differ
diff --git a/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobonames.so b/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobonames.so
index 2cf9568e..3f42760d 100755
Binary files a/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobonames.so and b/mobile/android/app/src/main/jniLibs/armeabi-v7a/librobonames.so differ
diff --git a/mobile/android/gradle.properties b/mobile/android/gradle.properties
index cda6f739..b0f06848 100644
--- a/mobile/android/gradle.properties
+++ b/mobile/android/gradle.properties
@@ -27,7 +27,7 @@ android.enableJetifier=true
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
-reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
+reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86_64
 
 # Use this property to enable support to the new architecture.
 # This will allow you to use TurboModules and the Fabric render in
diff --git a/release_notes.md b/release_notes.md
index 3c9ed281..5b11ba25 100644
--- a/release_notes.md
+++ b/release_notes.md
@@ -30,9 +30,9 @@ Alternatively you can also verify with the release with the SHA256 checksum.
 **Download the Desktop App zip file**
 Find the zip file that suits with your operative system:
 
-- [Windows](https://github.com/RoboSats/robosats/releases/download/v0.7.2-alpha/robosats-desktop-v0.7.2-alpha-win32-ia32.zip)
-- [Mac](https://github.com/RoboSats/robosats/releases/download/v0.7.2-alpha/robosats-desktop-v0.7.2-alpha-mac-darwin-x64.zip)
-- [Linux](https://github.com/RoboSats/robosats/releases/download/v0.7.2-alpha/robosats-desktop-v0.7.2-alpha-linux-x64.zip)
+- [Windows](https://github.com/RoboSats/robosats/releases/download/v0.7.2-alpha/robosats-desktop-v0.7.2.alpha-win32-ia32.zip)
+- [Mac](https://github.com/RoboSats/robosats/releases/download/v0.7.2-alpha/robosats-desktop-v0.7.2.alpha-mac-darwin-x64.zip)
+- [Linux](https://github.com/RoboSats/robosats/releases/download/v0.7.2-alpha/robosats-desktop-v0.7.2.alpha-linux-x64.zip)
 
 
 ### Verify the app using GPG: