Skip to content

Commit 05238db

Browse files
committed
Merge branch 'staging' into remove-redux
2 parents c8a976b + 7f3d7bd commit 05238db

File tree

77 files changed

+5473
-4282
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+5473
-4282
lines changed

.vscode/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
"nodemodules",
7676
"pageview",
7777
"paychannels",
78-
"paystrings",
7978
"stylelint",
8079
"svgr",
8180
"topojson",

package-lock.json

Lines changed: 3341 additions & 2959 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
"version": "1.5.0",
55
"dependencies": {
66
"@google-cloud/bigquery": "^7.9.1",
7-
"@paystring/utils": "^2.0.0",
87
"@rollup/plugin-inject": "^5.0.5",
98
"@vitejs/plugin-react": "^4.2.1",
109
"@xrplf/isomorphic": "^1.0.0-beta.1",
1110
"@xrplf/prettier-config": "^1.9.1",
1211
"assert": "^2.1.0",
1312
"autoprefixer": "^10.4.20",
1413
"axios": "^1.6.5",
15-
"body-parser": "^1.20.2",
14+
"body-parser": "^1.20.3",
1615
"bunyan": "^1.8.15",
1716
"classnames": "^2.5.1",
1817
"compression": "^1.7.4",
@@ -26,7 +25,7 @@
2625
"enzyme-adapter-react-17-updated": "^1.0.2",
2726
"esbuild": "^0.23.0",
2827
"events": "^3.3.0",
29-
"express": "^4.18.2",
28+
"express": "^4.20.0",
3029
"i18next": "^23.9.0",
3130
"i18next-browser-languagedetector": "^7.2.1",
3231
"i18next-http-backend": "^2.2.1",
@@ -54,7 +53,7 @@
5453
"devDependencies": {
5554
"@babel/eslint-parser": "^7.22.6",
5655
"@babel/preset-env": "^7.25.7",
57-
"@babel/preset-react": "^7.24.7",
56+
"@babel/preset-react": "^7.26.3",
5857
"@types/create-hash": "^1.2.6",
5958
"@types/enzyme": "^3.10.12",
6059
"@types/jest": "^26.0.24",
@@ -65,7 +64,7 @@
6564
"@typescript-eslint/eslint-plugin": "^7.0.0",
6665
"@typescript-eslint/parser": "^6.21.0",
6766
"babel-jest": "^29.7.0",
68-
"canvas": "^2.11.2",
67+
"canvas": "^3.1.0",
6968
"enzyme": "3.11.0",
7069
"enzyme-adapter-react-17-updated": "^1.0.2",
7170
"eslint": "^8.57.0",
@@ -99,7 +98,7 @@
9998
"ts-jest": "^26.5.6",
10099
"ts-node": "^10.9.2",
101100
"typescript": "^4.9.5",
102-
"xrpl": "^3.1.0"
101+
"xrpl": "^4.2.0"
103102
},
104103
"resolutions": {
105104
"jest-environment-jsdom": "29.3.1"

public/locales/ca-CA/translations.json

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,14 @@
153153
"transaction_type_name_AMMWithdraw": "Treure AMM",
154154
"transaction_type_name_AMMVote": "Votar AMM",
155155
"transaction_type_name_AMMBid": "Pujar AMM",
156+
"transaction_type_name_AMMClawback": null,
156157
"transaction_type_name_AccountSet": "Account Set",
157158
"transaction_type_name_CheckCancel": "Cancel·lar Check",
158159
"transaction_type_name_CheckCash": "Cobrar Check",
159160
"transaction_type_name_CheckCreate": "Crear de Check",
161+
"transaction_type_name_CredentialAccept": null,
162+
"transaction_type_name_CredentialCreate": null,
163+
"transaction_type_name_CredentialDelete": null,
160164
"transaction_type_name_DIDDelete": "Eliminar DID",
161165
"transaction_type_name_DIDSet": "Establir DID",
162166
"transaction_type_name_DepositPreauth": "Preautoritzar Diposit",
@@ -178,6 +182,8 @@
178182
"transaction_type_name_PaymentChannelClaim": "Reclamar al Canal de Pagament",
179183
"transaction_type_name_PaymentChannelCreate": "Crear Canal de Pagament",
180184
"transaction_type_name_PaymentChannelFund": "Dipositar en Canal de Pagament",
185+
"transaction_type_name_PermissionedDomainDelete": null,
186+
"transaction_type_name_PermissionedDomainSet": null,
181187
"transaction_type_name_SetHook": "Establir Hook",
182188
"transaction_type_name_SetRegularKey": "Establir Clau Regular",
183189
"transaction_type_name_SignerListSet": "Etablir Llista de Signantst",
@@ -307,15 +313,6 @@
307313
"get_account_state_failed": "Incapaç de carregar l'estat del compte",
308314
"get_account_transactions_failed": "Incapaç de carregar les transaccions del compte",
309315
"get_account_transactions_try": "Intenta carregar més transaccions",
310-
"resolve_paystring_failed": "Incapaç de resoldre el PayString",
311-
"paystring_address_invalid": "(No vàlid)",
312-
"paystring_address": "Adreça",
313-
"paystring_empty_title": "No s'ha proporcionat cap PayString",
314-
"paystring_empty_hint": "Introdueix PayString al requadre de cerca",
315-
"paystring_environment": "Entorn",
316-
"paystring_explainer_blurb": "PayString és l'ID universal per pagaments que fa servir un estàndard simple per ajudar la gent a enviar i rebre diners, a través de qualsevol xarxa, fent servir un únic ID.",
317-
"paystring_network": "Xarxa",
318-
"paystring_tag": "Etiqueta",
319316
"pubkey": "pubkey",
320317
"node_pubkey": "node pubkey",
321318
"ip": "ip",
@@ -560,5 +557,12 @@
560557
"search_results_banner": null,
561558
"enable_amendment_name": null,
562559
"amendment_status": null,
563-
"expected_date": null
560+
"expected_date": null,
561+
"credential_type": null,
562+
"credential_issuer": null,
563+
"subject": null,
564+
"expiration": null,
565+
"domain_id": null,
566+
"accepted_credentials": null,
567+
"action_from_and": null
564568
}

public/locales/en-US/translations.json

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,14 @@
156156
"transaction_type_name_AMMWithdraw": "AMM Withdraw",
157157
"transaction_type_name_AMMVote": "AMM Vote",
158158
"transaction_type_name_AMMBid": "AMM Bid",
159+
"transaction_type_name_AMMClawback": "AMMClawback",
159160
"transaction_type_name_AccountSet": "Account Set",
160161
"transaction_type_name_CheckCancel": "Check Cancel",
161162
"transaction_type_name_CheckCash": "Check Cash",
162163
"transaction_type_name_CheckCreate": "Check Create",
164+
"transaction_type_name_CredentialAccept": "Credential Accept",
165+
"transaction_type_name_CredentialCreate": "Credential Create",
166+
"transaction_type_name_CredentialDelete": "Credential Delete",
163167
"transaction_type_name_DIDDelete": "DID Delete",
164168
"transaction_type_name_DIDSet": "DID Set",
165169
"transaction_type_name_DepositPreauth": "Deposit Preauth",
@@ -185,6 +189,8 @@
185189
"transaction_type_name_PaymentChannelClaim": "Payment Channel Claim",
186190
"transaction_type_name_PaymentChannelCreate": "Payment Channel Create",
187191
"transaction_type_name_PaymentChannelFund": "Payment Channel Fund",
192+
"transaction_type_name_PermissionedDomainDelete": "Permissioned Domain Delete",
193+
"transaction_type_name_PermissionedDomainSet": "Permissioned Domain Set",
188194
"transaction_type_name_SetHook": "Set Hook",
189195
"transaction_type_name_SetRegularKey": "Set Regular Key",
190196
"transaction_type_name_SignerListSet": "Signer List Set",
@@ -316,15 +322,6 @@
316322
"get_account_state_failed": "Unable to load account state",
317323
"get_account_transactions_failed": "Unable to load account transactions",
318324
"get_account_transactions_try": "Try loading more transactions",
319-
"resolve_paystring_failed": "Unable to resolve PayString",
320-
"paystring_address_invalid": "(Invalid)",
321-
"paystring_address": "Address",
322-
"paystring_empty_title": "No PayString was provided",
323-
"paystring_empty_hint": "Enter an PayString in the search box",
324-
"paystring_environment": "Environment",
325-
"paystring_explainer_blurb": "PayString is the universal ID for payments that uses a simple, open standard to help people easily send and receive money - across any payment network - using a single ID.",
326-
"paystring_network": "Network",
327-
"paystring_tag": "Tag",
328325
"pubkey": "pubkey",
329326
"node_pubkey": "node pubkey",
330327
"ip": "ip",
@@ -490,6 +487,7 @@
490487
"min_signer_quorum": "Minimum weight <0>{{quorum}}</0> required",
491488
"holder": "Holder",
492489
"action_from": "<0><0>{{action}}</0></0> <1><0>{{amount}}</0></1> from <3><0>{{destination}}</0></3>",
490+
"action_from_and": "<0><0>{{action}}</0></0> <1><0>{{amount1}}</0></1> and <3><0>{{amount2}}</0></3> from <5><0>{{destination}}</0></5>",
493491
"claws_back": "Claws back",
494492
"claws_back_from": "<source/> claws back from <destination/>",
495493
"instruct_to_claw": "The max clawback amount is <amount/>",
@@ -542,7 +540,7 @@
542540
"deleted": "Deleted",
543541
"holders": "HOLDERS: {{holders}}",
544542
"trustlines": " TRUSTLINES: {{trustlines}}",
545-
"website": "Wesbite",
543+
"website": "Website",
546544
"mpt_issuance_id": "MPT Issuance ID",
547545
"asset_scale": "Asset Scale",
548546
"metadata": "Metadata",
@@ -560,6 +558,12 @@
560558
"search_results_banner": "Token search by name and account is now available! Try searching for USD",
561559
"enable_amendment_name": "Amendment Name",
562560
"amendment_status": "Amendment Status",
561+
"expected_date": "Expected Date",
562+
"credential_type": "Credential Type",
563+
"credential_issuer": "Credential Issuer",
564+
"subject": "Subject",
565+
"expiration": "Expiration",
566+
"domain_id": "Domain ID",
567+
"accepted_credentials": "Accepted Credentials",
563568
"expected_date": "Expected Date"
564-
565569
}

