From a7eafa05a83741ae60c50a4b4070661a24330f09 Mon Sep 17 00:00:00 2001 From: koalasat Date: Thu, 22 Aug 2024 10:32:02 +0200 Subject: [PATCH] Fix Successful typo --- api/migrations/0049_alter_currency_currency.py | 2 +- api/migrations/0050_alter_order_status.py | 18 ++++++++++++++++++ api/models/order.py | 2 +- api/oas_schemas.py | 2 +- docs/assets/schemas/api-latest.yaml | 4 ++-- .../src/components/Notifications/index.tsx | 2 +- frontend/src/components/OrderDetails/index.tsx | 4 ++-- frontend/src/components/TradeBox/index.tsx | 2 +- frontend/src/contexts/FederationContext.tsx | 2 +- frontend/src/models/Garage.model.ts | 2 +- frontend/static/locales/ca.json | 2 +- frontend/static/locales/cs.json | 2 +- frontend/static/locales/de.json | 2 +- frontend/static/locales/en.json | 2 +- frontend/static/locales/es.json | 2 +- frontend/static/locales/eu.json | 2 +- frontend/static/locales/fr.json | 2 +- frontend/static/locales/handcrafted.py | 2 +- frontend/static/locales/it.json | 2 +- frontend/static/locales/ja.json | 2 +- frontend/static/locales/pl.json | 2 +- frontend/static/locales/pt.json | 2 +- frontend/static/locales/ru.json | 2 +- frontend/static/locales/sv.json | 2 +- frontend/static/locales/sw.json | 2 +- frontend/static/locales/th.json | 2 +- frontend/static/locales/zh-SI.json | 2 +- frontend/static/locales/zh-TR.json | 2 +- 28 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 api/migrations/0050_alter_order_status.py diff --git a/api/migrations/0049_alter_currency_currency.py b/api/migrations/0049_alter_currency_currency.py index e40cd007..b4a7d5e1 100644 --- a/api/migrations/0049_alter_currency_currency.py +++ b/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), ), ] diff --git a/api/migrations/0050_alter_order_status.py b/api/migrations/0050_alter_order_status.py new file mode 100644 index 00000000..731f07b0 --- /dev/null +++ b/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), + ), + ] diff --git a/api/models/order.py b/api/models/order.py index f9a72ecf..483e6fa4 100644 --- a/api/models/order.py +++ b/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" diff --git a/api/oas_schemas.py b/api/oas_schemas.py index 220f604d..8d214f32 100644 --- a/api/oas_schemas.py +++ b/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" diff --git a/docs/assets/schemas/api-latest.yaml b/docs/assets/schemas/api-latest.yaml index 490c35ae..04a0577f 100644 --- a/docs/assets/schemas/api-latest.yaml +++ b/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 diff --git a/frontend/src/components/Notifications/index.tsx b/frontend/src/components/Notifications/index.tsx index b4f30d42..4e02de53 100644 --- a/frontend/src/components/Notifications/index.tsx +++ b/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' diff --git a/frontend/src/components/OrderDetails/index.tsx b/frontend/src/components/OrderDetails/index.tsx index 1f4437ec..a368df36 100644 --- a/frontend/src/components/OrderDetails/index.tsx +++ b/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?.taker_fee ?? 0; + ? (coordinator.info?.maker_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; diff --git a/frontend/src/components/TradeBox/index.tsx b/frontend/src/components/TradeBox/index.tsx index 28d79061..bdfa70c8 100644 --- a/frontend/src/components/TradeBox/index.tsx +++ b/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'; diff --git a/frontend/src/contexts/FederationContext.tsx b/frontend/src/contexts/FederationContext.tsx index 2f46a1ff..b9ce609b 100644 --- a/frontend/src/contexts/FederationContext.tsx +++ b/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' diff --git a/frontend/src/models/Garage.model.ts b/frontend/src/models/Garage.model.ts index 75e867f3..b1f35f6c 100644 --- a/frontend/src/models/Garage.model.ts +++ b/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) => { diff --git a/frontend/static/locales/ca.json b/frontend/static/locales/ca.json index 284e4221..0fe207f2 100644 --- a/frontend/static/locales/ca.json +++ b/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", diff --git a/frontend/static/locales/cs.json b/frontend/static/locales/cs.json index 1ca2f9fe..e8f98404 100644 --- a/frontend/static/locales/cs.json +++ b/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", diff --git a/frontend/static/locales/de.json b/frontend/static/locales/de.json index d8cd0975..3b8c5980 100644 --- a/frontend/static/locales/de.json +++ b/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", diff --git a/frontend/static/locales/en.json b/frontend/static/locales/en.json index efb540b1..0eaac3e6 100644 --- a/frontend/static/locales/en.json +++ b/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", diff --git a/frontend/static/locales/es.json b/frontend/static/locales/es.json index 831c26c8..ccd50a01 100644 --- a/frontend/static/locales/es.json +++ b/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", diff --git a/frontend/static/locales/eu.json b/frontend/static/locales/eu.json index 8b0c0be1..56e27f1a 100644 --- a/frontend/static/locales/eu.json +++ b/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", diff --git a/frontend/static/locales/fr.json b/frontend/static/locales/fr.json index 2ebe3a5c..33aaa73f 100644 --- a/frontend/static/locales/fr.json +++ b/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", diff --git a/frontend/static/locales/handcrafted.py b/frontend/static/locales/handcrafted.py index 4e2b7fcf..cb523a98 100644 --- a/frontend/static/locales/handcrafted.py +++ b/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"), diff --git a/frontend/static/locales/it.json b/frontend/static/locales/it.json index 3a480031..b3d3492b 100644 --- a/frontend/static/locales/it.json +++ b/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", diff --git a/frontend/static/locales/ja.json b/frontend/static/locales/ja.json index fa8e4c56..15617b18 100644 --- a/frontend/static/locales/ja.json +++ b/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": "オーダーメイカーが紛争に負けました", diff --git a/frontend/static/locales/pl.json b/frontend/static/locales/pl.json index 37d5960f..fe21feb1 100644 --- a/frontend/static/locales/pl.json +++ b/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", diff --git a/frontend/static/locales/pt.json b/frontend/static/locales/pt.json index b5964d11..1218b1ca 100644 --- a/frontend/static/locales/pt.json +++ b/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", diff --git a/frontend/static/locales/ru.json b/frontend/static/locales/ru.json index 965bc536..fe1bca0b 100644 --- a/frontend/static/locales/ru.json +++ b/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": "Мейкер проиграл диспут", diff --git a/frontend/static/locales/sv.json b/frontend/static/locales/sv.json index ae6995d9..50117bbe 100644 --- a/frontend/static/locales/sv.json +++ b/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", diff --git a/frontend/static/locales/sw.json b/frontend/static/locales/sw.json index 11ec90bd..a40e29e1 100644 --- a/frontend/static/locales/sw.json +++ b/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", diff --git a/frontend/static/locales/th.json b/frontend/static/locales/th.json index 39e5a252..594f5515 100644 --- a/frontend/static/locales/th.json +++ b/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", diff --git a/frontend/static/locales/zh-SI.json b/frontend/static/locales/zh-SI.json index 6a72253b..ae045dad 100644 --- a/frontend/static/locales/zh-SI.json +++ b/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": "挂单方失去了争议", diff --git a/frontend/static/locales/zh-TR.json b/frontend/static/locales/zh-TR.json index 139d39a5..7d72ebb3 100644 --- a/frontend/static/locales/zh-TR.json +++ b/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": "掛單方失去了爭議",