Skip to content

Commit e6a40c1

Browse files
KoalaSatKoalaSat
authored
Merge pull request #1421 from RoboSats/fix-successful-typo
Fix Successful typo
2 parents 1bd38a9 + a7eafa0 commit e6a40c1

28 files changed

+47
-29
lines changed

‎api/migrations/0049_alter_currency_currency.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ class Migration(migrations.Migration):
1313
migrations.AlterField(
1414
model_name='currency',
1515
name='currency',
16-
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),
16+
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),
1717
),
1818
]

‎api/migrations/0050_alter_order_status.py

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 5.0.8 on 2024-08-22 08:30
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('api', '0049_alter_currency_currency'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='order',
15+
name='status',
16+
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),
17+
),
18+
]

‎api/models/order.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class Status(models.IntegerChoices):
4646
DIS = 11, "In dispute"
4747
CCA = 12, "Collaboratively cancelled"
4848
PAY = 13, "Sending satoshis to buyer"
49-
SUC = 14, "Sucessful trade"
49+
SUC = 14, "Successful trade"
5050
FAI = 15, "Failed lightning network routing"
5151
WFR = 16, "Wait for dispute resolution"
5252
MLD = 17, "Maker lost dispute"

‎api/oas_schemas.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class OrderViewSchema:
112112
- `11` "In dispute"
113113
- `12` "Collaboratively cancelled"
114114
- `13` "Sending satoshis to buyer"
115-
- `14` "Sucessful trade"
115+
- `14` "Successful trade"
116116
- `15` "Failed lightning network routing"
117117
- `16` "Wait for dispute resolution"
118118
- `17` "Maker lost dispute"

‎docs/assets/schemas/api-latest.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ paths:
365365
- `11` "In dispute"
366366
- `12` "Collaboratively cancelled"
367367
- `13` "Sending satoshis to buyer"
368-
- `14` "Sucessful trade"
368+
- `14` "Successful trade"
369369
- `15` "Failed lightning network routing"
370370
- `16` "Wait for dispute resolution"
371371
- `17` "Maker lost dispute"
@@ -1833,7 +1833,7 @@ components:
18331833
* `11` - In dispute
18341834
* `12` - Collaboratively cancelled
18351835
* `13` - Sending satoshis to buyer
1836-
* `14` - Sucessful trade
1836+
* `14` - Successful trade
18371837
* `15` - Failed lightning network routing
18381838
* `16` - Wait for dispute resolution
18391839
* `17` - Maker lost dispute