public/locales/es-ES/translations.json

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,14 @@
153153
"transaction_type_name_AMMWithdraw": "Retirar AMM ",
154154
"transaction_type_name_AMMVote": "Votar AMM",
155155
"transaction_type_name_AMMBid": "Puja AMM",
156+
"transaction_type_name_AMMClawback": null,
156157
"transaction_type_name_AccountSet": "Configurar Cuenta",
157158
"transaction_type_name_CheckCancel": "Cancelar Cheque",
158159
"transaction_type_name_CheckCash": "Cobrar Cheque",
159160
"transaction_type_name_CheckCreate": "Crear Cheque",
161+
"transaction_type_name_CredentialAccept": null,
162+
"transaction_type_name_CredentialCreate": null,
163+
"transaction_type_name_CredentialDelete": null,
160164
"transaction_type_name_DepositPreauth": "Preautorizar Depósito",
161165
"transaction_type_name_Error_Cases": "Casos de Error",
162166
"transaction_type_name_EscrowCancel": "Cancelar Depósito",
@@ -175,6 +179,8 @@
175179
"transaction_type_name_PaymentChannelClaim": "Reclamar Canal de Pago",
176180
"transaction_type_name_PaymentChannelCreate": "Crear Canal de Pago",
177181
"transaction_type_name_PaymentChannelFund": "Añadir Fondos a Canal de Pago",
182+
"transaction_type_name_PermissionedDomainDelete": null,
183+
"transaction_type_name_PermissionedDomainSet": null,
178184
"transaction_type_name_SetHook": "Añadir Hook",
179185
"transaction_type_name_SetRegularKey": "Configurar Clave Normal",
180186
"transaction_type_name_SignerListSet": "Configurar Lista de Firmantes",
@@ -303,15 +309,6 @@
303309
"get_account_state_failed": "No ha sido posible cargar el estado de la cuenta",
304310
"get_account_transactions_failed": "No ha sido posible cargar las transacciones de la cuenta",
305311
"get_account_transactions_try": "Intentando cargar más transacciones",
306-
"resolve_paystring_failed": "No ha sido posible resolver el PayString",
307-
"paystring_address_invalid": "(Inválida)",
308-
"paystring_address": "Dirección",
309-
"paystring_empty_title": "No se facilitó un PayString",
310-
"paystring_empty_hint": "Introduce un PayString en la caja de búsqueda",
311-
"paystring_environment": "Entorno",
312-
"paystring_explainer_blurb": "PayString es un ID universal para pagos que usa un sencillo, estandar abierto para ayudar a la gente a enviar y recibir dinero facilmente - a través de cualquier red de pagos - utilizando un ID único.",
313-
"paystring_network": "Red",
314-
"paystring_tag": "Marca",
315312
"pubkey": "clave pública",
316313
"node_pubkey": "clave pública del nodo",
317314
"ip": "ip",
@@ -556,5 +553,12 @@
556553
"search_results_banner": null,
557554
"enable_amendment_name": null,
558555
"amendment_status": null,
559-
"expected_date": null
556+
"expected_date": null,
557+
"credential_type": null,
558+
"credential_issuer": null,
559+
"subject": null,
560+
"expiration": null,
561+
"domain_id": null,
562+
"accepted_credentials": null
563+
"action_from_and": null,
560564
}

