Merge pull request #2125 from RoboSats/notifications-filters

Notifications filters

.github/workflows/release.yml

@@ -103,12 +103,6 @@ jobs:
           name: app-universal-release.apk
           path: .
 
-      - name: 'Debug: List Downloaded Files'
-        run: |
-          echo "Current directory: $(pwd)"
-          find . -type f -name "*.apk" | sort
-          ls -la
-
       - name: 'Upload universal APK Asset'
         id: upload-universal-release-asset
         uses: actions/upload-release-asset@v1

android/app/src/main/java/com/robosats/services/NotificationsService.kt

@@ -79,7 +79,14 @@ class NotificationsService : Service() {
                             if (gift is SealedGossipEvent) {
                                 gift.unseal(nostrSigner) { rumor ->
                                     if (rumor is ChatMessageEvent) {
-                                        displayOrderNotification(rumor, firstTaggedUser)
+                                        val lastNotification = EncryptedStorage.getEncryptedStorage("last_notification")
+                                        if (lastNotification == "" || lastNotification.toLong() < rumor.createdAt) {
+                                            val federationPubKeys = EncryptedStorage.getEncryptedStorage("federation_pubkeys")
+                                            if (federationPubKeys.contains(rumor.pubKey)) {
+                                                EncryptedStorage.setEncryptedStorage("last_notification", rumor.createdAt.toString())
+                                                displayOrderNotification(rumor, firstTaggedUser)
+                                            }
+                                        }
                                     }
                                 }
                             }

frontend/src/basic/TopBar/NotificationsDrawer/index.tsx

@@ -40,10 +40,6 @@ interface NotificationsDrawerProps {
   setLoading: (loading: boolean) => void;
 }
 
-const defaultPubkeys = Object.values(defaultFederation)
-  .map((f) => f.nostrHexPubkey)
-  .filter((item) => item !== undefined);
-
 const NotificationsDrawer = ({
   show,
   setShow,
@@ -112,27 +108,25 @@ const NotificationsDrawer = ({
 
     cleanUpNotifications();
     setSubscribedTokens(tokens);
-    federation.roboPool.subscribeNotifications(garage, {
+    federation.roboPool.subscribeNotifications(garage, federation, {
       onevent: (event) => {
-        if (defaultPubkeys.includes(event.pubkey)) {
-          setLastNotification((last) => {
-            if (last < event.created_at) {
-              setSnakevent(event);
-              systemClient.setItem('last_notification', event.created_at.toString());
-              const orderStatus = event.tags.find((t) => t[0] === 'status')?.[1];
-              if (orderStatus) playSound(parseInt(orderStatus, 10));
-              if (client !== 'mobile') setOpenSnak(true);
+        setLastNotification((last) => {
+          if (last < event.created_at) {
+            setSnakevent(event);
+            systemClient.setItem('last_notification', event.created_at.toString());
+            const orderStatus = event.tags.find((t) => t[0] === 'status')?.[1];
+            if (orderStatus) playSound(parseInt(orderStatus, 10));
+            if (client !== 'mobile') setOpenSnak(true);
 
-              return event.created_at;
-            } else {
-              return last;
-            }
-          });
-          setMessages((msg) => {
-            msg.set(event.id, event);
-            return msg;
-          });
-        }
+            return event.created_at;
+          } else {
+            return last;
+          }
+        });
+        setMessages((msg) => {
+          msg.set(event.id, event);
+          return msg;
+        });
       },
       oneose: () => setLoading(false),
     });

frontend/src/components/TradeBox/Dialogs/ConfirmFiatReceived.tsx

@@ -68,7 +68,7 @@ export const ConfirmFiatReceivedDialog = ({
             </Typography>
             <Typography component='li' variant='body2'>
               {t(
-                'Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.',
+                'Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.',
               )}
             </Typography>
           </Box>

frontend/src/components/TradeBox/Prompts/Chat.tsx

@@ -105,7 +105,7 @@ export const ChatPrompt = ({
       } else {
         setSentButton(false);
         setUndoSentButton(false);
-        setReceivedButton(false);
+        setReceivedButton(true);
         setText(
           t(
             'Say hi! Be helpful and concise. Let them know how to send you {{amount}} {{currencyCode}}.',
@@ -225,6 +225,7 @@ export const ChatPrompt = ({
             variant='contained'
             color='secondary'
             onClick={onClickConfirmReceived}
+            disabled={order.status < 10}
           >
             {t('Confirm {{amount}} {{currencyCode}} received', { currencyCode, amount })}
           </LoadingButton>

frontend/src/models/Federation.model.ts

@@ -65,7 +65,10 @@ export class Federation {
 
     if (settings.client === 'mobile') {
       const federationUrls = Object.values(this.coordinators).map((c) => c.getRelayUrl());
+      const federationPubKeys = Object.values(this.coordinators).map((c) => c.nostrHexPubkey);
+
       systemClient.setItem('federation_relays', JSON.stringify(federationUrls));
+      systemClient.setItem('federation_pubkeys', JSON.stringify(federationPubKeys));
     }
   }
 

frontend/src/services/RoboPool/index.ts

@@ -1,5 +1,5 @@
 import { nip17, type Event } from 'nostr-tools';
-import { Garage, type Coordinator, type Settings } from '../../models';
+import { Federation, Garage, type Coordinator, type Settings } from '../../models';
 import defaultFederation from '../../../static/federation.json';
 import { websocketClient, type WebsocketConnection, WebsocketState } from '../Websocket';
 import thirdParties from '../../../static/thirdparties.json';
@@ -27,7 +27,6 @@ class RoboPool {
     this.relays = [];
     const federationRelays = coordinators.map((coord) => coord.getRelayUrl());
     const hostRelay = federationRelays.find((relay) => relay.includes(hostUrl));
-
     if (hostRelay) this.relays.push(hostRelay);
 
     while (this.relays.length < 3) {
@@ -163,7 +162,11 @@ class RoboPool {
     this.sendMessage(JSON.stringify(requestRatings));
   };
 
-  subscribeNotifications = (garage: Garage, events: RoboPoolEvents): void => {
+  subscribeNotifications = (
+    garage: Garage,
+    federation: Federation,
+    events: RoboPoolEvents,
+  ): void => {
     const subscribeChat = 'subscribeChat';
     this.sendMessage(JSON.stringify(['CLOSE', subscribeChat]));
 
@@ -187,7 +190,13 @@ class RoboPool {
 
         if (slot?.nostrSecKey) {
           const unwrappedEvent = nip17.unwrapEvent(wrappedEvent, slot.nostrSecKey);
-          events.onevent(unwrappedEvent as Event);
+          const federationPubKeys = Object.values(federation.getCoordinators()).map(
+            (c) => c.nostrHexPubkey,
+          );
+
+          if (federationPubKeys.includes(unwrappedEvent.pubkey)) {
+            events.onevent(unwrappedEvent as Event);
+          }
         }
       } else if (jsonMessage[0] === 'EOSE') {
         events.oneose();

frontend/static/locales/ca.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Confirming will finalize the trade.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "If you have received the payment and do not click confirm, you risk losing your bond.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Alguns mètodes de pagament fiduciari poden revertir les seves transaccions fins a 80 dies després de completar-les. Si us plau, conserva aquest token i les dades de la teva comanda per si necessites utilitzar-los com a prova.",
   "The satoshis in the escrow will be released to the buyer:": "The satoshis in the escrow will be released to the buyer:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Confirm you received {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/cs.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Potvrzením obchod dokončíte.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Pokud jste obdrželi platbu a nepotvrdíte to, riskujete ztrátu kauce.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Některé fiat platební metody mohou obrátit své transakce až 2 týdny po jejich dokončení. Ponechte si tento token a údaje o objednávce pro případ, že byste je potřebovali jako důkaz.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Některé fiat platební metody mohou své transakce zvrátit až 80 dní po jejich dokončení. Prosím, uchovejte tento token a údaje o objednávce pro případ, že je budete potřebovat jako důkaz.",
   "The satoshis in the escrow will be released to the buyer:": "Satoshi v úschově budou uvolněny kupujícímu:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Potvrďte, že jste obdrželi {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/de.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Das Bestätigen wird den Handel abschließen.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Wenn du die Zahlung erhalten hast und nicht auf Bestätigen klickst, riskierst du, deine Kaution zu verlieren.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Bestätige erst, nachdem {{amount}} {{currencyCode}} auf deinem Konto eingegangen sind.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Einige Fiat-Zahlungsmethoden können ihre Transaktionen bis zu 2 Wochen nach Abschluss rückgängig machen. Bitte halte dieses Token und deine Bestelldaten bereit, falls du sie als Beweis benötigst.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Einige Fiat-Zahlungsmethoden können ihre Transaktionen bis zu 80 Tage nach Abschluss rückgängig machen. Bitte bewahren Sie dieses Token und Ihre Bestelldaten auf, falls Sie sie als Nachweis benötigen.",
   "The satoshis in the escrow will be released to the buyer:": "Die Satoshis im Treuhandkonto werden an den Käufer übergeben:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Bestätige, dass du {{amount}} {{currencyCode}} erhalten hast?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/en.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Confirming will finalize the trade.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "If you have received the payment and do not click confirm, you risk losing your bond.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.",
   "The satoshis in the escrow will be released to the buyer:": "The satoshis in the escrow will be released to the buyer:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Confirm you received {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/es.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Al confirmar finalizarás el intercambio.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Si has recibido el pago y no haces clic en confirmar, corres el riesgo de perder tu fianza.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Solo confirma después de que {{amount}} {{currencyCode}} hayan llegado a tu cuenta.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Algunos métodos de pago en fiat podrían revertir sus transacciones hasta 2 semanas después de completarlas. Por favor, guarda este token y los datos de tu orden en caso de que necesites usarlos como prueba.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Algunos métodos de pago fiduciario podrían revertir sus transacciones hasta 80 días después de completadas. Por favor, conserva este token y los datos de tu pedido en caso de que necesites usarlos como prueba.",
   "The satoshis in the escrow will be released to the buyer:": "Los satoshis en el depósito se liberarán al comprador:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "¿✅ Confirmas que has recibido {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/eu.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Baieztapena trukea amaitzea ekarriko du.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Ordainketa jaso baduzu eta ez baduzu baieztatzen klik egiten, fidantza gal dezakezu.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Baieztatu bakarrik {{amount}} {{currencyCode}} zure kontura iritsi ondoren.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Fiat ordainketa metodo batzuk transakzioak buelta ditzakete 2 aste arte eginda daudenetik. Mesedez, gorde token hau eta eskaera datuak froga bezala erabiltzeko beharra izanez gero.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Fiat ordainketa metodo batzuek beren transakzioak itzuli ditzakete hauek burutu eta 80 egunera arte. Mesedez, gorde token hau eta zure eskaeraren datuak froga gisa erabili behar badituzu.",
   "The satoshis in the escrow will be released to the buyer:": "Eskrow-eko satoshia erosleari askatuko zaio:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Jaso duzula {{amount}} {{currencyCode}} baieztatzen duzu?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/fr.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Confirmer finalisera la transaction.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Si vous avez reçu le paiement et que vous ne cliquez pas sur confirmer, vous risquez de perdre votre caution.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Confirmez seulement après que {{amount}} {{currencyCode}} soient arrivés sur votre compte.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Certains modes de paiement en fiat peuvent annuler leurs transactions jusqu'à 2 semaines après leur achèvement. Veuillez conserver ce jeton et vos données de commande au cas où vous auriez besoin de les utiliser comme preuve.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Certains modes de paiement en fiat peuvent inverser leurs transactions jusqu'à 80 jours après leur finalisation. Veuillez conserver ce jeton et les données de votre commande au cas où vous auriez besoin de les utiliser comme preuve.",
   "The satoshis in the escrow will be released to the buyer:": "Les satoshis dans le séquestre seront libérés à l'acheteur :",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Confirmez-vous avoir reçu {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/it.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Confermare completerà lo scambio.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Se hai ricevuto il pagamento e non clicchi su conferma, rischi di perdere la cauzione.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Conferma solo dopo che {{amount}} {{currencyCode}} siano arrivati sul tuo conto.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Alcuni metodi di pagamento fiat potrebbero annullare le transazioni fino a 2 settimane dopo il completamento. Per favore, conserva questo token e i dati dell'ordine nel caso ti servano come prova.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Alcuni metodi di pagamento fiat potrebbero annullare le transazioni fino a 80 giorni dopo il loro completamento. Si prega di conservare questo token e i dati dell'ordine nel caso in cui sia necessario utilizzarli come prova.",
   "The satoshis in the escrow will be released to the buyer:": "I satoshi nel deposito a garanzia saranno rilasciati all'acquirente:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Confermi di aver ricevuto {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/ja.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "確認することで、取引を完了します。",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "もし支払いを受け取っていながら、確認をクリックしない場合は、あなたの担保金を失う可能性があります。",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "{{amount}} {{currencyCode}}があなたのアカウントに入った後でのみ確認してください。",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "一部のフィアット通貨の支払い方法では、完了後最大2週間その取引を逆転させることができます。これを証明として使用する必要がある場合に備えて、このトークンとあなたの注文データを保存してください。",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "部の法定通貨決済方法では、完了後 80 日間まで取引を取り消す場合があります。証明として使用する必要がある場合に備えて、このトークンと注文データを保管しておいてください。",
   "The satoshis in the escrow will be released to the buyer:": "エスクローのサトシは買い手にリリースされます：",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ {{amount}} {{currencyCode}}を受け取ったことを確認しますか？",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/pl.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Potwierdzenie zakończy handel.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Jeśli otrzymałeś płatność i nie klikniesz potwierdzenia, ryzykujesz utratą swoich obligacji.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Potwierdź tylko po tym, jak {{amount}} {{currencyCode}} dotrze na twoje konto.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Niektóre metody płatności fiat mogą odwrócić swoje transakcje do 2 tygodni po ich zakończeniu. Proszę, zachowaj ten token i dane zamówienia na wypadek, gdybyś musiał ich użyć jako dowodu.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Niektóre metody płatności fiat mogą cofnąć swoje transakcje do 80 dni po ich zakończeniu. Proszę zachować ten token i dane zamówienia na wypadek, gdyby trzeba było ich użyć jako dowodu.",
   "The satoshis in the escrow will be released to the buyer:": "Satoshis w depozycie zostaną przekazane kupującemu:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Potwierdź, że otrzymałeś {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/pt.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Confirmar finalizará a negociação.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Se você recebeu o pagamento e não clicar em confirmar, corre o risco de perder seu título.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Somente confirme após {{amount}} {{currencyCode}} terem chegado à sua conta.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Alguns métodos de pagamento fiduciário podem reverter suas transações até 2 semanas após serem concluídas. Por favor, mantenha esse token e os dados do seu pedido caso precise usá-los como prova.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Alguns métodos de pagamento fiat podem reverter suas transações até 80 dias após serem concluídas. Por favor, mantenha este token e os dados do seu pedido caso precise usá-los como prova.",
   "The satoshis in the escrow will be released to the buyer:": "Os satoshis no caução serão liberados para o comprador:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Confirmar que você recebeu {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/ru.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Подтверждение завершит сделку.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Если вы получили платёж и не нажмете подтвердить, вы рискуете потерять свой залог.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Подтверждайте только после того, как {{amount}} {{currencyCode}} были зачислены на ваш счёт.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Некоторые фиатные платежные методы могут отменить свои транзакции в течение 2 недель после их завершения. Пожалуйста, сохраните этот токен и данные вашего ордера на случай, если вам понадобится использовать их в качестве доказательства.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Некоторые методы фиатных платежей могут отменить свои транзакции в течение до 80 дней после их завершения. Пожалуйста, сохраните этот токен и данные вашего заказа на случай, если вам потребуется использовать их в качестве доказательства.",
   "The satoshis in the escrow will be released to the buyer:": "Сатоши в эскроу будут переданы покупателю:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Подтвердите, что вы получили {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/sv.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Bekräftande kommer att avsluta handeln.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Om du har tagit emot betalningen och inte klickar på bekräfta riskerar du att förlora din insättning.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Bekräfta bara efter {{amount}} {{currencyCode}} har anlänt till ditt konto.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Vissa fiatbetalningsmetoder kan återställa sina transaktioner upp till 2 veckor efter att de är genomförda. Vänligen behåll denna token och din orderdata ifall du behöver använda den som bevis.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Vissa fiat-betalningsmetoder kan återkalla sina transaktioner upp till 80 dagar efter att de är genomförda. Vänligen spara denna token och dina orderdata ifall du behöver dem som bevis.",
   "The satoshis in the escrow will be released to the buyer:": "Satoshierna i depositionen kommer att släppas till köparen:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Bekräfta att du fick {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/sw.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "Kuthibitisha kumaliza biashara.",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "Ikiwa umepokea malipo na haukubofya kuthibitisha, unahatarisha kupoteza dhamana yako.",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "Thibitisha baada tu ya {{amount}} {{currencyCode}} kufika kwenye akaunti yako.",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Baadhi ya njia za malipo za fiat zinaweza kubadilisha malipo yao hadi wiki 2 baada ya kukamilika. Tafadhali hifadhi alama hii na data yako ya agizo ikiwa utahitaji kuitumia kama ushahidi.",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "Baadhi ya njia za malipo za fiat zinaweza kubatilisha miamala yao hadi siku 80 baada ya kukamilika. Tafadhali weka tokeni hii na data ya agizo lako endapo utahitaji kuitumia kama ushahidi.",
   "The satoshis in the escrow will be released to the buyer:": "Satoshis zilizomo ndani ya escrow zitaachiliwa kwa mnunuzi:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ Thibitisha unapokea {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/th.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "การยืนยันจะทำให้การค้าสำเร็จสิ้นสุดลง",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "หากคุณได้รับการชำระเงินแล้วแต่ไม่ได้คลิกยืนยัน คุณอาจเสี่ยงที่จะสูญเสียพันธบัตรของคุณ",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "ยืนยันหลังจาก{{amount}} {{currencyCode}} ที่ได้รับมาถึงบัญชีของคุณเท่านั้น",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "วิธีการชำระเงิน fiat บางอย่างอาจกลับรายการธุรกรรมได้สูงสุด 2 สัปดาห์หลังจากที่ทำเสร็จสิ้น โปรดเก็บรักษาโทเค็นนี้และข้อมูลคำสั่งซื้อของคุณ เผื่อต้องการใช้งานเป็นหลักฐาน",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "วิธีการชำระเงินบางอย่างอาจยกเลิกธุรกรรมได้ถึง 80 วันหลังจากดำเนินการเสร็จสิ้น โปรดเก็บโทเค็นนี้และข้อมูลคำสั่งซื้อของคุณไว้ในกรณีที่คุณต้องใช้เป็นหลักฐาน",
   "The satoshis in the escrow will be released to the buyer:": "satoshis ในเอสโครว์จะถูกปล่อยให้กับผู้ซื้อ:",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ ยืนยันว่าคุณได้รับ {{amount}} {{currencyCode}}?",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/zh-SI.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "确认将完成交易。",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "如果您已收到付款但不点击确认，您将失去保证金。",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "只有{{amount}} {{currencyCode}}到达您的账户后才能确认。",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "一些法币支付方法可能会在完成交易最多2周后撤销交易。请保留此令牌和您的订单数据，以防需要将它们作为证明。",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "一些法币支付方法可能会在交易完成后长达 80 天内撤销交易。请保留此令牌和您的订单数据，以备需要作为证明时使用。",
   "The satoshis in the escrow will be released to the buyer:": "托管中的聪将被释放给买家：",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ 确认您收到了{{amount}} {{currencyCode}}？",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",

frontend/static/locales/zh-TR.json

@@ -569,7 +569,7 @@
   "Confirming will finalize the trade.": "確認將完成交易。",
   "If you have received the payment and do not click confirm, you risk losing your bond.": "如果您已經收到付款但不點擊確認，您可能會丟失保證金。",
   "Only confirm after {{amount}} {{currencyCode}} have arrived to your account.": "只有在 {{amount}} {{currencyCode}} 到達您的賬戶後才進行確認。",
-  "Some fiat payment methods might reverse their transactions up to 2 weeks after they are completed. Please keep this token and your order data in case you need to use them as proof.": "某些法幣付款方式可能會在完成後的 2 週內逆轉其交易。 請保留這個令牌和您的訂單數據，以備不時之需時使用它們作為證據。",
+  "Some fiat payment methods might reverse their transactions up to 80 days after they are completed. Please keep this token and your order data in case you need to use them as proof.": "一些法定支付方式可能會在交易完成後的 80 天內撤銷交易。請保留此令牌和您的訂單資料，以備需要作為證明時使用。",
   "The satoshis in the escrow will be released to the buyer:": "保管中的聰將被釋放給買方：",
   "✅ Confirm you received {{amount}} {{currencyCode}}?": "✅ 確認您收到 {{amount}} .的 {{currencyCode}}？",
   "#60": "Phrases in components/TradeBox/Dialogs/ConfirmFiatSent.tsx",