Merge pull request #1421 from RoboSats/fix-successful-typo

Fix Successful typo

api/migrations/0049_alter_currency_currency.py

@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='currency',
             name='currency',
-            field=models.PositiveSmallIntegerField(choices=[(1, 'USD'), (2, 'EUR'), (3, 'JPY'), (4, 'GBP'), (5, 'AUD'), (6, 'CAD'), (7, 'CHF'), (8, 'CNY'), (9, 'HKD'), (10, 'NZD'), (11, 'SEK'), (12, 'KRW'), (13, 'SGD'), (14, 'NOK'), (15, 'MXN'), (16, 'BYN'), (17, 'RUB'), (18, 'ZAR'), (19, 'TRY'), (20, 'BRL'), (21, 'CLP'), (22, 'CZK'), (23, 'DKK'), (24, 'HRK'), (25, 'HUF'), (26, 'INR'), (27, 'ISK'), (28, 'PLN'), (29, 'RON'), (30, 'ARS'), (31, 'VES'), (32, 'COP'), (33, 'PEN'), (34, 'UYU'), (35, 'PYG'), (36, 'BOB'), (37, 'IDR'), (38, 'ANG'), (39, 'CRC'), (40, 'CUP'), (41, 'DOP'), (42, 'GHS'), (43, 'GTQ'), (44, 'ILS'), (45, 'JMD'), (46, 'KES'), (47, 'KZT'), (48, 'MYR'), (49, 'NAD'), (50, 'NGN'), (51, 'AZN'), (52, 'PAB'), (53, 'PHP'), (54, 'PKR'), (55, 'QAR'), (56, 'SAR'), (57, 'THB'), (58, 'TTD'), (59, 'VND'), (60, 'XOF'), (61, 'TWD'), (62, 'TZS'), (63, 'XAF'), (64, 'UAH'), (65, 'EGP'), (66, 'LKR'), (67, 'MAD'), (68, 'AED'), (69, 'TND'), (70, 'ETB'), (71, 'GEL'), (72, 'UGX'), (73, 'RSD'), (74, 'IRT'), (75, 'BDT'), (76, 'ALL'), (77, 'DZD), (300, 'XAU'), (1000, 'BTC')], unique=True),
+            field=models.PositiveSmallIntegerField(choices=[(1, 'USD'), (2, 'EUR'), (3, 'JPY'), (4, 'GBP'), (5, 'AUD'), (6, 'CAD'), (7, 'CHF'), (8, 'CNY'), (9, 'HKD'), (10, 'NZD'), (11, 'SEK'), (12, 'KRW'), (13, 'SGD'), (14, 'NOK'), (15, 'MXN'), (16, 'BYN'), (17, 'RUB'), (18, 'ZAR'), (19, 'TRY'), (20, 'BRL'), (21, 'CLP'), (22, 'CZK'), (23, 'DKK'), (24, 'HRK'), (25, 'HUF'), (26, 'INR'), (27, 'ISK'), (28, 'PLN'), (29, 'RON'), (30, 'ARS'), (31, 'VES'), (32, 'COP'), (33, 'PEN'), (34, 'UYU'), (35, 'PYG'), (36, 'BOB'), (37, 'IDR'), (38, 'ANG'), (39, 'CRC'), (40, 'CUP'), (41, 'DOP'), (42, 'GHS'), (43, 'GTQ'), (44, 'ILS'), (45, 'JMD'), (46, 'KES'), (47, 'KZT'), (48, 'MYR'), (49, 'NAD'), (50, 'NGN'), (51, 'AZN'), (52, 'PAB'), (53, 'PHP'), (54, 'PKR'), (55, 'QAR'), (56, 'SAR'), (57, 'THB'), (58, 'TTD'), (59, 'VND'), (60, 'XOF'), (61, 'TWD'), (62, 'TZS'), (63, 'XAF'), (64, 'UAH'), (65, 'EGP'), (66, 'LKR'), (67, 'MAD'), (68, 'AED'), (69, 'TND'), (70, 'ETB'), (71, 'GEL'), (72, 'UGX'), (73, 'RSD'), (74, 'IRT'), (75, 'BDT'), (76, 'ALL'), (77, 'DZD'), (300, 'XAU'), (1000, 'BTC')], unique=True),
         ),
     ]

api/migrations/0050_alter_order_status.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.8 on 2024-08-22 08:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0049_alter_currency_currency'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='order',
+            name='status',
+            field=models.PositiveSmallIntegerField(choices=[(0, 'Waiting for maker bond'), (1, 'Public'), (2, 'Paused'), (3, 'Waiting for taker bond'), (4, 'Cancelled'), (5, 'Expired'), (6, 'Waiting for trade collateral and buyer invoice'), (7, 'Waiting only for seller trade collateral'), (8, 'Waiting only for buyer invoice'), (9, 'Sending fiat - In chatroom'), (10, 'Fiat sent - In chatroom'), (11, 'In dispute'), (12, 'Collaboratively cancelled'), (13, 'Sending satoshis to buyer'), (14, 'Successful trade'), (15, 'Failed lightning network routing'), (16, 'Wait for dispute resolution'), (17, 'Maker lost dispute'), (18, 'Taker lost dispute')], default=0),
+        ),
+    ]