‎frontend/src/components/Notifications/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ const Notifications = ({
248248
// 11: 'In dispute'
249249
// 12: 'Collaboratively cancelled'
250250
// 13: 'Sending satoshis to buyer'
251-
// 14: 'Sucessful trade'
251+
// 14: 'Successful trade'
252252
// 15: 'Failed lightning network routing'
253253
// 16: 'Wait for dispute resolution'
254254
// 17: 'Maker lost dispute'

‎frontend/src/components/OrderDetails/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -174,8 +174,8 @@ const OrderDetails = ({
174174

175175
const isBuyer = (order.type === 0 && order.is_maker) || (order.type === 1 && !order.is_maker);
176176
const tradeFee = order.is_maker
177-
? coordinator.info?.maker_fee ?? 0
178-
: coordinator.info?.taker_fee ?? 0;
177+
? (coordinator.info?.maker_fee ?? 0)
178+
: (coordinator.info?.taker_fee ?? 0);
179179
const defaultRoutingBudget = 0.001;
180180
const btc_now = order.satoshis_now / 100000000;
181181
const rate = Number(order.max_amount ?? order.amount) / btc_now;

‎frontend/src/components/TradeBox/index.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ const TradeBox = ({ baseUrl, onStartAgain }: TradeBoxProps): JSX.Element => {
639639
}
640640
break;
641641

642-
// 14: 'Sucessful trade'
642+
// 14: 'Successful trade'
643643
case 14:
644644
baseContract.title = 'Trade finished!';
645645
baseContract.titleColor = 'success';

‎frontend/src/contexts/FederationContext.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const statusToDelay = [
3333
100000, // 'In dispute'
3434
999999, // 'Collaboratively cancelled'
3535
10000, // 'Sending satoshis to buyer'
36-
60000, // 'Sucessful trade'
36+
60000, // 'Successful trade'
3737
30000, // 'Failed lightning network routing'
3838
300000, // 'Wait for dispute resolution'
3939
300000, // 'Maker lost dispute'

‎frontend/src/models/Garage.model.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class Garage {
8383
// Slots
8484
getSlot: (token?: string) => Slot | null = (token) => {
8585
const currentToken = token ?? this.currentSlot;
86-
return currentToken ? this.slots[currentToken] ?? null : null;
86+
return currentToken ? (this.slots[currentToken] ?? null) : null;
8787
};
8888

8989
deleteSlot: (token?: string) => void = (token) => {

‎frontend/static/locales/ca.json

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

‎frontend/static/locales/cs.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "In dispute",
701701
"Collaboratively cancelled": "Collaboratively cancelled",
702702
"Sending satoshis to buyer": "Sending satoshis to buyer",
703-
"Sucessful trade": "Successful trade",
703+
"Successful trade": "Successful trade",
704704
"Failed lightning network routing": "Failed lightning network routing",
705705
"Wait for dispute resolution": "Wait for dispute resolution",
706706
"Maker lost dispute": "Maker lost dispute",

‎frontend/static/locales/de.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "In dispute",
701701
"Collaboratively cancelled": "Collaboratively cancelled",
702702
"Sending satoshis to buyer": "Sending satoshis to buyer",
703-
"Sucessful trade": "Successful trade",
703+
"Successful trade": "Successful trade",
704704
"Failed lightning network routing": "Failed lightning network routing",
705705
"Wait for dispute resolution": "Wait for dispute resolution",
706706
"Maker lost dispute": "Maker lost dispute",

‎frontend/static/locales/en.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "In dispute",
701701
"Collaboratively cancelled": "Collaboratively cancelled",
702702
"Sending satoshis to buyer": "Sending satoshis to buyer",
703-
"Sucessful trade": "Successful trade",
703+
"Successful trade": "Successful trade",
704704
"Failed lightning network routing": "Failed lightning network routing",
705705
"Wait for dispute resolution": "Wait for dispute resolution",
706706
"Maker lost dispute": "Maker lost dispute",

‎frontend/static/locales/es.json

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

‎frontend/static/locales/eu.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "In dispute",
701701
"Collaboratively cancelled": "Collaboratively cancelled",
702702
"Sending satoshis to buyer": "Sending satoshis to buyer",
703-
"Sucessful trade": "Successful trade",
703+
"Successful trade": "Successful trade",
704704
"Failed lightning network routing": "Failed lightning network routing",
705705
"Wait for dispute resolution": "Wait for dispute resolution",
706706
"Maker lost dispute": "Maker lost dispute",

‎frontend/static/locales/fr.json

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

‎frontend/static/locales/handcrafted.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
("In dispute", "In dispute"),
3333
("Collaboratively cancelled", "Collaboratively cancelled"),
3434
("Sending satoshis to buyer", "Sending satoshis to buyer"),
35-
("Sucessful trade", "Successful trade"),
35+
("Successful trade", "Successful trade"),
3636
("Failed lightning network routing", "Failed lightning network routing"),
3737
("Wait for dispute resolution", "Wait for dispute resolution"),
3838
("Maker lost dispute", "Maker lost dispute"),

‎frontend/static/locales/it.json

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

‎frontend/static/locales/ja.json

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

‎frontend/static/locales/pl.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "In dispute",
701701
"Collaboratively cancelled": "Collaboratively cancelled",
702702
"Sending satoshis to buyer": "Sending satoshis to buyer",
703-
"Sucessful trade": "Successful trade",
703+
"Successful trade": "Successful trade",
704704
"Failed lightning network routing": "Failed lightning network routing",
705705
"Wait for dispute resolution": "Wait for dispute resolution",
706706
"Maker lost dispute": "Maker lost dispute",

‎frontend/static/locales/pt.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "In dispute",
701701
"Collaboratively cancelled": "Collaboratively cancelled",
702702
"Sending satoshis to buyer": "Sending satoshis to buyer",
703-
"Sucessful trade": "Successful trade",
703+
"Successful trade": "Successful trade",
704704
"Failed lightning network routing": "Failed lightning network routing",
705705
"Wait for dispute resolution": "Wait for dispute resolution",
706706
"Maker lost dispute": "Maker lost dispute",

‎frontend/static/locales/ru.json

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

‎frontend/static/locales/sv.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "In dispute",
701701
"Collaboratively cancelled": "Collaboratively cancelled",
702702
"Sending satoshis to buyer": "Sending satoshis to buyer",
703-
"Sucessful trade": "Successful trade",
703+
"Successful trade": "Successful trade",
704704
"Failed lightning network routing": "Failed lightning network routing",
705705
"Wait for dispute resolution": "Wait for dispute resolution",
706706
"Maker lost dispute": "Maker lost dispute",

‎frontend/static/locales/sw.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "Katika mzozo",
701701
"Collaboratively cancelled": "Kufutwa kwa ushirikiano",
702702
"Sending satoshis to buyer": "Inatumwa satoshis kwa mnunuzi",
703-
"Sucessful trade": "Biashara imefanikiwa",
703+
"Successful trade": "Biashara imefanikiwa",
704704
"Failed lightning network routing": "Utaratibu wa mtandao wa umeme umeshindwa",
705705
"Wait for dispute resolution": "Kusubiri suluhisho la mzozo",
706706
"Maker lost dispute": "Mtengenezaji amepoteza mzozo",

‎frontend/static/locales/th.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,7 @@
700700
"In dispute": "In dispute",
701701
"Collaboratively cancelled": "Collaboratively cancelled",
702702
"Sending satoshis to buyer": "Sending satoshis to buyer",
703-
"Sucessful trade": "Successful trade",
703+
"Successful trade": "Successful trade",
704704
"Failed lightning network routing": "Failed lightning network routing",
705705
"Wait for dispute resolution": "Wait for dispute resolution",
706706
"Maker lost dispute": "Maker lost dispute",

‎frontend/static/locales/zh-SI.json

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

‎frontend/static/locales/zh-TR.json

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

0 commit comments

Comments
 (0)