From e0440f7e80820afb05c4deea0c6dd76f8734e02c Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Mon, 2 Oct 2023 14:18:01 +0300 Subject: [PATCH 1/5] update SyntheticSwitcher & ExternalLink components --- .../pages/Wallet/AboutNetworkDialog.vue | 5 +-- src/components/shared/ExternalLink.vue | 34 --------------- .../shared/SelectAsset/SelectToken.vue | 2 +- src/components/shared/SyntheticSwitcher.vue | 41 ------------------- src/consts/index.ts | 2 - src/utils/regexp.ts | 5 +-- src/views/Explore/Tokens.vue | 2 +- 7 files changed, 6 insertions(+), 85 deletions(-) delete mode 100644 src/components/shared/ExternalLink.vue delete mode 100644 src/components/shared/SyntheticSwitcher.vue diff --git a/src/components/pages/Wallet/AboutNetworkDialog.vue b/src/components/pages/Wallet/AboutNetworkDialog.vue index a2fca9838..fe764e511 100644 --- a/src/components/pages/Wallet/AboutNetworkDialog.vue +++ b/src/components/pages/Wallet/AboutNetworkDialog.vue @@ -13,13 +13,12 @@ import { components, mixins } from '@soramitsu/soraneo-wallet-web'; import { Component, Mixins } from 'vue-property-decorator'; import TranslationMixin from '@/components/mixins/TranslationMixin'; -import { Components, Links } from '@/consts'; -import { lazyComponent } from '@/router'; +import { Links } from '@/consts'; @Component({ components: { DialogBase: components.DialogBase, - ExternalLink: lazyComponent(Components.ExternalLink), + ExternalLink: components.ExternalLink, }, }) export default class AboutNetworkDialog extends Mixins(TranslationMixin, mixins.DialogMixin) { diff --git a/src/components/shared/ExternalLink.vue b/src/components/shared/ExternalLink.vue deleted file mode 100644 index b5250303d..000000000 --- a/src/components/shared/ExternalLink.vue +++ /dev/null @@ -1,34 +0,0 @@ - - - - - diff --git a/src/components/shared/SelectAsset/SelectToken.vue b/src/components/shared/SelectAsset/SelectToken.vue index d37e92b86..2660b5839 100644 --- a/src/components/shared/SelectAsset/SelectToken.vue +++ b/src/components/shared/SelectAsset/SelectToken.vue @@ -92,7 +92,7 @@ function getNonWhitelistDivisibleAssets( components: { DialogBase: components.DialogBase, SelectAssetList: lazyComponent(Components.SelectAssetList), - SyntheticSwitcher: lazyComponent(Components.SyntheticSwitcher), + SyntheticSwitcher: components.SyntheticSwitcher, TokenAddress: components.TokenAddress, SearchInput: components.SearchInput, AddAssetDetailsCard: components.AddAssetDetailsCard, diff --git a/src/components/shared/SyntheticSwitcher.vue b/src/components/shared/SyntheticSwitcher.vue deleted file mode 100644 index c6c8f3ca8..000000000 --- a/src/components/shared/SyntheticSwitcher.vue +++ /dev/null @@ -1,41 +0,0 @@ - - - - - diff --git a/src/consts/index.ts b/src/consts/index.ts index e121656ff..f72a05f8c 100644 --- a/src/consts/index.ts +++ b/src/consts/index.ts @@ -217,7 +217,6 @@ export enum Components { WalletAboutNetworkDialog = 'pages/Wallet/AboutNetworkDialog', // Shared GenericPageHeader = 'shared/GenericPageHeader', - ExternalLink = 'shared/ExternalLink', TokensRow = 'shared/TokensRow', PairTokenLogo = 'shared/PairTokenLogo', PriceChange = 'shared/PriceChange', @@ -225,7 +224,6 @@ export enum Components { TransactionDetails = 'shared/TransactionDetails', PoolInfo = 'shared/PoolInfo', Widget = 'shared/Widget', - SyntheticSwitcher = 'shared/SyntheticSwitcher', // Shared Buttons SortButton = 'shared/Button/SortButton', SvgIconButton = 'shared/Button/SvgIconButton/SvgIconButton', diff --git a/src/utils/regexp.ts b/src/utils/regexp.ts index 1d35dbade..eef8c0fb2 100644 --- a/src/utils/regexp.ts +++ b/src/utils/regexp.ts @@ -1,4 +1,4 @@ -import { XSTUSD } from '@sora-substrate/util/build/assets/consts'; +import { WALLET_CONSTS } from '@soramitsu/soraneo-wallet-web'; const ws = 'wss?:\\/\\/'; const port = '(?::([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5]))'; @@ -13,5 +13,4 @@ const exact = (exp) => `^${exp}$`; export const wsRegexp = new RegExp(exactStart(ws)); export const dnsPathRegexp = new RegExp(exact(`${dns}${port}?(${segment})*/?`)); export const ipv4Regexp = new RegExp(exact(`${ipv4}${port}?(${segment})*/?`)); - -export const syntheticAssetRegexp = new RegExp(exact(`0[xX]03[0-9a-fA-F]+|${XSTUSD.address}`)); +export const syntheticAssetRegexp = WALLET_CONSTS.syntheticAssetRegexp; diff --git a/src/views/Explore/Tokens.vue b/src/views/Explore/Tokens.vue index dbcdfb493..5c9250161 100644 --- a/src/views/Explore/Tokens.vue +++ b/src/views/Explore/Tokens.vue @@ -281,7 +281,7 @@ const parse = (item: AssetData): Record => { @Component({ components: { - SyntheticSwitcher: lazyComponent(Components.SyntheticSwitcher), + SyntheticSwitcher: components.SyntheticSwitcher, PriceChange: lazyComponent(Components.PriceChange), SortButton: lazyComponent(Components.SortButton), TokenAddress: components.TokenAddress, From 8478f326478a12ec5ed081facfa0292f45817f25 Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Wed, 11 Oct 2023 10:56:00 +0300 Subject: [PATCH 2/5] update wallet --- package.json | 4 +- src/components/mixins/TranslationMixin.ts | 1 + src/lang/en.json | 14 +--- yarn.lock | 84 +++++++++++------------ 4 files changed, 46 insertions(+), 57 deletions(-) diff --git a/package.json b/package.json index 9bd4bba17..71aca0802 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "polkaswap-exchange-web", - "version": "1.22.1", + "version": "1.23.0", "repository": { "type": "git", "url": "https://github.com/sora-xor/polkaswap-exchange-web.git" @@ -24,7 +24,7 @@ }, "dependencies": { "@metamask/detect-provider": "^2.0.0", - "@soramitsu/soraneo-wallet-web": "1.23.0", + "@soramitsu/soraneo-wallet-web": "1.23.1", "@walletconnect/web3-provider": "^1.8.0", "core-js": "^3.26.0", "country-code-emoji": "^2.3.0", diff --git a/src/components/mixins/TranslationMixin.ts b/src/components/mixins/TranslationMixin.ts index 3671c8874..2de6bb95f 100644 --- a/src/components/mixins/TranslationMixin.ts +++ b/src/components/mixins/TranslationMixin.ts @@ -24,6 +24,7 @@ const TranslationConsts = { // extending consts ...WALLET_CONSTS.TranslationConsts, AppName: app.name, + Ceres: 'Ceres', APR: 'APR', // Annual percentage rate TVL: 'TVL', EVM: 'EVM', diff --git a/src/lang/en.json b/src/lang/en.json index ce4c1423c..b4f3a392e 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -315,7 +315,6 @@ "connectedText": "Connected", "connectWalletTextTooltip": "Connect to {Sora} Network with {PolkadotJs}", "selectNodeText": "Select Network Node", - "selectIndexerText": "Select indexer", "bridgeText": "Bridge", "disclaimer": "{disclaimerPrefix} This website is maintained by the {Sora} community. Before continuing to use this website, please review the {polkaswapFaqLink} and documentation, which includes a detailed explanation on how {AppName} works, as well as the {memorandumLink}, and {privacyLink}. These documents are crucial to a secure and positive user experience. By using {AppName}, you acknowledge that you have read and understand these documents. You also acknowledge the following: 1) your sole responsibility for compliance with all laws that may apply to your particular use of {AppName} in your legal jurisdiction; 2) your understanding that the current version of {AppName} is an alpha version: it has not been fully tested, and some functions may not perform as designed; and 3) your understanding and voluntary acceptance of the risks involved in using {AppName}, including, but not limited to, the risk of losing tokens. Please do not continue without reading the {polkaswapFaqLink}, {memorandumLink}, {privacyLink}!", "poweredBy": "Powered by", @@ -426,17 +425,6 @@ }, "updateNode": "Update node" }, - "selectIndexerDialog": { - "title": "{Sora} Network indexer selection", - "addIndexer": "Add custom indexer", - "updateIndexer": "Update indexer", - "customIndexer": "Custom indexer", - "howToSetupOwnIndexer": "How to setup your own {Sora} indexer", - "select": "Select", - "connected": "Connected", - "selectIndexerForEnvironment": "Select a indexer for {environment} environment:", - "indexerTitle": "{chain} hosted by {name}" - }, "buttons": { "max": "MAX", "chooseToken": "Choose token", @@ -1194,7 +1182,7 @@ "dialog": { "title": "{Sora} Network service selection", "indexer": "Indexer", - "useCeres": "Use Ceres for fiat values" + "useCeres": "Use {Ceres} for fiat values" } } }, diff --git a/yarn.lock b/yarn.lock index a5e58dab0..ce0d31490 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2263,68 +2263,68 @@ resolved "https://registry.yarnpkg.com/@soda/get-current-script/-/get-current-script-1.0.2.tgz#a53515db25d8038374381b73af20bb4f2e508d87" integrity sha512-T7VNNlYVM1SgQ+VsMYhnDkcGmWhQdL0bDyGm5TlQ3GBXnJscEClUUOKduWTmm2zCnvNLC1hc3JpuXjs/nFOc5w== -"@sora-substrate/api@1.22.9": - version "1.22.9" - resolved "https://registry.yarnpkg.com/@sora-substrate/api/-/api-1.22.9.tgz#01ba750a144ff01786c6a38dca2a408d08822917" - integrity sha512-1+2OJZ52sS2Ehau79hnl8det+Us/MoYctHBU8Zz8cfA5JhBH1giD44PIWb4FR5+59V7OvlDbZkk7gxfzETmQxg== +"@sora-substrate/api@1.23.3": + version "1.23.3" + resolved "https://registry.yarnpkg.com/@sora-substrate/api/-/api-1.23.3.tgz#1b2f0ebcde0c48fd81901aadcca59ae5c77158eb" + integrity sha512-yrEVQS+pSnJv0kB17Ex+z7ZhLR2KY7d/jU/7/DrX5da7uJ8YLeXxL3aGmswkNMSBJtBJPcQQJwXwQXGoE17M6g== dependencies: "@open-web3/orml-api-derive" "1.1.4" "@polkadot/api" "9.14.2" - "@sora-substrate/types" "1.22.9" + "@sora-substrate/types" "1.23.3" -"@sora-substrate/connection@1.22.9": - version "1.22.9" - resolved "https://registry.yarnpkg.com/@sora-substrate/connection/-/connection-1.22.9.tgz#8798e40f6aba64adfcf9a3327e330370a96f2399" - integrity sha512-uxC27HoY+rJTpigZPkeEHauLtnhz7rCkA/D62jka/7SDMLYvIzLIVFN0KEbZbereT9u72077V92HjCtp34bS/Q== +"@sora-substrate/connection@1.23.3": + version "1.23.3" + resolved "https://registry.yarnpkg.com/@sora-substrate/connection/-/connection-1.23.3.tgz#515f6f4e0055df848f630b66f3be33a07a1abcc5" + integrity sha512-nK1znTMy+3jGvylJB+zIt9qBD1Q9aJhrx36K1VOWTHrbiPa1gsOfizXE2s4S7DcdxgRIA0hhJVkNAEuNsO02SA== dependencies: - "@sora-substrate/api" "1.22.9" + "@sora-substrate/api" "1.23.3" -"@sora-substrate/liquidity-proxy@1.22.9": - version "1.22.9" - resolved "https://registry.yarnpkg.com/@sora-substrate/liquidity-proxy/-/liquidity-proxy-1.22.9.tgz#d2b6c605345e9d1b66aaf4d6ddb6efe5e846a13c" - integrity sha512-x/tsj/F87YRo3UAIGa4Q3WvqXS4FbtZJq/hrJT16Y5hyyOPCFl6Re1ZmJXP0OzeDw/Mv/hFdzSkxlUPCETkT/w== +"@sora-substrate/liquidity-proxy@1.23.3": + version "1.23.3" + resolved "https://registry.yarnpkg.com/@sora-substrate/liquidity-proxy/-/liquidity-proxy-1.23.3.tgz#cd87fc3e9ea829174105bb20896f707fffb734ed" + integrity sha512-Wt1N+zH6CyzCK3uiyNZAf6SfjTQTyHRtz2bfJt87bI8AqE/dIf+HI5kvGZ2wjw49LVl35zL9WCmK4d/YNIgsTg== dependencies: - "@sora-substrate/math" "1.22.9" + "@sora-substrate/math" "1.23.3" -"@sora-substrate/math@1.22.9": - version "1.22.9" - resolved "https://registry.yarnpkg.com/@sora-substrate/math/-/math-1.22.9.tgz#c19da5e41015a84bdf94d9140af4f0f205052f2d" - integrity sha512-xbNcqYL3To5KvqP+17ELKFEMOLt6hslKZB1pgxYfqkHhB1RPB9+Xo686D1jmDWob8owo/X2hfcvtBH1p+JBFLg== +"@sora-substrate/math@1.23.3": + version "1.23.3" + resolved "https://registry.yarnpkg.com/@sora-substrate/math/-/math-1.23.3.tgz#53eddcf6a5bd71b9679f1899d4d4386892eaec94" + integrity sha512-mhMyyfaGQFbf01J9vbJFavcfZCgXtcduKi/V6VtGUjbgCeWps/GcUBAOdUWDLGJUprVOFXbefgsTeaMbxeiHmA== dependencies: "@polkadot/types" "9.14.2" bignumber.js "^9.0.1" lodash "^4.17.15" -"@sora-substrate/type-definitions@1.22.9": - version "1.22.9" - resolved "https://registry.yarnpkg.com/@sora-substrate/type-definitions/-/type-definitions-1.22.9.tgz#f3f2327629993169e0b4a7e3d80707c0d89bec81" - integrity sha512-2E29ljHXQb76myDVNUUBut+qwK7s8qijy8D2Bt9ffGDjPzpGRke9rwpL11/uaQ/L50UZtqAAyElOGUJA1FIQqg== +"@sora-substrate/type-definitions@1.23.3": + version "1.23.3" + resolved "https://registry.yarnpkg.com/@sora-substrate/type-definitions/-/type-definitions-1.23.3.tgz#ee4cbc272deb5b8af9650e4a1426f954a2406533" + integrity sha512-z1cWllnw8hnB2EbYK/AVWN/rrg9qpl5xoRzg4Hhp4ovia9RA+2w6ibSk1o+rvXX8lW2QaR4roUQdWr82CqpFhg== dependencies: "@open-web3/orml-type-definitions" "1.1.4" -"@sora-substrate/types@1.22.9": - version "1.22.9" - resolved "https://registry.yarnpkg.com/@sora-substrate/types/-/types-1.22.9.tgz#507ea71b11ef7f5e68387589c5044e71d3d1930e" - integrity sha512-nM1H4p9z2LZvNI0gIGzHThEtiikmIM5Zh3xdejOi2E8keaie6ir5h/nby+5JPgKiAF99/XWLus5vh4UGh54aUw== +"@sora-substrate/types@1.23.3": + version "1.23.3" + resolved "https://registry.yarnpkg.com/@sora-substrate/types/-/types-1.23.3.tgz#e2f611900cdc6cbc10c7bb8de18b61d53dc2a52e" + integrity sha512-jrbztVx0ZAyD9us5CkZtQtnrXahoL2eZVsEyMM5gn1cxI2j80WIvnkAvD8DwocQx53cID8K60ma4dhCQZBdVDA== dependencies: "@open-web3/api-mobx" "0.9.4-26" "@open-web3/orml-types" "1.1.4" "@polkadot/api" "9.14.2" "@polkadot/typegen" "9.14.2" "@polkadot/types" "9.14.2" - "@sora-substrate/type-definitions" "1.22.9" + "@sora-substrate/type-definitions" "1.23.3" -"@sora-substrate/util@1.22.9": - version "1.22.9" - resolved "https://registry.yarnpkg.com/@sora-substrate/util/-/util-1.22.9.tgz#579800722f8ef21c7358231050ccad1d0d708914" - integrity sha512-i0Kt9Vs7ISQy6mRxf8n7dn3ZwDkzVMWSbrWv2+G2wtkdGHTY8fZcmsVhOltrNe9bwLkrmcXVwXsUumw9tSdRlA== +"@sora-substrate/util@1.23.3": + version "1.23.3" + resolved "https://registry.yarnpkg.com/@sora-substrate/util/-/util-1.23.3.tgz#396d44d50c54d430d0a1d1dcb45b37bd6d6da701" + integrity sha512-Sh70+A/qKVSnE8AKSNzV8ATO2V4cjzJS23OI7iPn0fC2LcVl/sexg4jwKxCFZacK8knxAvw1VOSTSlg2VieW1A== dependencies: "@polkadot/ui-keyring" "2.12.1" - "@sora-substrate/api" "1.22.9" - "@sora-substrate/connection" "1.22.9" - "@sora-substrate/liquidity-proxy" "1.22.9" - "@sora-substrate/math" "1.22.9" - "@sora-substrate/types" "1.22.9" + "@sora-substrate/api" "1.23.3" + "@sora-substrate/connection" "1.23.3" + "@sora-substrate/liquidity-proxy" "1.23.3" + "@sora-substrate/math" "1.23.3" + "@sora-substrate/types" "1.23.3" axios "^0.21.1" crypto-js "^4.0.0" lodash "^4.17.15" @@ -2357,13 +2357,13 @@ vue-property-decorator "^9.1.2" vuex "^3.6.2" -"@soramitsu/soraneo-wallet-web@1.23.0": - version "1.23.0" - resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.23.0.tgz#3cec6b81be54cdb1835f4e4f49e51c572ac63fef" - integrity sha512-dR+ij/zy1MYaC3LqAqhT0KVxr8XszrVjpJXEozTb+l4+a/DFBab14HG+dCtHLEkqkzxFvK8YnmA+Cri0Pf2LUA== +"@soramitsu/soraneo-wallet-web@1.23.1": + version "1.23.1" + resolved "https://nexus.iroha.tech/repository/npm-group/@soramitsu/soraneo-wallet-web/-/soraneo-wallet-web-1.23.1.tgz#7be6d0e977e7169ba700f063fc0d2932c2dd970c" + integrity sha512-WEqgvAtMW/ywSUMHyc3UdK5lOw9b4ACoxkqzFVaxfGbeMXLNLLNLitfpw88faKs0x0L4ACWmlt1qpS25Y+TTyg== dependencies: "@polkadot/vue-identicon" "2.12.1" - "@sora-substrate/util" "1.22.9" + "@sora-substrate/util" "1.23.3" "@sora-test/wallet-connect" "^0.0.9" "@soramitsu/soramitsu-js-ui" "^1.0.46" "@urql/core" "^4.1.2" From 77ce404c13382dceeccc3cec148cd0112734d097 Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Wed, 11 Oct 2023 11:11:28 +0300 Subject: [PATCH 3/5] update indexer translations --- src/lang/cs.json | 4 ++-- src/lang/de.json | 4 ++-- src/lang/es.json | 4 ++-- src/lang/fr.json | 4 ++-- src/lang/hr.json | 4 ++-- src/lang/hu.json | 4 ++-- src/lang/hy.json | 4 ++-- src/lang/id.json | 4 ++-- src/lang/it.json | 4 ++-- src/lang/nl.json | 4 ++-- src/lang/no.json | 4 ++-- src/lang/pl.json | 4 ++-- src/lang/ru.json | 4 ++-- src/lang/sk.json | 4 ++-- src/lang/sr.json | 4 ++-- src/lang/sv.json | 4 ++-- src/lang/vi.json | 4 ++-- src/lang/yo.json | 4 ++-- src/lang/zh_CN.json | 4 ++-- 19 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/lang/cs.json b/src/lang/cs.json index c30fb7bd0..3546252fd 100644 --- a/src/lang/cs.json +++ b/src/lang/cs.json @@ -1181,8 +1181,8 @@ "action": "Vyberte služby", "dialog": { "title": "{Sora} Výběr síťové služby", - "fiat": "Hodnoty Fiat", - "chartsAndActivity": "Grafy a aktivity" + "indexer": "Indexer", + "useCeres": "Pro hodnoty fiat použijte {Ceres}" } } }, diff --git a/src/lang/de.json b/src/lang/de.json index 2454e2aa2..d764c9edf 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -1181,8 +1181,8 @@ "action": "Dienste auswählen", "dialog": { "title": "{Sora} Netzwerkdienstauswahl", - "fiat": "Fiat-Werte", - "chartsAndActivity": "Diagramme & Aktivität" + "indexer": "Indexer", + "useCeres": "Verwenden Sie {Ceres} für Fiat-Werte" } } }, diff --git a/src/lang/es.json b/src/lang/es.json index f8f64d029..7f5a676b6 100644 --- a/src/lang/es.json +++ b/src/lang/es.json @@ -1181,8 +1181,8 @@ "action": "Seleccionar servicios", "dialog": { "title": "{Sora} Selección de servicio de red", - "fiat": "Valores fiduciarios", - "chartsAndActivity": "Gráficos y actividad" + "indexer": "indexador", + "useCeres": "Utilice {Ceres} para valores fiduciarios" } } }, diff --git a/src/lang/fr.json b/src/lang/fr.json index 7be0fea00..3e7e9d3ec 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -1181,8 +1181,8 @@ "action": "Sélectionnez les services", "dialog": { "title": "{Sora} Sélection du service réseau", - "fiat": "Valeurs Fiat", - "chartsAndActivity": "Graphiques et activité" + "indexer": "Indexeur", + "useCeres": "Utilisez {Ceres} pour les valeurs fiduciaires" } } }, diff --git a/src/lang/hr.json b/src/lang/hr.json index 9c11328a8..33b6bbdc2 100644 --- a/src/lang/hr.json +++ b/src/lang/hr.json @@ -1181,8 +1181,8 @@ "action": "Odaberite usluge", "dialog": { "title": "{Sora} Odabir mrežne usluge", - "fiat": "Fiat vrijednosti", - "chartsAndActivity": "Grafikoni i aktivnosti" + "indexer": "Indeksator", + "useCeres": "Koristite {Ceres} za fiksne vrijednosti" } } }, diff --git a/src/lang/hu.json b/src/lang/hu.json index 16db88753..364abdaa6 100644 --- a/src/lang/hu.json +++ b/src/lang/hu.json @@ -1181,8 +1181,8 @@ "action": "Válassza ki a szolgáltatásokat", "dialog": { "title": "{Sora} Hálózati szolgáltatás kiválasztása", - "fiat": "Fiat értékek", - "chartsAndActivity": "Diagramok és tevékenység" + "indexer": "Indexelő", + "useCeres": "Fiat értékekhez használja {Ceres} értéket" } } }, diff --git a/src/lang/hy.json b/src/lang/hy.json index b15adcd4f..67e6b49cf 100644 --- a/src/lang/hy.json +++ b/src/lang/hy.json @@ -1181,8 +1181,8 @@ "action": "Ընտրեք ծառայություններ", "dialog": { "title": "{Sora} Ցանցային ծառայության ընտրություն", - "fiat": "Fiat արժեքները", - "chartsAndActivity": "Գծապատկերներ և գործունեություն" + "indexer": "Ինդեքսավորող", + "useCeres": "Ֆիատ արժեքների համար օգտագործեք {Ceres}" } } }, diff --git a/src/lang/id.json b/src/lang/id.json index ab1a53813..c3ffca584 100644 --- a/src/lang/id.json +++ b/src/lang/id.json @@ -1181,8 +1181,8 @@ "action": "Pilih layanan", "dialog": { "title": "{Sora} Pemilihan layanan jaringan", - "fiat": "Nilai Fiat", - "chartsAndActivity": "Bagan & Aktivitas" + "indexer": "Pengindeks", + "useCeres": "Gunakan {Ceres} untuk nilai fiat" } } }, diff --git a/src/lang/it.json b/src/lang/it.json index ba8981cd3..1e9f8cae4 100644 --- a/src/lang/it.json +++ b/src/lang/it.json @@ -1181,8 +1181,8 @@ "action": "Seleziona i servizi", "dialog": { "title": "{Sora} Selezione del servizio di rete", - "fiat": "Valori Fiat", - "chartsAndActivity": "Grafici e attività" + "indexer": "Indicizzatore", + "useCeres": "Usa {Ceres} per i valori fiat" } } }, diff --git a/src/lang/nl.json b/src/lang/nl.json index a2aef3bbd..239f3c639 100644 --- a/src/lang/nl.json +++ b/src/lang/nl.json @@ -1181,8 +1181,8 @@ "action": "Selecteer diensten", "dialog": { "title": "{Sora} Netwerkserviceselectie", - "fiat": "Fiat-waarden", - "chartsAndActivity": "Grafieken & Activiteit" + "indexer": "Indexeerder", + "useCeres": "Gebruik {Ceres} voor fiatwaarden" } } }, diff --git a/src/lang/no.json b/src/lang/no.json index 4666b15e4..aa1912afb 100644 --- a/src/lang/no.json +++ b/src/lang/no.json @@ -1181,8 +1181,8 @@ "action": "Velg tjenester", "dialog": { "title": "{Sora} Valg av nettverkstjeneste", - "fiat": "Fiat-verdier", - "chartsAndActivity": "Diagrammer og aktivitet" + "indexer": "Indekser", + "useCeres": "Bruk {Ceres} for fiat-verdier" } } }, diff --git a/src/lang/pl.json b/src/lang/pl.json index 0e39cb773..f74d3fb9a 100644 --- a/src/lang/pl.json +++ b/src/lang/pl.json @@ -1181,8 +1181,8 @@ "action": "Wybierz usługi", "dialog": { "title": "{Sora} Wybór usługi sieciowej", - "fiat": "wartości Fiata", - "chartsAndActivity": "Wykresy i aktywność" + "indexer": "Indeksator", + "useCeres": "Użyj {Ceres} dla wartości fiat" } } }, diff --git a/src/lang/ru.json b/src/lang/ru.json index 52a3b4d15..d4df5ba8d 100644 --- a/src/lang/ru.json +++ b/src/lang/ru.json @@ -1181,8 +1181,8 @@ "action": "Выберите сервисы", "dialog": { "title": "Выбор сервисов {Sora} сети", - "fiat": "Фиатные значения", - "chartsAndActivity": "Графики и активность" + "indexer": "Индексатор", + "useCeres": "Использовать {Ceres} для получения фиатных значений" } } }, diff --git a/src/lang/sk.json b/src/lang/sk.json index bbe108b56..149581109 100644 --- a/src/lang/sk.json +++ b/src/lang/sk.json @@ -1181,8 +1181,8 @@ "action": "Vyberte služby", "dialog": { "title": "{Sora} Výber sieťovej služby", - "fiat": "Hodnoty Fiat", - "chartsAndActivity": "Grafy a aktivita" + "indexer": "Indexer", + "useCeres": "Pre hodnoty fiat použite {Ceres}" } } }, diff --git a/src/lang/sr.json b/src/lang/sr.json index 42924cc2f..470653fcc 100644 --- a/src/lang/sr.json +++ b/src/lang/sr.json @@ -1181,8 +1181,8 @@ "action": "Изаберите услуге", "dialog": { "title": "{Sora} Избор мрежне услуге", - "fiat": "Фиат вредности", - "chartsAndActivity": "Графикони и активности" + "indexer": "Индексер", + "useCeres": "Користите {Ceres} за фиат вредности" } } }, diff --git a/src/lang/sv.json b/src/lang/sv.json index 4d731d32e..f696ba7cf 100644 --- a/src/lang/sv.json +++ b/src/lang/sv.json @@ -1181,8 +1181,8 @@ "action": "Välj tjänster", "dialog": { "title": "{Sora} Val av nätverkstjänst", - "fiat": "Fiat värden", - "chartsAndActivity": "Diagram och aktivitet" + "indexer": "Indexerare", + "useCeres": "Använd {Ceres} för fiat-värden" } } }, diff --git a/src/lang/vi.json b/src/lang/vi.json index 03f8497c0..737dd46fe 100644 --- a/src/lang/vi.json +++ b/src/lang/vi.json @@ -1181,8 +1181,8 @@ "action": "Chọn dịch vụ", "dialog": { "title": "{Sora} Lựa chọn dịch vụ mạng", - "fiat": "Giá trị Fiat", - "chartsAndActivity": "Biểu đồ & Hoạt động" + "indexer": "Người lập chỉ mục", + "useCeres": "Sử dụng {Ceres} cho các giá trị tiền pháp định" } } }, diff --git a/src/lang/yo.json b/src/lang/yo.json index 8fbb054de..8cd455702 100644 --- a/src/lang/yo.json +++ b/src/lang/yo.json @@ -1181,8 +1181,8 @@ "action": "Yan awọn iṣẹ", "dialog": { "title": "Aṣayan iṣẹ nẹtiwọki {Sora}", - "fiat": "Awọn iye Fiat", - "chartsAndActivity": "Awọn aworan atọka & Iṣẹ-ṣiṣe" + "indexer": "Atọka", + "useCeres": "Lo {Ceres} fun awọn iye fiat" } } }, diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json index 0feb699fd..4a6fb3d8a 100644 --- a/src/lang/zh_CN.json +++ b/src/lang/zh_CN.json @@ -1181,8 +1181,8 @@ "action": "选择服务", "dialog": { "title": "{Sora}网络服务选择", - "fiat": "法定价值", - "chartsAndActivity": "图表和活动" + "indexer": "索引器", + "useCeres": "使用{Ceres}作为法定值" } } }, From 0fde046ef3d9dd20f70f9864ae083b7e656a3540 Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Wed, 11 Oct 2023 11:26:39 +0300 Subject: [PATCH 4/5] update address book input translation --- src/lang/cs.json | 4 +++- src/lang/de.json | 4 +++- src/lang/en.json | 10 ++++++---- src/lang/es.json | 4 +++- src/lang/fr.json | 4 +++- src/lang/hr.json | 4 +++- src/lang/hu.json | 4 +++- src/lang/hy.json | 4 +++- src/lang/id.json | 4 +++- src/lang/it.json | 4 +++- src/lang/nl.json | 4 +++- src/lang/no.json | 4 +++- src/lang/pl.json | 4 +++- src/lang/ru.json | 4 +++- src/lang/sk.json | 4 +++- src/lang/sr.json | 4 +++- src/lang/sv.json | 4 +++- src/lang/vi.json | 4 +++- src/lang/yo.json | 4 +++- src/lang/zh_CN.json | 4 +++- 20 files changed, 63 insertions(+), 23 deletions(-) diff --git a/src/lang/cs.json b/src/lang/cs.json index 3546252fd..e77b4ea7a 100644 --- a/src/lang/cs.json +++ b/src/lang/cs.json @@ -1250,7 +1250,9 @@ "enterName": "Napište jméno", "present": "Již přítomný", "saveChanges": "Uložit změny" - } + }, + "input": "Zadejte adresu nebo vyberte kontakt", + "selectContact": "Vyberte kontakt" }, "browserPermission": { "title": "Povolit přístup k fotoaparátu v nastavení prohlížeče", diff --git a/src/lang/de.json b/src/lang/de.json index d764c9edf..7350f6aab 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -1250,7 +1250,9 @@ "enterName": "Name eingeben", "present": "Bereits anwesend", "saveChanges": "Änderungen speichern" - } + }, + "input": "Adresse eingeben oder Kontakt auswählen", + "selectContact": "Kontakt auswählen" }, "browserPermission": { "title": "Erlauben Sie den Kamerazugriff in den Browsereinstellungen", diff --git a/src/lang/en.json b/src/lang/en.json index b4f3a392e..c4b6da451 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1220,11 +1220,11 @@ "historyBtn": "My purchases", "historyTitle": "Transaction History", "moonpayTitle": "Buy ETH via MoonPay", - "moonpayDesc": "Purchase ETH tokens on Ethereum and transfer them to SORA network via the bridge", + "moonpayDesc": "Purchase ETH tokens on Ethereum and transfer them to {SORA} network via the bridge", "x1Title": "Buy XOR with your card", "x1Btn": "Buy XOR with card", "errorMessage": "Apologies for the inconvenience. We're working diligently to resolve this. Please, try again later.", - "x1Desc": "Purchase XOR tokens directly on the SORA network with your debit or credit card" + "x1Desc": "Purchase XOR tokens directly on the {SORA} network with your debit or credit card" }, "acceptOnScrollText": "Scroll to accept", "addressBook": { @@ -1240,7 +1240,7 @@ "detected": "New address detected", "save": "Save as contact", "tooltip": "Collect address book by providing name and address to keep your contacts organized and up-to-date", - "notSoraAddress": "This address will be saved as SORA address below. Make sure the recipient can access the SORA chain:", + "notSoraAddress": "This address will be saved as {SORA} address below. Make sure the recipient can access the {SORA} chain:", "options": { "send": "Send tokens", "edit": "Edit contact", @@ -1250,7 +1250,9 @@ "enterName": "Enter name", "present": "Already present", "saveChanges": "Save changes" - } + }, + "input": "Input address or select contact", + "selectContact": "Select contact" }, "browserPermission": { "title": "Allow camera access in browser settings", diff --git a/src/lang/es.json b/src/lang/es.json index 7f5a676b6..886467af2 100644 --- a/src/lang/es.json +++ b/src/lang/es.json @@ -1250,7 +1250,9 @@ "enterName": "Ingrese su nombre", "present": "Ya presente", "saveChanges": "Guardar cambios" - } + }, + "input": "Introduzca la dirección o seleccione el contacto", + "selectContact": "Seleccione un contacto" }, "browserPermission": { "title": "Permitir el acceso a la cámara en la configuración del navegador", diff --git a/src/lang/fr.json b/src/lang/fr.json index 3e7e9d3ec..346c2b455 100644 --- a/src/lang/fr.json +++ b/src/lang/fr.json @@ -1250,7 +1250,9 @@ "enterName": "Entrez le nom", "present": "Déjà présent", "saveChanges": "Sauvegarder les modifications" - } + }, + "input": "Saisissez l'adresse ou sélectionnez le contact", + "selectContact": "Sélectionnez un contact" }, "browserPermission": { "title": "Autoriser l'accès à la caméra dans les paramètres du navigateur", diff --git a/src/lang/hr.json b/src/lang/hr.json index 33b6bbdc2..bdb6bb90f 100644 --- a/src/lang/hr.json +++ b/src/lang/hr.json @@ -1250,7 +1250,9 @@ "enterName": "Unesite ime", "present": "Već prisutan", "saveChanges": "Spremi promjene" - } + }, + "input": "Unesite adresu ili odaberite kontakt", + "selectContact": "Odaberite kontakt" }, "browserPermission": { "title": "Dopustite pristup kameri u postavkama preglednika", diff --git a/src/lang/hu.json b/src/lang/hu.json index 364abdaa6..647910098 100644 --- a/src/lang/hu.json +++ b/src/lang/hu.json @@ -1250,7 +1250,9 @@ "enterName": "Írja be a nevet", "present": "Már jelen van", "saveChanges": "Változtatások mentése" - } + }, + "input": "Írja be a címet vagy válassza ki a kapcsolatot", + "selectContact": "Válasszon névjegyet" }, "browserPermission": { "title": "A kamera hozzáférésének engedélyezése a böngésző beállításaiban", diff --git a/src/lang/hy.json b/src/lang/hy.json index 67e6b49cf..6a27ddd79 100644 --- a/src/lang/hy.json +++ b/src/lang/hy.json @@ -1250,7 +1250,9 @@ "enterName": "Մուտքագրեք անունը", "present": "Արդեն ներկա", "saveChanges": "Պահպանել փոփոխությունները" - } + }, + "input": "Մուտքագրեք հասցեն կամ ընտրեք կոնտակտ", + "selectContact": "Ընտրեք կոնտակտ" }, "browserPermission": { "title": "Թույլատրել տեսախցիկի մուտքը դիտարկիչի կարգավորումներում", diff --git a/src/lang/id.json b/src/lang/id.json index c3ffca584..e2ede92de 100644 --- a/src/lang/id.json +++ b/src/lang/id.json @@ -1250,7 +1250,9 @@ "enterName": "Masukkan nama", "present": "Sudah hadir", "saveChanges": "Simpan perubahan" - } + }, + "input": "Masukkan alamat atau pilih kontak", + "selectContact": "Pilih kontak" }, "browserPermission": { "title": "Izinkan akses kamera di setelan browser", diff --git a/src/lang/it.json b/src/lang/it.json index 1e9f8cae4..21f3957e6 100644 --- a/src/lang/it.json +++ b/src/lang/it.json @@ -1250,7 +1250,9 @@ "enterName": "Inserisci il nome", "present": "Già presente", "saveChanges": "Salvare le modifiche" - } + }, + "input": "Inserisci l'indirizzo o seleziona il contatto", + "selectContact": "Seleziona contatto" }, "browserPermission": { "title": "Consenti l'accesso alla fotocamera nelle impostazioni del browser", diff --git a/src/lang/nl.json b/src/lang/nl.json index 239f3c639..6157194ff 100644 --- a/src/lang/nl.json +++ b/src/lang/nl.json @@ -1250,7 +1250,9 @@ "enterName": "Voer naam in", "present": "Reeds aanwezig", "saveChanges": "Wijzigingen opslaan" - } + }, + "input": "Voer adres in of selecteer contact", + "selectContact": "Selecteer contactpersoon" }, "browserPermission": { "title": "Cameratoegang toestaan in browserinstellingen", diff --git a/src/lang/no.json b/src/lang/no.json index aa1912afb..02490fda2 100644 --- a/src/lang/no.json +++ b/src/lang/no.json @@ -1250,7 +1250,9 @@ "enterName": "Skriv inn navn", "present": "Allerede til stede", "saveChanges": "Lagre endringer" - } + }, + "input": "Skriv inn adresse eller velg kontakt", + "selectContact": "Velg kontakt" }, "browserPermission": { "title": "Tillat kameratilgang i nettleserinnstillingene", diff --git a/src/lang/pl.json b/src/lang/pl.json index f74d3fb9a..80cc739f9 100644 --- a/src/lang/pl.json +++ b/src/lang/pl.json @@ -1250,7 +1250,9 @@ "enterName": "Wprowadź imię", "present": "Już obecny", "saveChanges": "Zapisz zmiany" - } + }, + "input": "Wprowadź adres lub wybierz kontakt", + "selectContact": "Wybierz kontakt" }, "browserPermission": { "title": "Zezwól na dostęp do aparatu w ustawieniach przeglądarki", diff --git a/src/lang/ru.json b/src/lang/ru.json index d4df5ba8d..a7a43c2fa 100644 --- a/src/lang/ru.json +++ b/src/lang/ru.json @@ -1250,7 +1250,9 @@ "enterName": "Введите имя", "present": "Уже присутствует", "saveChanges": "Сохранить изменения" - } + }, + "input": "Введите адрес или выберите контакт", + "selectContact": "Выберите контакт" }, "browserPermission": { "title": "Разрешите доступ к камере в настройках браузера", diff --git a/src/lang/sk.json b/src/lang/sk.json index 149581109..ac8feeb50 100644 --- a/src/lang/sk.json +++ b/src/lang/sk.json @@ -1250,7 +1250,9 @@ "enterName": "Zadaj meno", "present": "Už prítomný", "saveChanges": "Uložiť zmeny" - } + }, + "input": "Zadajte adresu alebo vyberte kontakt", + "selectContact": "Vyberte kontakt" }, "browserPermission": { "title": "Povoliť prístup k fotoaparátu v nastaveniach prehliadača", diff --git a/src/lang/sr.json b/src/lang/sr.json index 470653fcc..b4283aecf 100644 --- a/src/lang/sr.json +++ b/src/lang/sr.json @@ -1250,7 +1250,9 @@ "enterName": "Унесите име", "present": "Већ присутан", "saveChanges": "Сачувај измене" - } + }, + "input": "Унесите адресу или изаберите контакт", + "selectContact": "Изаберите контакт" }, "browserPermission": { "title": "Дозволите приступ камери у подешавањима претраживача", diff --git a/src/lang/sv.json b/src/lang/sv.json index f696ba7cf..a14036cc8 100644 --- a/src/lang/sv.json +++ b/src/lang/sv.json @@ -1250,7 +1250,9 @@ "enterName": "Skriv namn", "present": "Redan närvarande", "saveChanges": "Spara ändringar" - } + }, + "input": "Ange adress eller välj kontakt", + "selectContact": "Välj kontakt" }, "browserPermission": { "title": "Tillåt kameraåtkomst i webbläsarinställningarna", diff --git a/src/lang/vi.json b/src/lang/vi.json index 737dd46fe..49bebb4d7 100644 --- a/src/lang/vi.json +++ b/src/lang/vi.json @@ -1250,7 +1250,9 @@ "enterName": "Nhập tên", "present": "Đã có mặt", "saveChanges": "Lưu thay đổi" - } + }, + "input": "Nhập địa chỉ hoặc chọn liên hệ", + "selectContact": "Chọn liên hệ" }, "browserPermission": { "title": "Cho phép truy cập máy ảnh trong cài đặt trình duyệt", diff --git a/src/lang/yo.json b/src/lang/yo.json index 8cd455702..900134860 100644 --- a/src/lang/yo.json +++ b/src/lang/yo.json @@ -1250,7 +1250,9 @@ "enterName": "Tẹ orukọ sii", "present": "Ti wa tẹlẹ", "saveChanges": "Fi awọn ayipada pamọ" - } + }, + "input": "Tẹ adirẹsi sii tabi yan olubasọrọ", + "selectContact": "Yan olubasọrọ" }, "browserPermission": { "title": "Gba wiwọle kamẹra laaye ni awọn eto ẹrọ aṣawakiri", diff --git a/src/lang/zh_CN.json b/src/lang/zh_CN.json index 4a6fb3d8a..07951385f 100644 --- a/src/lang/zh_CN.json +++ b/src/lang/zh_CN.json @@ -1250,7 +1250,9 @@ "enterName": "输入名字", "present": "已经存在", "saveChanges": "保存更改" - } + }, + "input": "输入地址或选择联系人", + "selectContact": "选择联系人" }, "browserPermission": { "title": "在浏览器设置中允许相机访问", From 4340aba519eae53e126bec9d08290f10275db777 Mon Sep 17 00:00:00 2001 From: Nikita-Polyakov Date: Wed, 11 Oct 2023 11:54:35 +0300 Subject: [PATCH 5/5] remove incorrect price from chart --- src/components/pages/Swap/Chart.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/pages/Swap/Chart.vue b/src/components/pages/Swap/Chart.vue index 9b93cda30..aefd806a0 100644 --- a/src/components/pages/Swap/Chart.vue +++ b/src/components/pages/Swap/Chart.vue @@ -653,7 +653,8 @@ export default class SwapChart extends Mixins( const timestamp = (a?.timestamp ?? b?.timestamp) as number; const price = b?.price && a?.price ? dividePrices(a.price, b.price) : a?.price ?? [0, 0, 0, 0]; - + // skip item, if one of the prices is incorrect + if (price.some((part) => !Number.isFinite(part))) continue; // if "open" & "close" prices are zero, we are going to time, where pool is not created if (price[0] === 0 && price[1] === 0) break;