api/models/order.py

@@ -46,7 +46,7 @@ class Order(models.Model):
         DIS = 11, "In dispute"
         CCA = 12, "Collaboratively cancelled"
         PAY = 13, "Sending satoshis to buyer"
-        SUC = 14, "Sucessful trade"
+        SUC = 14, "Successful trade"
         FAI = 15, "Failed lightning network routing"
         WFR = 16, "Wait for dispute resolution"
         MLD = 17, "Maker lost dispute"

api/oas_schemas.py

@@ -112,7 +112,7 @@ class OrderViewSchema:
             - `11` "In dispute"
             - `12` "Collaboratively cancelled"
             - `13` "Sending satoshis to buyer"
-            - `14` "Sucessful trade"
+            - `14` "Successful trade"
             - `15` "Failed lightning network routing"
             - `16` "Wait for dispute resolution"
             - `17` "Maker lost dispute"

docs/assets/schemas/api-latest.yaml

@@ -365,7 +365,7 @@ paths:
         - `11` "In dispute"
         - `12` "Collaboratively cancelled"
         - `13` "Sending satoshis to buyer"
-        - `14` "Sucessful trade"
+        - `14` "Successful trade"
         - `15` "Failed lightning network routing"
         - `16` "Wait for dispute resolution"
         - `17` "Maker lost dispute"
@@ -1833,7 +1833,7 @@ components:
         * `11` - In dispute
         * `12` - Collaboratively cancelled
         * `13` - Sending satoshis to buyer
-        * `14` - Sucessful trade
+        * `14` - Successful trade
         * `15` - Failed lightning network routing
         * `16` - Wait for dispute resolution
         * `17` - Maker lost dispute

frontend/src/components/Notifications/index.tsx