public/locales/fr-FR/translations.json

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,14 @@
154154
"transaction_type_name_AMMWithdraw": "Retrait depuis un AMM",
155155
"transaction_type_name_AMMVote": "Vote AMM",
156156
"transaction_type_name_AMMBid": "Offre AMM créée",
157+
"transaction_type_name_AMMClawback": null,
157158
"transaction_type_name_AccountSet": "Compte défini",
158159
"transaction_type_name_CheckCancel": "Chèque annulé",
159160
"transaction_type_name_CheckCash": "Chèque remis",
160161
"transaction_type_name_CheckCreate": "Chèque créé",
162+
"transaction_type_name_CredentialAccept": null,
163+
"transaction_type_name_CredentialCreate": null,
164+
"transaction_type_name_CredentialDelete": null,
161165
"transaction_type_name_DepositPreauth": "Dépôt préautorisé",
162166
"transaction_type_name_Error_Cases": "Cas d'erreur",
163167
"transaction_type_name_EscrowCancel": "séquestre annulé",
@@ -177,6 +181,8 @@
177181
"transaction_type_name_PaymentChannelClaim": "Canal de paiement réclamé",
178182
"transaction_type_name_PaymentChannelCreate": "Canal de paiement créé",
179183
"transaction_type_name_PaymentChannelFund": "Canal provisionné",
184+
"transaction_type_name_PermissionedDomainDelete": null,
185+
"transaction_type_name_PermissionedDomainSet": null,
180186
"transaction_type_name_SetRegularKey": "Clé régulière définie",
181187
"transaction_type_name_SignerListSet": "Liste de signataires établie",
182188
"transaction_type_name_TicketCreate": "Ticket créé",
@@ -305,15 +311,6 @@
305311
"get_account_state_failed": "Impossible de charger l'état du compte",
306312
"get_account_transactions_failed": "Impossible de charger les transactions du compte",
307313
"get_account_transactions_try": "Essayer de charger plus de transactions",
308-
"resolve_paystring_failed": "Impossible d'utiliser la PayString",
309-
"paystring_address_invalid": "(Non conforme)",
310-
"paystring_address": "Adresse",
311-
"paystring_empty_title": "Aucun PayString n'a été fourni.",
312-
"paystring_empty_hint": "Entrez un PayString dans la barre de recherche",
313-
"paystring_environment": "Environnement",
314-
"paystring_explainer_blurb": "PayString est l'identifiant universel pour les paiements. Il utilise une norme simple et ouverte pour aider les utilisateurs à envoyer et recevoir facilement de l'argent - sur n'importe quel réseau de paiement - en utilisant un seul identifiant.",
315-
"paystring_network": "Réseau",
316-
"paystring_tag": "Étiquette",
317314
"pubkey": "clé publique",
318315
"node_pubkey": "clé publique de nœud",
319316
"ip": "adresse IP",
@@ -557,5 +554,12 @@
557554
"search_results_banner": null,
558555
"enable_amendment_name": null,
559556
"amendment_status": null,
560-
"expected_date": null
557+
"expected_date": null,
558+
"credential_type": null,
559+
"credential_issuer": null,
560+
"subject": null,
561+
"expiration": null,
562+
"domain_id": null,
563+
"accepted_credentials": null,
564+
"action_from_and": null
561565
}

