diff --git a/app/api/apiConfig.js b/app/api/apiConfig.js
index aa586e61ee..449a8d6a31 100644
--- a/app/api/apiConfig.js
+++ b/app/api/apiConfig.js
@@ -176,7 +176,7 @@ export const settingsAPIs = {
contact: "telegram:bhuzor"
},
{
- url: "wss://bts.open.icowallet.net/ws",
+ url: "wss://btsapi.magicw.net/ws",
region: "Eastern Asia",
country: "China",
location: "Hangzhou",
@@ -345,14 +345,6 @@ export const settingsAPIs = {
operator: "Witness: liuye",
contact: "email:work@akawa.ink"
},
- {
- url: "wss://api.iamredbar.com/bts-testnet",
- region: "Northern America",
- country: "USA",
- location: "Atlanta",
- operator: "Witness: iamredbar",
- contact: "email:iamredbar@protonmail.com"
- },
{
url: "wss://btstestnet.cybertron.ninja/ws",
region: "Northern America",
@@ -360,6 +352,14 @@ export const settingsAPIs = {
location: "Utah",
operator: "Witness: cn-faucet-test",
contact: "email:codinheim@protonmail.com"
+ },
+ {
+ url: "wss://bitsharestestnet.loclx.io",
+ region: "Northern America",
+ country: "USA",
+ location: "Chicago",
+ operator: "bitshares.info",
+ contact: "telegram:brekyrself"
}
],
ES_WRAPPER_LIST: [
diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json
index 01e39f2683..a430b582df 100644
--- a/app/assets/locales/locale-de.json
+++ b/app/assets/locales/locale-de.json
@@ -1268,7 +1268,7 @@
"bitcny": "bitCNY kann 1:1 zum echten Yuan ein- oder ausbezahlt werden, indem die Gateway des Magic Wallet Dienstes benutzt wird. Mehr Informationen auf https://www.magicw.net/",
"bridge": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch CryptoBridge bereitgestellt",
"gdex": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch Gdex bereitgestellt",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch OpenLedger bereitgestellt",
"pirate": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch PirateDEX bereitgestellt",
"rudex": "Die %(asset)s Anlage ist 1:1 durch echte %(backed)s hinterlegt und kann ein- oder ausgezahlt werden. Der Gateway-Dienst wird durch Rudex bereitgestellt",
@@ -1338,7 +1338,7 @@
"info": "Info",
"intermediate": "Zwischenglied Konto",
"inventory": "Inventar",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1953,6 +1953,7 @@
},
"transfer": "{from} hat {amount} an {to} überwiesen.",
"transfer_account": "Konto {account} wurde an {to} übertragen.",
+ "unknown_operation": "Unbekannte Operation",
"unlisted_by": "{lister} hat {listee} von der Liste gestrichen.",
"update_account": "{account} hat seine Kontodetails aktualisiert.",
"vesting_balance_withdraw": "{account} hat Sperrfristguthaben {amount} beansprucht.",
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
index 3fea38a14d..65cb8e2bfe 100644
--- a/app/assets/locales/locale-en.json
+++ b/app/assets/locales/locale-en.json
@@ -993,7 +993,7 @@
"tooltip_resolution_date": "The resolution date is an informal statement when the asset owner intends to resolve this betting market."
},
"price_feed": {
- "external_feed_price": "Feed price (derived from price feeds and other parameters)",
+ "external_feed_price": "Settlement price (derived from price feeds and other parameters)",
"feed_lifetime": "Feed lifetime (hours)",
"feed_price": "Feed price",
"global_settlement_price": "Global settlement price will be",
@@ -1268,7 +1268,7 @@
"bitcny": "bitCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/",
"bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.",
"gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDEX.",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by OpenLedger.",
"pirate": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by PirateDEX.",
"rudex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Rudex.",
@@ -1338,7 +1338,7 @@
"info": "Info",
"intermediate": "Intermediate account",
"inventory": "Inventory",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1953,6 +1953,7 @@
},
"transfer": "{from} sent {amount} to {to}",
"transfer_account": "{account} ownership transferred to {to}",
+ "unknown_operation": "Unknown operation",
"unlisted_by": "{lister} unlisted the account {listee}",
"update_account": "{account} updated their account data {change}",
"vesting_balance_withdraw": "{account} withdrew vesting balance of {amount}",
diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json
index 3c7b4e2c1d..5efe835b30 100644
--- a/app/assets/locales/locale-es.json
+++ b/app/assets/locales/locale-es.json
@@ -1268,7 +1268,7 @@
"bitcny": "bitCNY se puede depositar o retirar 1:1 a Yuan real mediante un servicio de puerta de enlace como Magic Wallet. Para más información, consulte https://www.magicw.net/",
"bridge": "El activo %(asset)s es respaldado 1:1 por real %(backed)s y puede ser depositado or retiado usando el servico de porton proporcionado por CryptoBridge.",
"gdex": "El %(asset)s activo es respaldado 1:1 por real %(backed)s y puede ser depositado or retirado usando el servico de porton proporcionado por GDex.",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "El %(asset)s activo es respaldado 1:1 por real %(backed)s y puede ser depositado or retirado usando el servico de porton proporcionado por OpenLedger.",
"pirate": "El activo %(asset) està respaldado 1:1 da real %(backed)s y puede ser depositado o retirado utilizando el servicio de puerta de enlace proporcionado por PirateDEX.",
"rudex": "El %(asset)s activo es respaldado 1:1 por real %(backed)s y puede ser depositado or retirado usando el servico de porton proporcionado por Rudex.",
@@ -1338,7 +1338,7 @@
"info": "Información",
"intermediate": "Cuenta intermedia",
"inventory": "Inventario",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1953,6 +1953,7 @@
},
"transfer": "{from} enviado {amount} a {to}",
"transfer_account": "{account} propiedad transferida a {to}",
+ "unknown_operation": "Operación desconocida",
"unlisted_by": "{lister} delistada la cuenta {listee}",
"update_account": "{account} actualizado sus datos de cuenta",
"vesting_balance_withdraw": "{account} retiro del saldo de adquisición de {amount}",
diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json
index 5907274ca2..a1ea967a96 100644
--- a/app/assets/locales/locale-fr.json
+++ b/app/assets/locales/locale-fr.json
@@ -1262,7 +1262,7 @@
"bitcny": "bitCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/",
"bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.",
"gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDex.",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Openledger.",
"pirate": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by PirateDEX.",
"rudex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Rudex.",
@@ -1332,7 +1332,7 @@
"info": "Info",
"intermediate": "Intermediate account",
"inventory": "Inventory",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1947,6 +1947,7 @@
},
"transfer": "{from} a envoyé {amount} à {to}",
"transfer_account": "{account} ownership transferred to {to}",
+ "unknown_operation": "Opération inconnue",
"unlisted_by": "{lister} a délisté le compte {listee}",
"update_account": "{account} a mis à jour les donnéees de son compte",
"vesting_balance_withdraw": "{account} a retiré {amount} d'un solde bloqué",
diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json
index 9ed275c55b..5fa4053d72 100644
--- a/app/assets/locales/locale-it.json
+++ b/app/assets/locales/locale-it.json
@@ -1262,7 +1262,7 @@
"bitcny": "bitCNY v 1:1 verso veri Yuan usando un servizio di gateway come Magic Wallet. For more info, vedi https://www.magicw.net/",
"bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.",
"gdex": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da GDex.",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da OpenLedger.",
"pirate": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da PirateDEX.",
"rudex": "L'asset %(asset)s è garantito 1:1 da %(backed)s reali e può essere depositato o ritirato usando il servizio di gateway fornito da Rudex.",
@@ -1332,7 +1332,7 @@
"info": "Info",
"intermediate": "Account intermedio",
"inventory": "Inventario",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1947,6 +1947,7 @@
},
"transfer": "{from} ha inviato {amount} a {to}",
"transfer_account": "L'ownership di {account} è stata transferita a {to}",
+ "unknown_operation": "Operazione sconosciuta",
"unlisted_by": "{lister} ha delistato l'account {listee}",
"update_account": "{account} ha aggiornato i dati del suo account",
"vesting_balance_withdraw": "{account} ha ritirato un saldo vesting di {amount}",
diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json
index 0c6f42019c..61437de06f 100644
--- a/app/assets/locales/locale-ja.json
+++ b/app/assets/locales/locale-ja.json
@@ -1262,7 +1262,7 @@
"bitcny": "bitCNY はMagic Walletが提供するゲートウェイサービスによって実際の元と1：1で入出金できます。詳細はこちらを見てください https://www.magicw.net/",
"bridge": "%(asset)sアセットは実際の%(backed)sと1：1に対応し、CryptoBridgeによって提供されるゲートウェイサービスによって入出金が可能です。",
"gdex": "%(asset)sアセットは実際の%(backed)sと1：1に対応し、Gdexによって提供されるゲートウェイサービスによって入出金が可能です。",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "%(asset)sアセットは実際の%(backed)sと1：1に対応し、OpenLedgerによって提供されるゲートウェイサービスによって入出金が可能です。",
"pirate": "%(asset)sアセットは実際の%(backed)sと1：1に対応し、PirateDEXによって提供されるゲートウェイサービスによって入出金が可能です。",
"rudex": "%(asset)sアセットは実際の%(backed)sと1：1に対応し、Rudexによって提供されるゲートウェイサービスによって入出金が可能です。",
@@ -1332,7 +1332,7 @@
"info": "情報",
"intermediate": "中間アカウント",
"inventory": "一覧表",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1947,6 +1947,7 @@
},
"transfer": "{from}は{amount}を{to}に送りました",
"transfer_account": "{account}の所有権を{to}に移転しました",
+ "unknown_operation": "不明な操作",
"unlisted_by": "{lister}は{listee}をリストから外しました",
"update_account": "{account}はアカウント情報を更新しました",
"vesting_balance_withdraw": "{account}は{amount}の権利確定残高を引き出しました",
diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json
index a8530dac62..a1e6437810 100644
--- a/app/assets/locales/locale-ko.json
+++ b/app/assets/locales/locale-ko.json
@@ -1262,7 +1262,7 @@
"bitcny": "bitCNY can be deposited or withdrawn 1:1 to real Yuan using a gateway service such as Magic Wallet. For more info, see https://www.magicw.net/",
"bridge": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by CryptoBridge.",
"gdex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by GDex.",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Openledger.",
"pirate": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by PirateDEX.",
"rudex": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by Rudex.",
@@ -1332,7 +1332,7 @@
"info": "Info",
"intermediate": "Intermediate account",
"inventory": "Inventory",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1947,6 +1947,7 @@
},
"transfer": "{from} sent {amount} to {to}",
"transfer_account": "{account} ownership transferred to {to}",
+ "unknown_operation": "Unknown operation",
"unlisted_by": "{lister} unlisted the account {listee}",
"update_account": "{account} updated their account data",
"vesting_balance_withdraw": "{account} withdrew vesting balance of {amount}",
diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
index e68998a99d..0dfbb77e92 100644
--- a/app/assets/locales/locale-ru.json
+++ b/app/assets/locales/locale-ru.json
@@ -1268,7 +1268,7 @@
"bitcny": "bitCNY может быть депонирован или выведен в соотношении 1:1 к реальному юаню с помощью сервиса шлюза от Magic Wallet. Подробную информацию можно найти здесь https://www.magicw.net/",
"bridge": " Актив %(asset)s обеспечен в соотношении 1:1 реальными %(backed)s и может быть размещен в депозите или выведен через шлюз, предоставляемый CryptoBridge.",
"gdex": " Актив %(asset)s обеспечен в соотношении 1:1 реальными %(backed)s и может быть размещен в депозите или выведен через шлюз, предоставляемый GDex.",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от OpenLedger.",
"pirate": "Актив %(asset)s обеспечен реальными %(backed)s в соотношении 1:1 и может быть введён/выведен с помощью сервиса шлюза от PirateDEX.",
"rudex": "Актив %(asset)s обеспечивается реальными %(backed)s в соотношении 1:1 и может быть депонирован или выведен с помощью сервиса шлюза от Rudex.",
@@ -1338,7 +1338,7 @@
"info": "Информация",
"intermediate": "Промежуточный аккаунт",
"inventory": "Инвентарь",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1953,6 +1953,7 @@
},
"transfer": "{from} отправил {amount} на {to}",
"transfer_account": "Владение {account} передано {to}",
+ "unknown_operation": "Неизвестная операция",
"unlisted_by": "{lister} удалил аккаунт {listee} из списка",
"update_account": "{account} обновил данные своего аккаунта {change}",
"vesting_balance_withdraw": "{account} вывел с вестингового баланса {amount}",
diff --git a/app/assets/locales/locale-tr.json b/app/assets/locales/locale-tr.json
index caf4372d7d..be38028bcb 100644
--- a/app/assets/locales/locale-tr.json
+++ b/app/assets/locales/locale-tr.json
@@ -1262,7 +1262,7 @@
"bitcny": "bitCNY, Çin Yuanı'nın Bitshares borsasındaki temsilidir. 1:1 Çin Yuanı ile değiştirilebilen bu dijital varlık Magic Wallet tarafından yürütülmektedir. Daha fazla bilgi için: https://www.magicw.net/",
"bridge": "Bu dijital varlık Bitshares üzerinde %(backed)s işlemleri yapmanız için CryptoBridge tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.",
"gdex": "Bu dijital varlık Bitshares üzerinde %(backed)s işlemleri yapmanız için Gdex tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "Bu dijital varlık Bitshares üzerinde %(backed)s işlemleri yapmanız için OpenLedger tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.",
"pirate": "Bu dijital varlık Bitshares üzerinde %(backed)s işlemleri yapmanız için PirateDEX tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.",
"rudex": "Bu dijital varlık Bitshares üzerinde %(backed)s işlemleri yapmanız için Rudex tarafından %%100 %(backed)s rezervi ile desteklenmektedir. İstediğiniz zaman 1:1 oranında %(asset)s-%(backed)s dönüşümü yapabilirsiniz.",
@@ -1332,7 +1332,7 @@
"info": "Info",
"intermediate": "Aracı hesap",
"inventory": "Envanter",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1947,6 +1947,7 @@
},
"transfer": "{from} {amount} gönderdi - Alıcı: {to}",
"transfer_account": "{account} adlı hesabın mülkiyeti {to} adlı hesaba devredildi.",
+ "unknown_operation": "Bilinmeyen operasyon",
"unlisted_by": "{lister} izin listesinden {listee} adlı hesabı çıkardı.",
"update_account": "{account} hesap verilerini güncelledi",
"vesting_balance_withdraw": "{account} bekleyen bakiyeyi çekti - Miktar: {amount}",
diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json
index e472d898cd..4ce6b82ef7 100644
--- a/app/assets/locales/locale-zh.json
+++ b/app/assets/locales/locale-zh.json
@@ -1268,7 +1268,7 @@
"bitcny": "bitCNY 通常可与真实CNY1：1兑换，可以通过例如 Magic Wallet 提供的网关服务进行充值提现。更多信息请访问 https://www.magicw.net/",
"bridge": "资产 %(asset)s 由真实资产 %(backed)s 1:1 储备背书。可以通过 CryptoBridge 提供的网关服务进行充值提现。",
"gdex": "资产 %(asset)s 由真实资产 %(backed)s 1:1 储备背书。可以通过 GDEX 提供的网关服务进行充值提现。",
- "ioxbank": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
+ "iob": "The %(asset)s asset is backed 1:1 by real %(backed)s and can be deposited or withdrawn using the gateway service provided by ioxbank.com.",
"open": "资产 %(asset)s 由真实资产 %(backed)s 1:1 储备背书。可以通过 Openledger 提供的网关服务进行充值提现。",
"pirate": "%(asset)s资产由真实%(backed)s1:1储备背书，可以通过 PirateDEX 提供的网关服务进行充值提现。",
"rudex": "资产 %(asset)s 由真实资产 %(backed)s 1:1 储备背书。可以通过 Rudex 提供的网关服务进行充值提现。",
@@ -1338,7 +1338,7 @@
"info": "交易信息",
"intermediate": "中间账户",
"inventory": "库存",
- "ioxbank": {
+ "iob": {
"coming_soon": "Coming soon",
"min_amount": "Minimum amount: %(minAmount)s %(symbol)s",
"min_amount_error": "Please enter number >= minimum",
@@ -1953,6 +1953,7 @@
},
"transfer": "{from} 将 {amount} 转账给 {to}",
"transfer_account": "{account} 的账户权限转移给了 {to}",
+ "unknown_operation": "未知操作",
"unlisted_by": "{lister} 将 {listee} 移出清单",
"update_account": "{account} 更新了账户信息",
"vesting_balance_withdraw": "{account} 提取了解冻金额 {amount}",
diff --git a/app/components/Blockchain/operations/DefaultOperation.jsx b/app/components/Blockchain/operations/DefaultOperation.jsx
index 68f4a3bdc9..652b717784 100644
--- a/app/components/Blockchain/operations/DefaultOperation.jsx
+++ b/app/components/Blockchain/operations/DefaultOperation.jsx
@@ -1,11 +1,11 @@
-import React from "react";
-import {Link} from "react-router-dom";
-
-export const DefaultOperation = ({op, block}) => {
- console.log("unimplemented op:", op);
- return (
-
- #{block}
-
- );
-};
+import React from "react";
+import counterpart from "counterpart";
+
+export const DefaultOperation = ({op}) => {
+ console.log("unimplemented op:", op);
+ return (
+
+ {counterpart.translate("operation.unknown_operation")} {op[0]}
+
+ );
+};
diff --git a/app/components/Exchange/OrderBook.jsx b/app/components/Exchange/OrderBook.jsx
index 463c27bd53..7b14ae5746 100644
--- a/app/components/Exchange/OrderBook.jsx
+++ b/app/components/Exchange/OrderBook.jsx
@@ -784,11 +784,11 @@ class OrderBook extends React.Component {
});
} else {
let maxBid = tempBids.length
- ? tempBids[tempBids.length - 1].totalToReceive().getAmount()
+ ? tempBids[tempBids.length - 1].totalForSale().getAmount()
: 0;
bidRows = tempBids.map((order, index) => {
- const value = order.totalToReceive().getAmount();
+ const value = order.totalForSale().getAmount();
const percentage = Math.ceil((value * 100) / maxBid);
return horizontal ? (
{
- const value = order.totalToReceive().getAmount();
+ const value = order.totalForSale().getAmount();
const percentage = Math.ceil((value * 100) / maxAsk);
return horizontal ? (
",
@@ -144,7 +144,7 @@
"bignumber.js": "^4.0.0",
"bitshares-report": "https://github.com/bitshares/bitshares-report.git",
"bitshares-ui-style-guide": "https://github.com/bitshares/bitshares-ui-style-guide.git",
- "bitsharesjs": "^6.0.0",
+ "bitsharesjs": "^6.0.2",
"browser-locale": "^1.0.3",
"classnames": "^2.2.1",
"constants-browserify": "^1.0.0",
@@ -275,7 +275,7 @@
"svgo": "^2.8.0",
"svgo-loader": "^3.0.0",
"url-loader": "^4.1.1",
- "webpack": "^5.65.0",
+ "webpack": "^5.76.0",
"webpack-cli": "^4.9.1",
"webpack-dev-server": "^4.6.0",
"webpack-hot-middleware": "^2.25.1",
diff --git a/yarn.lock b/yarn.lock
index 376a6caf86..20f60831cc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1555,10 +1555,10 @@
dependencies:
"@types/ms" "*"
-"@types/eslint-scope@^3.7.0":
- version "3.7.3"
- resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
- integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
+"@types/eslint-scope@^3.7.3":
+ version "3.7.4"
+ resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.4.tgz#37fc1223f0786c39627068a12e94d6e6fc61de16"
+ integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
dependencies:
"@types/eslint" "*"
"@types/estree" "*"
@@ -1571,10 +1571,10 @@
"@types/estree" "*"
"@types/json-schema" "*"
-"@types/estree@*", "@types/estree@^0.0.50":
- version "0.0.50"
- resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
- integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
+"@types/estree@*", "@types/estree@^0.0.51":
+ version "0.0.51"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+ integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
version "4.17.28"
@@ -1996,15 +1996,10 @@ acorn@^7.1.1, acorn@^7.4.1:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
-acorn@^8.4.1, acorn@^8.7.0:
- version "8.7.0"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
- integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
-
-acorn@^8.5.0:
- version "8.8.1"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.1.tgz#0a3f9cbecc4ec3bea6f0a80b66ae8dd2da250b73"
- integrity sha512-7zFpHzhnqYKrkYdUjF1HI1bzd0VygEGX8lFk4k5zVMqHEoES+P+7TKI+EvLO9WVMJ8eekdO0aDEK044xTXwPPA==
+acorn@^8.5.0, acorn@^8.7.0, acorn@^8.7.1:
+ version "8.8.2"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
+ integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
add-dom-event-listener@^1.1.0:
version "1.1.0"
@@ -2804,21 +2799,21 @@ bindings@^1.5.0:
react-dom "16.14.0"
react-router-dom "^5.1.2"
-bitsharesjs-ws@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/bitsharesjs-ws/-/bitsharesjs-ws-6.0.0.tgz#88f5f2014b355ea20ddfdcee6494a8db0596ad15"
- integrity sha512-hIsFcGggV6jkgCKrVE7Pmm8AgJMbBc2pthOx1/9he436gfehtbMvjn7J5G3rWhPu0VONROI//LAX/qhhhIieaA==
+bitsharesjs-ws@^6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/bitsharesjs-ws/-/bitsharesjs-ws-6.0.2.tgz#3b068af0a9b4b97429c7b8897882f228f7b6e385"
+ integrity sha512-NkmCx9wnBAnu2DU2miSdIl6AxN0PnfSessUwZwkUN7v5KZWaBtfjUGtxr0zUPi2wUGkOCuJOVBH9OUG3TiMwZg==
dependencies:
isomorphic-ws "^4.0.1"
ws "^8.4.0"
-bitsharesjs@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/bitsharesjs/-/bitsharesjs-6.0.0.tgz#1de869e6e9c9f5ba17b7a3c4baf67e9f78b9bb82"
- integrity sha512-KSYvLvbRLNZ+cdzAiQ6YuryZx1b7yXnz7pOBzbRt5yz+7KIh7OUFUJBQ45G6wwBIc3kqnxcZVOsISwl7hLoGFQ==
+bitsharesjs@^6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/bitsharesjs/-/bitsharesjs-6.0.2.tgz#0fcae6b9f6113a91d06fc000523255f3e1dade00"
+ integrity sha512-BrzlQic/lRyy2JQmz8sPcIlBMTFDhKlpGR+3vln12jOGlm4nDMFne7iFWzgN39NKu49yFD6ufZFe7uNdDgje6A==
dependencies:
bigi "^1.4.2"
- bitsharesjs-ws "^6.0.0"
+ bitsharesjs-ws "^6.0.2"
bs58 "^4.0.1"
bytebuffer "^5.0.1"
create-hash "^1.2.0"
@@ -4660,10 +4655,10 @@ end-of-stream@^1.1.0, end-of-stream@^1.4.1:
dependencies:
once "^1.4.0"
-enhanced-resolve@^5.8.3:
- version "5.8.3"
- resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.3.tgz#6d552d465cce0423f5b3d718511ea53826a7b2f0"
- integrity sha512-EGAbGvH7j7Xt2nc0E7D99La1OiEs8LnyimkRgwExpUMScN6O+3x9tIWs7PLQZVNx4YD+00skHXPXi1yQHpAmZA==
+enhanced-resolve@^5.10.0:
+ version "5.12.0"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634"
+ integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
dependencies:
graceful-fs "^4.2.4"
tapable "^2.2.0"
@@ -7555,12 +7550,12 @@ json-buffer@3.0.0:
resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ==
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
@@ -10925,9 +10920,9 @@ semver-compare@^1.0.0:
integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w=
"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+ version "5.7.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+ integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
semver@7.0.0, semver@~7.0.0:
version "7.0.0"
@@ -10935,14 +10930,14 @@ semver@7.0.0, semver@~7.0.0:
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
- integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+ integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
semver@^7.3.2:
- version "7.3.5"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
- integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+ integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"
@@ -12344,10 +12339,10 @@ warning@4.x, warning@^4.0.1, warning@^4.0.2, warning@^4.0.3, warning@~4.0.3:
dependencies:
loose-envify "^1.0.0"
-watchpack@^2.3.1:
- version "2.3.1"
- resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
- integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
+watchpack@^2.4.0:
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+ integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
dependencies:
glob-to-regexp "^0.4.1"
graceful-fs "^4.1.2"
@@ -12451,40 +12446,40 @@ webpack-merge@^5.7.3:
clone-deep "^4.0.1"
wildcard "^2.0.0"
-webpack-sources@^3.2.2:
+webpack-sources@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
-webpack@^5.65.0:
- version "5.66.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.66.0.tgz#789bf36287f407fc92b3e2d6f978ddff1bfc2dbb"
- integrity sha512-NJNtGT7IKpGzdW7Iwpn/09OXz9inIkeIQ/ibY6B+MdV1x6+uReqz/5z1L89ezWnpPDWpXF0TY5PCYKQdWVn8Vg==
+webpack@^5.76.0:
+ version "5.76.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.0.tgz#f9fb9fb8c4a7dbdcd0d56a98e56b8a942ee2692c"
+ integrity sha512-l5sOdYBDunyf72HW8dF23rFtWq/7Zgvt/9ftMof71E/yUb1YLOBmTgA2K4vQthB3kotMrSj609txVE0dnr2fjA==
dependencies:
- "@types/eslint-scope" "^3.7.0"
- "@types/estree" "^0.0.50"
+ "@types/eslint-scope" "^3.7.3"
+ "@types/estree" "^0.0.51"
"@webassemblyjs/ast" "1.11.1"
"@webassemblyjs/wasm-edit" "1.11.1"
"@webassemblyjs/wasm-parser" "1.11.1"
- acorn "^8.4.1"
+ acorn "^8.7.1"
acorn-import-assertions "^1.7.6"
browserslist "^4.14.5"
chrome-trace-event "^1.0.2"
- enhanced-resolve "^5.8.3"
+ enhanced-resolve "^5.10.0"
es-module-lexer "^0.9.0"
eslint-scope "5.1.1"
events "^3.2.0"
glob-to-regexp "^0.4.1"
graceful-fs "^4.2.9"
- json-parse-better-errors "^1.0.2"
+ json-parse-even-better-errors "^2.3.1"
loader-runner "^4.2.0"
mime-types "^2.1.27"
neo-async "^2.6.2"
schema-utils "^3.1.0"
tapable "^2.1.1"
terser-webpack-plugin "^5.1.3"
- watchpack "^2.3.1"
- webpack-sources "^3.2.2"
+ watchpack "^2.4.0"
+ webpack-sources "^3.2.3"
webrtc-adapter@^7.2.1:
version "7.7.1"
@@ -12614,9 +12609,9 @@ wildcard@^2.0.0:
integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
word-wrap@^1.2.3, word-wrap@~1.2.3:
- version "1.2.3"
- resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
- integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+ version "1.2.4"
+ resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+ integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
wordwrap@^1.0.0:
version "1.0.0"