@@ -248,7 +248,7 @@ const Notifications = ({
     // 11: 'In dispute'
     // 12: 'Collaboratively cancelled'
     // 13: 'Sending satoshis to buyer'
-    // 14: 'Sucessful trade'
+    // 14: 'Successful trade'
     // 15: 'Failed lightning network routing'
     // 16: 'Wait for dispute resolution'
     // 17: 'Maker lost dispute'

frontend/src/components/OrderDetails/index.tsx

@@ -174,8 +174,8 @@ const OrderDetails = ({
 
     const isBuyer = (order.type === 0 && order.is_maker) || (order.type === 1 && !order.is_maker);
     const tradeFee = order.is_maker
-      ? coordinator.info?.maker_fee ?? 0
+      ? (coordinator.info?.maker_fee ?? 0)
-      : coordinator.info?.taker_fee ?? 0;
+      : (coordinator.info?.taker_fee ?? 0);
     const defaultRoutingBudget = 0.001;
     const btc_now = order.satoshis_now / 100000000;
     const rate = Number(order.max_amount ?? order.amount) / btc_now;

frontend/src/components/TradeBox/index.tsx

@@ -639,7 +639,7 @@ const TradeBox = ({ baseUrl, onStartAgain }: TradeBoxProps): JSX.Element => {
         }
         break;
 
-      // 14: 'Sucessful trade'
+      // 14: 'Successful trade'
       case 14:
         baseContract.title = 'Trade finished!';
         baseContract.titleColor = 'success';

frontend/src/contexts/FederationContext.tsx

@@ -33,7 +33,7 @@ const statusToDelay = [
   100000, // 'In dispute'
   999999, // 'Collaboratively cancelled'
   10000, // 'Sending satoshis to buyer'
-  60000, // 'Sucessful trade'
+  60000, // 'Successful trade'
   30000, // 'Failed lightning network routing'
   300000, // 'Wait for dispute resolution'
   300000, // 'Maker lost dispute'

frontend/src/models/Garage.model.ts

@@ -83,7 +83,7 @@ class Garage {
   // Slots
   getSlot: (token?: string) => Slot | null = (token) => {
     const currentToken = token ?? this.currentSlot;
-    return currentToken ? this.slots[currentToken] ?? null : null;
+    return currentToken ? (this.slots[currentToken] ?? null) : null;
   };
 
   deleteSlot: (token?: string) => void = (token) => {

frontend/static/locales/ca.json

@@ -700,7 +700,7 @@
   "In dispute": "En disputa",
   "Collaboratively cancelled": "Cancel·lat col·laborativament",
   "Sending satoshis to buyer": "Enviant satoshis al comprador",
-  "Sucessful trade": "Intercanvi exitós",
+  "Successful trade": "Intercanvi exitós",
   "Failed lightning network routing": "L'enrrutament lightning network ha fallat",
   "Wait for dispute resolution": "Esperant la resolució de la disputa",
   "Maker lost dispute": "El creador ha perdut la disputa",

frontend/static/locales/cs.json

@@ -700,7 +700,7 @@
   "In dispute": "In dispute",
   "Collaboratively cancelled": "Collaboratively cancelled",
   "Sending satoshis to buyer": "Sending satoshis to buyer",
-  "Sucessful trade": "Successful trade",
+  "Successful trade": "Successful trade",
   "Failed lightning network routing": "Failed lightning network routing",
   "Wait for dispute resolution": "Wait for dispute resolution",
   "Maker lost dispute": "Maker lost dispute",

frontend/static/locales/de.json

@@ -700,7 +700,7 @@
   "In dispute": "In dispute",
   "Collaboratively cancelled": "Collaboratively cancelled",
   "Sending satoshis to buyer": "Sending satoshis to buyer",
-  "Sucessful trade": "Successful trade",
+  "Successful trade": "Successful trade",
   "Failed lightning network routing": "Failed lightning network routing",
   "Wait for dispute resolution": "Wait for dispute resolution",
   "Maker lost dispute": "Maker lost dispute",

frontend/static/locales/en.json

@@ -700,7 +700,7 @@
   "In dispute": "In dispute",
   "Collaboratively cancelled": "Collaboratively cancelled",
   "Sending satoshis to buyer": "Sending satoshis to buyer",
-  "Sucessful trade": "Successful trade",
+  "Successful trade": "Successful trade",
   "Failed lightning network routing": "Failed lightning network routing",
   "Wait for dispute resolution": "Wait for dispute resolution",
   "Maker lost dispute": "Maker lost dispute",

frontend/static/locales/es.json

@@ -700,7 +700,7 @@
   "In dispute": "En disputa",
   "Collaboratively cancelled": "Cancelada colaborativamente",
   "Sending satoshis to buyer": "Enviando Sats al comprador",
-  "Sucessful trade": "Intercambio exitoso",
+  "Successful trade": "Intercambio exitoso",
   "Failed lightning network routing": "Enrutamiento fallido en la red Lightning",
   "Wait for dispute resolution": "Espera a la resolución de la disputa",
   "Maker lost dispute": "El creador ha perdido la disputa",

frontend/static/locales/eu.json

@@ -700,7 +700,7 @@
   "In dispute": "In dispute",
   "Collaboratively cancelled": "Collaboratively cancelled",
   "Sending satoshis to buyer": "Sending satoshis to buyer",
-  "Sucessful trade": "Successful trade",
+  "Successful trade": "Successful trade",
   "Failed lightning network routing": "Failed lightning network routing",
   "Wait for dispute resolution": "Wait for dispute resolution",
   "Maker lost dispute": "Maker lost dispute",

frontend/static/locales/fr.json

@@ -700,7 +700,7 @@
   "In dispute": "En litige",
   "Collaboratively cancelled": "Annulation commune",
   "Sending satoshis to buyer": "Envoi des satoshis à l'acheteur",
-  "Sucessful trade": "Transaction réussie",
+  "Successful trade": "Transaction réussie",
   "Failed lightning network routing": "Échec du routage du réseau lightning",
   "Wait for dispute resolution": "Attendre la résolution du litige",
   "Maker lost dispute": "Litige perdu par l'auteur",

frontend/static/locales/handcrafted.py

@@ -32,7 +32,7 @@ phrases = OrderedDict(
         ("In dispute", "In dispute"),
         ("Collaboratively cancelled", "Collaboratively cancelled"),
         ("Sending satoshis to buyer", "Sending satoshis to buyer"),
-        ("Sucessful trade", "Successful trade"),
+        ("Successful trade", "Successful trade"),
         ("Failed lightning network routing", "Failed lightning network routing"),
         ("Wait for dispute resolution", "Wait for dispute resolution"),
         ("Maker lost dispute", "Maker lost dispute"),

frontend/static/locales/it.json

@@ -700,7 +700,7 @@
   "In dispute": "In contestazione",
   "Collaboratively cancelled": "Annullato collaborativamente",
   "Sending satoshis to buyer": "Invio satoshi all'acquirente",
-  "Sucessful trade": "Scambio completato con successo",
+  "Successful trade": "Scambio completato con successo",
   "Failed lightning network routing": "Routing Lightning Network fallito",
   "Wait for dispute resolution": "In attesa della risoluzione della contestazione",
   "Maker lost dispute": "Il maker ha perso la contestazione",

frontend/static/locales/ja.json

@@ -700,7 +700,7 @@
   "In dispute": "紛争中",
   "Collaboratively cancelled": "共同でキャンセルされました",
   "Sending satoshis to buyer": "買い手にSatsを送信しています",
-  "Sucessful trade": "成功した取引",
+  "Successful trade": "成功した取引",
   "Failed lightning network routing": "ライトニングネットワークのルーティングに失敗しました",
   "Wait for dispute resolution": "紛争の解決を待ってください",
   "Maker lost dispute": "オーダーメイカーが紛争に負けました",

frontend/static/locales/pl.json

@@ -700,7 +700,7 @@
   "In dispute": "In dispute",
   "Collaboratively cancelled": "Collaboratively cancelled",
   "Sending satoshis to buyer": "Sending satoshis to buyer",
-  "Sucessful trade": "Successful trade",
+  "Successful trade": "Successful trade",
   "Failed lightning network routing": "Failed lightning network routing",
   "Wait for dispute resolution": "Wait for dispute resolution",
   "Maker lost dispute": "Maker lost dispute",

frontend/static/locales/pt.json

@@ -700,7 +700,7 @@
   "In dispute": "In dispute",
   "Collaboratively cancelled": "Collaboratively cancelled",
   "Sending satoshis to buyer": "Sending satoshis to buyer",
-  "Sucessful trade": "Successful trade",
+  "Successful trade": "Successful trade",
   "Failed lightning network routing": "Failed lightning network routing",
   "Wait for dispute resolution": "Wait for dispute resolution",
   "Maker lost dispute": "Maker lost dispute",

frontend/static/locales/ru.json

@@ -700,7 +700,7 @@
   "In dispute": "В диспуте",
   "Collaboratively cancelled": "Совместно отменено",
   "Sending satoshis to buyer": "Отправка Сатоши покупателю",
-  "Sucessful trade": "Успешная торговля",
+  "Successful trade": "Успешная торговля",
   "Failed lightning network routing": "Неудачная маршрутизация сети Lightning",
   "Wait for dispute resolution": "Дождитесь разрешения диспута",
   "Maker lost dispute": "Мейкер проиграл диспут",

frontend/static/locales/sv.json

@@ -700,7 +700,7 @@
   "In dispute": "In dispute",
   "Collaboratively cancelled": "Collaboratively cancelled",
   "Sending satoshis to buyer": "Sending satoshis to buyer",
-  "Sucessful trade": "Successful trade",
+  "Successful trade": "Successful trade",
   "Failed lightning network routing": "Failed lightning network routing",
   "Wait for dispute resolution": "Wait for dispute resolution",
   "Maker lost dispute": "Maker lost dispute",

frontend/static/locales/sw.json

@@ -700,7 +700,7 @@
   "In dispute": "Katika mzozo",
   "Collaboratively cancelled": "Kufutwa kwa ushirikiano",
   "Sending satoshis to buyer": "Inatumwa satoshis kwa mnunuzi",
-  "Sucessful trade": "Biashara imefanikiwa",
+  "Successful trade": "Biashara imefanikiwa",
   "Failed lightning network routing": "Utaratibu wa mtandao wa umeme umeshindwa",
   "Wait for dispute resolution": "Kusubiri suluhisho la mzozo",
   "Maker lost dispute": "Mtengenezaji amepoteza mzozo",

frontend/static/locales/th.json

@@ -700,7 +700,7 @@
   "In dispute": "In dispute",
   "Collaboratively cancelled": "Collaboratively cancelled",
   "Sending satoshis to buyer": "Sending satoshis to buyer",
-  "Sucessful trade": "Successful trade",
+  "Successful trade": "Successful trade",
   "Failed lightning network routing": "Failed lightning network routing",
   "Wait for dispute resolution": "Wait for dispute resolution",
   "Maker lost dispute": "Maker lost dispute",

frontend/static/locales/zh-SI.json

@@ -700,7 +700,7 @@
   "In dispute": "正在争议中",
   "Collaboratively cancelled": "已合作取消",
   "Sending satoshis to buyer": "正在向买方发送聪",
-  "Sucessful trade": "成功交易",
+  "Successful trade": "成功交易",
   "Failed lightning network routing": "闪电路由失败",
   "Wait for dispute resolution": "等待争议解决",
   "Maker lost dispute": "挂单方失去了争议",

frontend/static/locales/zh-TR.json

@@ -700,7 +700,7 @@
   "In dispute": "正在爭議中",
   "Collaboratively cancelled": "已合作取消",
   "Sending satoshis to buyer": "正在向買方發送聰",
-  "Sucessful trade": "成功交易",
+  "Successful trade": "成功交易",
   "Failed lightning network routing": "閃電路由失敗",
   "Wait for dispute resolution": "等待爭議解決",
   "Maker lost dispute": "掛單方失去了爭議",