Merge pull request #1894 from RoboSats/pre-release-fixes

KoalaSat · web-flow · commit 272413faa9e6 · 2025-04-30T14:52:04.000Z
v0.7.7 pre release fixes
diff --git a/frontend/src/components/Dialogs/Coordinator.tsx b/frontend/src/components/Dialogs/Coordinator.tsx
@@ -525,29 +525,31 @@ const CoordinatorDialog = ({ open = false, onClose, shortAlias }: Props): JSX.El
             />
           </ListItem>
 
-          <ListItemButton
-            target='_blank'
-            href={coordinator?.[settings.network][settings.selfhostedClient ? 'onion' : origin]}
-            rel='noreferrer'
-          >
-            <ListItemIcon>
-              <Web />
-            </ListItemIcon>
-            <ListItemText
-              secondary={t('Coordinator hosted web app')}
-              primaryTypographyProps={{
-                style: {
-                  maxWidth: '20em',
-                  wordWrap: 'break-word',
-                  overflowWrap: 'break-word',
-                },
-              }}
+          {coordinator?.[settings.network] && (
+            <ListItemButton
+              target='_blank'
+              href={coordinator[settings.network][settings.selfhostedClient ? 'onion' : origin]}
+              rel='noreferrer'
             >
-              {`${String(
-                coordinator?.[settings.network][settings.selfhostedClient ? 'onion' : origin],
-              )}`}
-            </ListItemText>
-          </ListItemButton>
+              <ListItemIcon>
+                <Web />
+              </ListItemIcon>
+              <ListItemText
+                secondary={t('Coordinator hosted web app')}
+                primaryTypographyProps={{
+                  style: {
+                    maxWidth: '20em',
+                    wordWrap: 'break-word',
+                    overflowWrap: 'break-word',
+                  },
+                }}
+              >
+                {`${String(
+                  coordinator?.[settings.network][settings.selfhostedClient ? 'onion' : origin],
+                )}`}
+              </ListItemText>
+            </ListItemButton>
+          )}
         </List>
 
         {!coordinator || coordinator?.loadingInfo ? (
diff --git a/frontend/src/components/TradeBox/CancelButton.tsx b/frontend/src/components/TradeBox/CancelButton.tsx
@@ -27,6 +27,7 @@ const CancelButton = ({
     Boolean(order?.is_maker && [0, 1, 2].includes(order?.status)) ||
     Boolean([3, 6, 7].includes(order?.status ?? -1));
   const showCollabCancelButton = order?.status === 9 && !order?.asked_for_cancel;
+  const unTaken = Boolean(order?.is_maker && [1, 2].includes(order?.status));
   const noConfirmation =
     Boolean(order?.is_maker && [0, 1, 2].includes(order?.status)) ||
     Boolean(order?.is_taker && order?.status === 3);
@@ -55,7 +56,9 @@ const CancelButton = ({
                   ? () => {
                       setOpenCancelWarning(true);
                     }
-                  : openCancelDialog
+                  : unTaken
+                    ? onClickCancel
+                    : openCancelDialog
               }
             >
               {t('Cancel')}
diff --git a/frontend/src/models/Coordinator.model.ts b/frontend/src/models/Coordinator.model.ts
@@ -180,7 +180,7 @@ export class Coordinator {
       this.url = hostUrl;
       this.basePath = `/${settings.network}/${this.shortAlias}`;
     } else {
-      this.url = String(this[settings.network][origin]);
+      this.url = String(this[settings.network]?.[origin]);
       this.basePath = '';
     }
   };
diff --git a/frontend/src/models/Order.model.ts b/frontend/src/models/Order.model.ts
@@ -202,10 +202,10 @@ class Order {
     if (slot) {
       const coordinator = federation.getCoordinator(this.shortAlias);
       const { basePath, url } = coordinator;
+      const authHeaders = slot.getRobot()?.getAuthHeaders();
+      if (!authHeaders) return this;
       const data = await apiClient
-        .post(url + basePath, '/api/make/', body, {
-          tokenSHA256: slot?.getRobot()?.tokenSHA256 ?? '',
-        })
+        .post(url + basePath, '/api/make/', body, authHeaders)
         .catch((e) => {
           console.log(e);
         });
diff --git a/frontend/src/models/Robot.model.ts b/frontend/src/models/Robot.model.ts
@@ -57,6 +57,11 @@ class Robot {
     await apiClient
       .get(coordinator.url, `${coordinator.basePath}/api/robot/`, authHeaders)
       .then((data: any) => {
+        if (data?.bad_request) {
+          console.error(data?.bad_request);
+          return;
+        }
+
         this.update({
           nickname: data.nickname,
           activeOrderId: data.active_order_id ?? null,
diff --git a/frontend/src/services/RoboPool/index.ts b/frontend/src/services/RoboPool/index.ts
@@ -16,7 +16,7 @@ class RoboPool {
     this.relays = [];
     const federationRelays = Object.values(defaultFederation)
       .map((coord) => {
-        const url: string = coord[this.network][settings.selfhostedClient ? 'onion' : origin];
+        const url: string = coord[this.network]?.[settings.selfhostedClient ? 'onion' : origin];
 
         if (!url) return undefined;
 
diff --git a/frontend/src/utils/nostr.ts b/frontend/src/utils/nostr.ts
@@ -114,7 +114,11 @@ export const verifyCoordinatorToken: (event: Event) => boolean = (event) => {
   const hash = `${event.pubkey}${orderId ?? ''}`;
   const coordinatorPubKey = event.tags.find((t) => t[0] === 'p')?.[1];
   if (signature && coordinatorPubKey) {
-    return schnorr.verify(signature, hash, coordinatorPubKey);
+    try {
+      return schnorr.verify(signature, hash, coordinatorPubKey);
+    } catch (e) {
+      return false;
+    }
   }
   return false;
 };
diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json
@@ -479,7 +479,7 @@
   "The order has expired": "L'ordre a expiré",
   "The pinned location is approximate. The exact location for the meeting place must be exchanged in the encrypted chat.": "The pinned location is approximate. The exact location for the meeting place must be exchanged in the encrypted chat.",
   "You cannot take an order yet! Wait {{timeMin}}m {{timeSec}}s": "Vous ne pouvez pas encore prendre un ordre! Attendez {{timeMin}}m {{timeSec}}s",
-  "You receive via {{method}} {{amount}}": "Vous recevez via {{méthode}} {{montant}}",
+  "You receive via {{method}} {{amount}}": "Vous recevez via {{method}} {{amount}}",
   "You receive {{amount}} Sats (Approx)": "Vous recevez via Lightning {{amount}} Sats (environ)",
   "You send via Lightning {{amount}} Sats (Approx)": "Vous envoyez via Lightning {{amount}} Sats (environ)",
   "You send via {{method}} {{amount}}": "Vous envoyez via {{method}} {{amount}}",
@@ -570,10 +570,10 @@
   "#56": "Phrases in components/TradeBox/Dialogs/ConfirmFiatReceived.tsx",
   "Confirm": "Confirmer",
   "Confirm you received {{amount}} {{currencyCode}}?": "Confirmez que vous avez reçu les {{amount}} {{currencyCode}}?",
-  "Confirming that you received {{amount}} {{currencyCode}} will finalize the trade. The satoshis in the escrow will be released to the buyer. Only confirm after {{amount}} {{currencyCode}} have arrived to your account. Note that if you have received the payment and do not click confirm, you risk losing your bond.": "Confirmer que vous avez reçu {{montant}} {{currencyCode}} finalisera la transaction. Les satoshis en caution seront remis à l'acheteur. Ne confirmez qu'une fois que {{montant}} {{currencyCode}} sont arrivés sur votre compte. Notez que si vous avez reçu le paiement et que vous ne cliquez pas sur confirmer, vous risquez de perdre votre caution.",
+  "Confirming that you received {{amount}} {{currencyCode}} will finalize the trade. The satoshis in the escrow will be released to the buyer. Only confirm after {{amount}} {{currencyCode}} have arrived to your account. Note that if you have received the payment and do not click confirm, you risk losing your bond.": "Confirmer que vous avez reçu {{amount}} {{currencyCode}} finalisera la transaction. Les satoshis en caution seront remis à l'acheteur. Ne confirmez qu'une fois que {{amount}} {{currencyCode}} sont arrivés sur votre compte. Notez que si vous avez reçu le paiement et que vous ne cliquez pas sur confirmer, vous risquez de perdre votre caution.",
   "#57": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",
   "Confirm you sent {{amount}} {{currencyCode}}?": "Confirmez votre envoi {{amount}} {{currencyCode}}?",
-  "Confirming that you sent {{amount}} {{currencyCode}} will allow your peer to finalize the trade. If you have not yet sent it and you still proceed to falsely confirm, you risk losing your bond.": "Confirmer que vous avez envoyé {{montant}} {{currencyCode}} permettra à votre correspondant de finaliser la transaction. Si vous ne l'avez pas encore envoyé et que vous procédez à une fausse confirmation, vous risquez de perdre votre caution.",
+  "Confirming that you sent {{amount}} {{currencyCode}} will allow your peer to finalize the trade. If you have not yet sent it and you still proceed to falsely confirm, you risk losing your bond.": "Confirmer que vous avez envoyé {{amount}} {{currencyCode}} permettra à votre correspondant de finaliser la transaction. Si vous ne l'avez pas encore envoyé et que vous procédez à une fausse confirmation, vous risquez de perdre votre caution.",
   "#58": "Phrases in components/TradeBox/Dialogs/ConfirmUndoFiatSent.tsx",
   "READ. In case your payment to the seller has been blocked and it is absolutely impossible to finish the trade, you can revert your confirmation of \"Fiat sent\". Do so only if you and the seller have ALREADY AGREED in the chat to proceed to a collaborative cancellation. After confirming, the \"Collaborative cancel\" button will be visible again. Only click this button if you know what you are doing. First time users of RoboSats are highly discouraged from performing this action! Make 100% sure your payment has failed and the amount is in your account.": "LIRE. Si votre paiement au vendeur a été bloqué et qu'il est absolument impossible de terminer la transaction, vous pouvez annuler votre confirmation de vente de \"Fiat envoyé\". Ne le faites que si vous et le vendeur avez DÉJÀ ACCORDÉ dans le chat de procéder à une annulation collaborative. Après avoir confirmé, le bouton \"Annulation collaborative\" sera à nouveau visible. Ne cliquez sur ce bouton que si vous savez ce que vous faites. Il est fortement déconseillé aux nouveaux utilisateurs de RoboSats d'effectuer cette action ! Assurez-vous à 100 % que votre paiement a échoué et que le montant est sur votre compte.",
   "Revert the confirmation of fiat sent?": "Revenir sur la confirmation de l'envoi fiat ?",
diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json
@@ -570,10 +570,10 @@
   "#56": "Phrases in components/TradeBox/Dialogs/ConfirmFiatReceived.tsx",
   "Confirm": "Conferma",
   "Confirm you received {{amount}} {{currencyCode}}?": "Confermi la ricezione di {{amount}} {{currencyCode}}?",
-  "Confirming that you received {{amount}} {{currencyCode}} will finalize the trade. The satoshis in the escrow will be released to the buyer. Only confirm after {{amount}} {{currencyCode}} have arrived to your account. Note that if you have received the payment and do not click confirm, you risk losing your bond.": "Confermando di aver ricevuto {{importo}} {{currencyCode}} concluderai lo scambio. I satoshi in deposito saranno rilasciati all'acquirente. Conferma solo dopo che {{amount}} {{valutaCodice}} sono arrivati sul tuo conto. Si noti che se si riceve il pagamento e non si clicca su conferma, si rischia di perdere la propria cauzione.",
+  "Confirming that you received {{amount}} {{currencyCode}} will finalize the trade. The satoshis in the escrow will be released to the buyer. Only confirm after {{amount}} {{currencyCode}} have arrived to your account. Note that if you have received the payment and do not click confirm, you risk losing your bond.": "Confermando di aver ricevuto {{amount}} {{currencyCode}} concluderai lo scambio. I satoshi in deposito saranno rilasciati all'acquirente. Conferma solo dopo che {{amount}} {{valutaCodice}} sono arrivati sul tuo conto. Si noti che se si riceve il pagamento e non si clicca su conferma, si rischia di perdere la propria cauzione.",
   "#57": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",
   "Confirm you sent {{amount}} {{currencyCode}}?": "Confermi di aver inviato {{amount}} {{currencyCode}}?",
-  "Confirming that you sent {{amount}} {{currencyCode}} will allow your peer to finalize the trade. If you have not yet sent it and you still proceed to falsely confirm, you risk losing your bond.": "Confermando di aver inviato {{importo}} {{currencyCode}} consentirai al tuo pari di finalizzare la transazione. Se non lo si è ancora inviato e si procede comunque a una falsa conferma, si rischia di perdere la propria cauzione.",
+  "Confirming that you sent {{amount}} {{currencyCode}} will allow your peer to finalize the trade. If you have not yet sent it and you still proceed to falsely confirm, you risk losing your bond.": "Confermando di aver inviato {{amount}} {{currencyCode}} consentirai al tuo pari di finalizzare la transazione. Se non lo si è ancora inviato e si procede comunque a una falsa conferma, si rischia di perdere la propria cauzione.",
   "#58": "Phrases in components/TradeBox/Dialogs/ConfirmUndoFiatSent.tsx",
   "READ. In case your payment to the seller has been blocked and it is absolutely impossible to finish the trade, you can revert your confirmation of \"Fiat sent\". Do so only if you and the seller have ALREADY AGREED in the chat to proceed to a collaborative cancellation. After confirming, the \"Collaborative cancel\" button will be visible again. Only click this button if you know what you are doing. First time users of RoboSats are highly discouraged from performing this action! Make 100% sure your payment has failed and the amount is in your account.": "LEGGERE. Nel caso in cui il pagamento al venditore sia stato bloccato e sia assolutamente impossibile concludere la compravendita, puoi annullare la tua conferma di \"Fiat inviate\". Questo solo se tu e il venditore avete già concordato in chat di procedere a un annullamento collaborativo. Dopo la conferma, il pulsante \"Annullamento collaborativo\" sarà nuovamente visibile. Fare clic su questo pulsante solo se si sa cosa si sta facendo. Agli utenti che utilizzano RoboSats per la prima volta è caldamente sconsigliato eseguire questa azione! Assicurarsi al 100% che il pagamento non sia andato a buon fine e che l'importo sia presente nel conto.",
   "Revert the confirmation of fiat sent?": "Annullare la conferma dell'invio di fiat?",
diff --git a/mobile/android/app/src/main/java/com/robosats/NotificationsService.java b/mobile/android/app/src/main/java/com/robosats/NotificationsService.java
@@ -141,6 +141,7 @@ public void checkNotifications() {
 
             while (it.hasNext()) {
                 String robotToken = it.next();
+                Log.d("NotificationsService", "Checking Slot");
                 JSONObject slot = (JSONObject) slots.get(robotToken);
                 JSONObject robots = slot.getJSONObject("robots");
                 JSONObject coordinatorRobot;
@@ -187,9 +188,25 @@ private void fetchNotifications(JSONObject robot, String coordinator) throws JSO
 
         OkHttpClient client = builder.build();
         Request.Builder requestBuilder = new Request.Builder().url(url);
-
+        String header = String.format("Token %s", token);
+        try {
+            String pubKey = robot.getString("pubKey");
+            String parsedPubKey = String.join("\\", pubKey.split("\n"));
+            String encPrivKey = robot.getString("encPrivKey");
+            String parsedEncPrivKey = String.join("\\", encPrivKey.split("\n"));
+            header += String.format(" | Public %s | Private %s", parsedPubKey, parsedEncPrivKey);
+        } catch (JSONException e) {
+            Log.e("NotificationsService", "Error obtaining PGP keys");
+            return;
+        }
+        try {
+            String nostrPubKey = robot.getString("nostrPubKey");
+            header += String.format(" | Nostr %s", nostrPubKey);
+        } catch (JSONException e) {
+            Log.d("NotificationsService", "Nostr key not found");
+        }
         requestBuilder
-                .addHeader("Authorization", "Token " + token);
+                .addHeader("Authorization", header);
 
         requestBuilder.get();
         Request request = requestBuilder.build();
diff --git a/mobile/android/app/src/main/java/com/robosats/modules/TorModule.java b/mobile/android/app/src/main/java/com/robosats/modules/TorModule.java
@@ -99,13 +99,11 @@ public void onOpen(@NonNull WebSocket webSocket, Response response) {
 
             @Override
             public void onMessage(@NonNull WebSocket webSocket, @NonNull String text) {
-                Log.d("Tormodule", "WebSocket Message received: " + text);
                 onWsMessage(path, text);
             }
 
             @Override
             public void onMessage(@NonNull WebSocket webSocket, ByteString bytes) {
-                Log.d("Tormodule", "WebSocket Message received: " + bytes.hex());
                 onWsMessage(path, bytes.hex());
             }
 
diff --git a/tests/test_trade_pipeline.py b/tests/test_trade_pipeline.py
@@ -362,7 +362,7 @@ def test_publish_order(self):
         )
 
         # Test what we can see with newly created robot 2 (only for public status)
-        trade.get_order(robot_index=2, first_encounter=True)
+        trade.get_order(robot_index=2)
         public_data = trade.response.json()
 
         self.assertFalse(public_data["is_participant"])
diff --git a/tests/utils/trade.py b/tests/utils/trade.py
@@ -61,7 +61,7 @@ def __init__(
 
         self.make_order(self.maker_form, maker_index)
 
-    def get_robot_auth(self, robot_index, first_encounter=False):
+    def get_robot_auth(self, robot_index):
         """
         Create an AUTH header that embeds token, pub_key, and enc_priv_key into a single string
         as requested by the robosats token middleware.
@@ -73,12 +73,9 @@ def get_robot_auth(self, robot_index, first_encounter=False):
         nostr_pubkey = read_file(f"tests/robots/{robot_index}/nostr_pubkey")
 
         # First time a robot authenticated, it is registered by the backend, so pub_key and enc_priv_key is needed
-        if first_encounter:
-            headers = {
-                "HTTP_AUTHORIZATION": f"Token {b91_token} | Public {pub_key} | Private {enc_priv_key} | Nostr {nostr_pubkey}"
-            }
-        else:
-            headers = {"HTTP_AUTHORIZATION": f"Token {b91_token}"}
+        headers = {
+            "HTTP_AUTHORIZATION": f"Token {b91_token} | Public {pub_key} | Private {enc_priv_key} | Nostr {nostr_pubkey}"
+        }
 
         return headers
 
@@ -87,7 +84,7 @@ def create_robot(self, robot_index):
         Creates the robots in /tests/robots/{robot_index}
         """
         path = reverse("robot")
-        headers = self.get_robot_auth(robot_index, True)
+        headers = self.get_robot_auth(robot_index)
 
         return self.client.get(path, **headers)
 
@@ -97,21 +94,21 @@ def make_order(self, maker_form, robot_index=1):
         """
         path = reverse("make")
         # Get valid robot auth headers
-        headers = self.get_robot_auth(robot_index, True)
+        headers = self.get_robot_auth(robot_index)
 
         response = self.client.post(path, maker_form, **headers)
 
         self.response = response
         if response.status_code == 201:
             self.order_id = response.json()["id"]
 
-    def get_order(self, robot_index=1, first_encounter=False):
+    def get_order(self, robot_index=1):
         """
         Fetch the latest state of the order
         """
         path = reverse("order")
         params = f"?order_id={self.order_id}"
-        headers = self.get_robot_auth(robot_index, first_encounter)
+        headers = self.get_robot_auth(robot_index)
         self.response = self.client.get(path + params, **headers)
 
     def get_review(self, robot_index=1):
@@ -189,15 +186,15 @@ def publish_order(self):
     def take_order(self):
         path = reverse("order")
         params = f"?order_id={self.order_id}"
-        headers = self.get_robot_auth(self.taker_index, first_encounter=True)
+        headers = self.get_robot_auth(self.taker_index)
         body = {"action": "take", "amount": self.take_amount}
         self.response = self.client.post(path + params, body, **headers)
 
     @patch("api.tasks.send_notification.delay", send_notification)
     def take_order_third(self):
         path = reverse("order")
         params = f"?order_id={self.order_id}"
-        headers = self.get_robot_auth(self.third_index, first_encounter=True)
+        headers = self.get_robot_auth(self.third_index)
         body = {"action": "take", "amount": self.take_amount}
         self.response = self.client.post(path + params, body, **headers)
 

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ const CancelButton = ({`
`27`	`27`	`Boolean(order?.is_maker && [0, 1, 2].includes(order?.status)) \|\|`
`28`	`28`	`Boolean([3, 6, 7].includes(order?.status ?? -1));`
`29`	`29`	`const showCollabCancelButton = order?.status === 9 && !order?.asked_for_cancel;`
	`30`	`+ const unTaken = Boolean(order?.is_maker && [1, 2].includes(order?.status));`
`30`	`31`	`const noConfirmation =`
`31`	`32`	`Boolean(order?.is_maker && [0, 1, 2].includes(order?.status)) \|\|`
`32`	`33`	`Boolean(order?.is_taker && order?.status === 3);`
`@@ -55,7 +56,9 @@ const CancelButton = ({`
`55`	`56`	`? () => {`
`56`	`57`	`setOpenCancelWarning(true);`
`57`	`58`	`}`
`58`		`- : openCancelDialog`
	`59`	`+ : unTaken`
	`60`	`+ ? onClickCancel`
	`61`	`+ : openCancelDialog`
`59`	`62`	`}`
`60`	`63`	`>`
`61`	`64`	`{t('Cancel')}`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ export class Coordinator {`
`180`	`180`	`this.url = hostUrl;`
`181`	`181`	this.basePath = `/${settings.network}/${this.shortAlias}`;
`182`	`182`	`} else {`
`183`		`- this.url = String(this[settings.network][origin]);`
	`183`	`+ this.url = String(this[settings.network]?.[origin]);`
`184`	`184`	`this.basePath = '';`
`185`	`185`	`}`
`186`	`186`	`};`