Merge branch 'main' into allow-multiple-takers

Author: KoalaSat

.github/workflows/android-build.yml

@@ -32,7 +32,7 @@ jobs:
 
       - name: 'Download Android Web.bundle Artifact (built frontend)'
         if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
-        uses: dawidd6/action-download-artifact@v7
+        uses: dawidd6/action-download-artifact@v9
         with:
           workflow: frontend-build.yml
           workflow_conclusion: success
@@ -135,7 +135,7 @@ jobs:
       - name: 'Create Pre-release'
         id: create_release
         if: inputs.semver == ''  # only if this workflow is not called from a push to tag (a Release)
-        uses: ncipollo/release-action@v1.13.0
+        uses: ncipollo/release-action@v1.16.0
         with:
           tag: android-${{ steps.commit.outputs.short }}
           name: robosats-android-${{ steps.commit.outputs.short }}

.github/workflows/coordinator-image.yml

@@ -17,7 +17,7 @@ jobs:
 
     - name: 'Download Basic main.js Artifact'
       if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
-      uses: dawidd6/action-download-artifact@v7
+      uses: dawidd6/action-download-artifact@v9
       with:
         workflow: frontend-build.yml
         workflow_conclusion: success

.github/workflows/desktop-build.yml

@@ -29,7 +29,7 @@ jobs:
 
       - name: 'Download Basic main.js Artifact'
         if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
-        uses: dawidd6/action-download-artifact@v7
+        uses: dawidd6/action-download-artifact@v9
         with:
           workflow: frontend-build.yml
           workflow_conclusion: success

.github/workflows/integration-tests.yml

@@ -31,7 +31,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: 'Download static files Artifact'
-      uses: dawidd6/action-download-artifact@v7
+      uses: dawidd6/action-download-artifact@v9
       with:
         workflow: frontend-build.yml
         workflow_conclusion: success
@@ -51,7 +51,7 @@ jobs:
           coordinator-docker-cache-
 
     - name: 'Compose Regtest Orchestration'
-      uses: isbang/compose-action@v1.5.1
+      uses: isbang/compose-action@v2.2.0
       with:
         compose-file: "./docker-tests.yml"
         down-flags: "--volumes"

.github/workflows/selfhosted-client-image.yml

@@ -23,7 +23,7 @@ jobs:
 
     - name: 'Download Basic main.js Artifact'
       if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
-      uses: dawidd6/action-download-artifact@v7
+      uses: dawidd6/action-download-artifact@v9
       with:
         workflow: frontend-build.yml
         workflow_conclusion: success

.github/workflows/web-client-image.yml

@@ -23,7 +23,7 @@ jobs:
 
     - name: 'Download Basic main.js Artifact'
       if: inputs.semver == ''  # Only if workflow fired from frontend-build.yml
-      uses: dawidd6/action-download-artifact@v7
+      uses: dawidd6/action-download-artifact@v9
       with:
         workflow: frontend-build.yml
         workflow_conclusion: success

frontend/src/components/MakerForm/SelectCoordinator.tsx

@@ -9,6 +9,7 @@ import {
   type SelectChangeEvent,
   CircularProgress,
   Stack,
+  Alert,
 } from '@mui/material';
 import { Link } from '@mui/icons-material';
 import RobotAvatar from '../RobotAvatar';
@@ -45,6 +46,13 @@ const SelectCoordinator: React.FC<SelectCoordinatorProps> = ({
 
   return (
     <Grid item>
+      {coordinator?.info && !coordinator?.info?.swap_enabled && (
+        <Grid sx={{ marginBottom: 1 }}>
+          <Alert severity='warning' sx={{ marginTop: 2 }}>
+            {t('This coordinator does not support on-chain swaps.')}
+          </Alert>
+        </Grid>
+      )}
       <Box
         sx={{
           backgroundColor: 'background.paper',

frontend/static/locales/ca.json

@@ -415,6 +415,7 @@
   "Onchain payouts enabled": "Onchain payouts enabled",
   "Taker": "Prenedor",
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "L'enrutament Lightning ha fallat",
   "New chat message": "Nou missatge al xat",

frontend/static/locales/cs.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",

frontend/static/locales/de.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",

frontend/static/locales/en.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",

frontend/static/locales/es.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "Este coordinador no soporta pagos on-chain.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Enrutado Lightning fallido",
   "New chat message": "Nuevo mensaje en el chat",

frontend/static/locales/eu.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",

frontend/static/locales/fr.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Échec routage Lightning",
   "New chat message": "Nouveau message chat",

frontend/static/locales/it.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Routing Lightning fallito",
   "New chat message": "Nuovo messaggio in chat",

frontend/static/locales/ja.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "ライトニングのルーティングに失敗しました",
   "New chat message": "チャットに新しいメッセージがあります",

frontend/static/locales/pl.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",

frontend/static/locales/pt.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "Nova mensagem de chat",

frontend/static/locales/ru.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Маршрутизация Lightning не удалась",
   "New chat message": "Новое сообщение в чате",

frontend/static/locales/sv.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",

frontend/static/locales/sw.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Uhamishaji wa Lightning umeshindwa",
   "New chat message": "Ujumbe mpya wa mazungumzo",

frontend/static/locales/th.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "Lightning routing failed",
   "New chat message": "New chat message",

frontend/static/locales/zh-SI.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "闪电路由失败",
   "New chat message": "新消息",

frontend/static/locales/zh-TR.json

@@ -415,6 +415,7 @@
   "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!",
+  "This coordinator does not support on-chain swaps.": "This coordinator does not support on-chain swaps.",
   "#41": "Phrases in components/Notifications/index.tsx",
   "Lightning routing failed": "閃電路由失敗",
   "New chat message": "新消息",

mobile/android/app/build.gradle

@@ -296,7 +296,7 @@ dependencies {
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
     implementation "io.matthewnelson.kotlin-components:kmp-tor:4.8.6-0-1.4.4"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.10.1"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
 
     if (enableHermes) {

mobile/android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         minSdkVersion = 26
         compileSdkVersion = 33
         targetSdkVersion = 33
-        kotlin_version = "2.1.0"
+        kotlin_version = "2.1.10"
 
         if (System.properties['os.arch'] == "aarch64") {
             // For M1 Users we need to use the NDK 24 which added support for aarch64