public/locales/ja-JP/translations.json

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -154,10 +154,14 @@
154154
"transaction_type_name_AMMWithdraw": "AMMからの引出",
155155
"transaction_type_name_AMMVote": "AMMへの投票",
156156
"transaction_type_name_AMMBid": "AMMへの入札",
157+
"transaction_type_name_AMMClawback": null,
157158
"transaction_type_name_AccountSet": "アカウント設定",
158159
"transaction_type_name_CheckCancel": "チェックの取消",
159160
"transaction_type_name_CheckCash": "チェックの現金化",
160161
"transaction_type_name_CheckCreate": "チェックの作成",
162+
"transaction_type_name_CredentialAccept": null,
163+
"transaction_type_name_CredentialCreate": null,
164+
"transaction_type_name_CredentialDelete": null,
161165
"transaction_type_name_DepositPreauth": "入金の事前承認",
162166
"transaction_type_name_Error_Cases": "エラーケース",
163167
"transaction_type_name_EscrowCancel": "エスクローの取消",
@@ -177,6 +181,8 @@
177181
"transaction_type_name_PaymentChannelClaim": "ペイメントチャネル請求",
178182
"transaction_type_name_PaymentChannelCreate": "ペイメントチャネル作成",
179183
"transaction_type_name_PaymentChannelFund": "ペイメントチャネル資金",
184+
"transaction_type_name_PermissionedDomainDelete": null,
185+
"transaction_type_name_PermissionedDomainSet": null,
180186
"transaction_type_name_SetHook": "Hookの設定",
181187
"transaction_type_name_SetRegularKey": "レギュラーキーの設定",
182188
"transaction_type_name_SignerListSet": "署名者リスト設定",
@@ -305,15 +311,6 @@
305311
"get_account_state_failed": "アカウント情報を取得することができません",
306312
"get_account_transactions_failed": "アカウントのトランザクションを取得することができません",
307313
"get_account_transactions_try": null,
308-
"resolve_paystring_failed": "PayStringを解決できません",
309-
"paystring_address_invalid": "(不明)",
310-
"paystring_address": "アドレス",
311-
"paystring_empty_title": "PayStringがありません。",
312-
"paystring_empty_hint": "検索欄にPayStringを入力してください",
313-
"paystring_environment": "環境",
314-
"paystring_explainer_blurb": "PayStringは、シンプルでオープンな規格を採用し、あらゆる決済ネットワークにおいて、単一のIDで簡単に送受信できる決済用のユニバーサルIDです。",
315-
"paystring_network": "ネットワーク",
316-
"paystring_tag": "タグ",
317314
"pubkey": "公開鍵",
318315
"node_pubkey": "ノードの公開鍵",
319316
"ip": "IPアドレス",
@@ -556,5 +553,12 @@
556553
"search_results_banner": null,
557554
"enable_amendment_name": null,
558555
"amendment_status": null,
559-
"expected_date": null
556+
"expected_date": null,
557+
"credential_type": null,
558+
"credential_issuer": null,
559+
"subject": null,
560+
"expiration": null,
561+
"domain_id": null,
562+
"accepted_credentials": null,
563+
"action_from_and": null
560564
}

0 commit comments

Comments
 (0)