From 063603e0d5055bf7f70618043a30b74b3fa1d6ac Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Wed, 3 Apr 2024 15:21:15 +0300 Subject: [PATCH 1/6] Update translations text --- html_source/src/assets/i18n/af.json | 2 +- html_source/src/assets/i18n/ar.json | 2 +- html_source/src/assets/i18n/ca.json | 2 +- html_source/src/assets/i18n/cs.json | 2 +- html_source/src/assets/i18n/da.json | 2 +- html_source/src/assets/i18n/de.json | 2 +- html_source/src/assets/i18n/el.json | 2 +- html_source/src/assets/i18n/en.json | 2 +- html_source/src/assets/i18n/es.json | 2 +- html_source/src/assets/i18n/fi.json | 2 +- html_source/src/assets/i18n/fr.json | 2 +- html_source/src/assets/i18n/he.json | 2 +- html_source/src/assets/i18n/hu.json | 2 +- html_source/src/assets/i18n/id.json | 2 +- html_source/src/assets/i18n/it.json | 2 +- html_source/src/assets/i18n/ja.json | 2 +- html_source/src/assets/i18n/ko.json | 2 +- html_source/src/assets/i18n/nl.json | 2 +- html_source/src/assets/i18n/no.json | 2 +- html_source/src/assets/i18n/pl.json | 2 +- html_source/src/assets/i18n/pt.json | 2 +- html_source/src/assets/i18n/ro.json | 2 +- html_source/src/assets/i18n/ru.json | 2 +- html_source/src/assets/i18n/sr.json | 2 +- html_source/src/assets/i18n/sv.json | 2 +- html_source/src/assets/i18n/tr.json | 2 +- html_source/src/assets/i18n/uk.json | 2 +- html_source/src/assets/i18n/vi.json | 2 +- html_source/src/assets/i18n/zh.json | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/html_source/src/assets/i18n/af.json b/html_source/src/assets/i18n/af.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/af.json +++ b/html_source/src/assets/i18n/af.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/ar.json b/html_source/src/assets/i18n/ar.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/ar.json +++ b/html_source/src/assets/i18n/ar.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/ca.json b/html_source/src/assets/i18n/ca.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/ca.json +++ b/html_source/src/assets/i18n/ca.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/cs.json b/html_source/src/assets/i18n/cs.json index 194b7862..5d930ef0 100644 --- a/html_source/src/assets/i18n/cs.json +++ b/html_source/src/assets/i18n/cs.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/da.json b/html_source/src/assets/i18n/da.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/da.json +++ b/html_source/src/assets/i18n/da.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/de.json b/html_source/src/assets/i18n/de.json index a2b10d82..059149bc 100644 --- a/html_source/src/assets/i18n/de.json +++ b/html_source/src/assets/i18n/de.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset-ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Benutzerdefiniertes Token hinzufügen" }, diff --git a/html_source/src/assets/i18n/el.json b/html_source/src/assets/i18n/el.json index 89ba1b3a..1a42f395 100644 --- a/html_source/src/assets/i18n/el.json +++ b/html_source/src/assets/i18n/el.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/en.json b/html_source/src/assets/i18n/en.json index 3c61c79b..40d125f1 100644 --- a/html_source/src/assets/i18n/en.json +++ b/html_source/src/assets/i18n/en.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/es.json b/html_source/src/assets/i18n/es.json index 50a2b88f..889ae377 100644 --- a/html_source/src/assets/i18n/es.json +++ b/html_source/src/assets/i18n/es.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/fi.json b/html_source/src/assets/i18n/fi.json index babecb5c..c8554bfe 100644 --- a/html_source/src/assets/i18n/fi.json +++ b/html_source/src/assets/i18n/fi.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/fr.json b/html_source/src/assets/i18n/fr.json index ce1818a2..0451f0ef 100644 --- a/html_source/src/assets/i18n/fr.json +++ b/html_source/src/assets/i18n/fr.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Identifiant de l'élément", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Ajouter un jeton personnalisé" }, diff --git a/html_source/src/assets/i18n/he.json b/html_source/src/assets/i18n/he.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/he.json +++ b/html_source/src/assets/i18n/he.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/hu.json b/html_source/src/assets/i18n/hu.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/hu.json +++ b/html_source/src/assets/i18n/hu.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/id.json b/html_source/src/assets/i18n/id.json index dd12a22e..abf24315 100644 --- a/html_source/src/assets/i18n/id.json +++ b/html_source/src/assets/i18n/id.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "ID Aset", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Tambahkan Token Khusus" }, diff --git a/html_source/src/assets/i18n/it.json b/html_source/src/assets/i18n/it.json index 5d81d356..1cad9fb7 100644 --- a/html_source/src/assets/i18n/it.json +++ b/html_source/src/assets/i18n/it.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "ID risorsa", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Aggiungi token personalizzato" }, diff --git a/html_source/src/assets/i18n/ja.json b/html_source/src/assets/i18n/ja.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/ja.json +++ b/html_source/src/assets/i18n/ja.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/ko.json b/html_source/src/assets/i18n/ko.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/ko.json +++ b/html_source/src/assets/i18n/ko.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/nl.json b/html_source/src/assets/i18n/nl.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/nl.json +++ b/html_source/src/assets/i18n/nl.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/no.json b/html_source/src/assets/i18n/no.json index babecb5c..c8554bfe 100644 --- a/html_source/src/assets/i18n/no.json +++ b/html_source/src/assets/i18n/no.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/pl.json b/html_source/src/assets/i18n/pl.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/pl.json +++ b/html_source/src/assets/i18n/pl.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/pt.json b/html_source/src/assets/i18n/pt.json index 509f9485..356933a2 100644 --- a/html_source/src/assets/i18n/pt.json +++ b/html_source/src/assets/i18n/pt.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "ID do recurso", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Adicionar token personalizado" }, diff --git a/html_source/src/assets/i18n/ro.json b/html_source/src/assets/i18n/ro.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/ro.json +++ b/html_source/src/assets/i18n/ro.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/ru.json b/html_source/src/assets/i18n/ru.json index 51cd0231..c211a452 100644 --- a/html_source/src/assets/i18n/ru.json +++ b/html_source/src/assets/i18n/ru.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/sr.json b/html_source/src/assets/i18n/sr.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/sr.json +++ b/html_source/src/assets/i18n/sr.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/sv.json b/html_source/src/assets/i18n/sv.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/sv.json +++ b/html_source/src/assets/i18n/sv.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/tr.json b/html_source/src/assets/i18n/tr.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/tr.json +++ b/html_source/src/assets/i18n/tr.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/uk.json b/html_source/src/assets/i18n/uk.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/uk.json +++ b/html_source/src/assets/i18n/uk.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/vi.json b/html_source/src/assets/i18n/vi.json index 4c1582a9..1d297b7d 100644 --- a/html_source/src/assets/i18n/vi.json +++ b/html_source/src/assets/i18n/vi.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, diff --git a/html_source/src/assets/i18n/zh.json b/html_source/src/assets/i18n/zh.json index a41919b2..99d03997 100644 --- a/html_source/src/assets/i18n/zh.json +++ b/html_source/src/assets/i18n/zh.json @@ -803,7 +803,7 @@ "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { - "ERROR1": "Invalid asset ID" + "ERROR1": "Invalid Asset ID" }, "TITLE": "Add Custom Token" }, From 5a63d7ce31a5bf3ede1d326579dab0c8f01942a2 Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Wed, 3 Apr 2024 15:48:17 +0300 Subject: [PATCH 2/6] Fix style for "Confirm proposal" --- html_source/src/app/api/models/swap.model.ts | 20 ++++++++----------- .../confirm-swap/confirm-swap.component.html | 14 +++++++------ 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/html_source/src/app/api/models/swap.model.ts b/html_source/src/app/api/models/swap.model.ts index cc90a09d..8d3beab1 100644 --- a/html_source/src/app/api/models/swap.model.ts +++ b/html_source/src/app/api/models/swap.model.ts @@ -2,16 +2,12 @@ export interface ProposalDetails { expiration_time: number; fee_paid_by_a: number; mixins: number; - to_initiator: [ - { - amount: number | string; - asset_id: string; - } - ]; - to_finalizer: [ - { - amount: number | string; - asset_id: string; - } - ]; + to_initiator: { + amount: number | string; + asset_id: string; + }[]; + to_finalizer: { + amount: number | string; + asset_id: string; + }[]; } diff --git a/html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html b/html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html index c41fb8cc..d4845bbd 100644 --- a/html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html +++ b/html_source/src/app/pages/wallet/tabs/swap/pages/confirm-swap/confirm-swap.component.html @@ -22,9 +22,9 @@
{{ 'CONFIRM_SWAP.FORM.TABLE.LABELS.LABEL1' | translate }}
-
- {{ item.amount | intToMoney }} - {{ (item.asset_id | getAssetInfo)?.ticker || '???' }} + +
+

{{ item.amount | intToMoney }} {{ (item.asset_id | getAssetInfo)?.ticker || '???' }}

@@ -34,9 +34,11 @@
{{ 'CONFIRM_SWAP.FORM.TABLE.LABELS.LABEL2' | translate }}
-
- {{ item.amount | intToMoney }} - {{ (item.asset_id | getAssetInfo)?.ticker || '???' }} +
+

+ {{ item.amount | intToMoney }} + {{ (item.asset_id | getAssetInfo)?.ticker || '???' }} +

From 99687f651510967433bfbccec2ba5a431ee33fea Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Thu, 4 Apr 2024 11:41:16 +0300 Subject: [PATCH 3/6] Migrate --- html_source/src/app/api/models/rpc.models.ts | 13 ++++ .../src/app/api/models/wallet.model.ts | 1 + html_source/src/app/app.component.ts | 2 +- .../tabs/send/modals/wallet-modals.module.ts | 3 +- .../src/app/pages/wallet/wallet.module.ts | 4 ++ .../migrate-wallet-to-zarcanum.component.html | 25 +++++++ .../migrate-wallet-to-zarcanum.component.scss | 10 +++ .../migrate-wallet-to-zarcanum.component.ts | 49 +++++++++++++ .../success-sweep-bare-outs.component.html | 70 +++++++++++++++++++ .../success-sweep-bare-outs.component.scss | 0 .../success-sweep-bare-outs.component.ts | 23 ++++++ .../pages/wallet/wallet/wallet.component.ts | 66 ++++++++++++++++- html_source/src/app/parts/data/constants.ts | 1 + .../scss/components/_migrate-alert.scss | 21 ++++++ .../src/assets/scss/components/index.scss | 1 + .../src/assets/scss/helpers/_padding.scss | 6 ++ 16 files changed, 290 insertions(+), 5 deletions(-) create mode 100644 html_source/src/app/api/models/rpc.models.ts create mode 100644 html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html create mode 100644 html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.scss create mode 100644 html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts create mode 100644 html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html create mode 100644 html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.scss create mode 100644 html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.ts create mode 100644 html_source/src/assets/scss/components/_migrate-alert.scss diff --git a/html_source/src/app/api/models/rpc.models.ts b/html_source/src/app/api/models/rpc.models.ts new file mode 100644 index 00000000..92553e87 --- /dev/null +++ b/html_source/src/app/api/models/rpc.models.ts @@ -0,0 +1,13 @@ +export interface GetBareOutsStats { + expected_total_fee: number; + total_amount: number; + total_bare_outs: number; + txs_count: number; +} + +export interface SweepBareOuts { + amount_swept: number; + bare_outs_swept: number; + fee_spent: number; + txs_sent: number; +} diff --git a/html_source/src/app/api/models/wallet.model.ts b/html_source/src/app/api/models/wallet.model.ts index f6da2c3c..da07a13d 100644 --- a/html_source/src/app/api/models/wallet.model.ts +++ b/html_source/src/app/api/models/wallet.model.ts @@ -102,6 +102,7 @@ export class Wallet { is_watch_only: boolean; exclude_mining_txs: boolean; alias_available: boolean; + has_bare_unspent_outputs = false; alias?: Partial; wakeAlias?: boolean; diff --git a/html_source/src/app/app.component.ts b/html_source/src/app/app.component.ts index a2d2d813..94b366f8 100644 --- a/html_source/src/app/app.component.ts +++ b/html_source/src/app/app.component.ts @@ -13,7 +13,6 @@ import { takeUntil } from 'rxjs/operators'; import { paths, pathsChildrenAuth } from './pages/paths'; import { hasOwnProperty } from '@parts/functions/hasOwnProperty'; import { Dialog } from '@angular/cdk/dialog'; -import { ParamsCallRpc } from '@api/models/call_rpc.model'; import { ZanoLoadersService } from '@parts/services/zano-loaders.service'; @Component({ @@ -184,6 +183,7 @@ export class AppComponent implements OnInit, OnDestroy { wallet.balances = data.balances; wallet.mined_total = data.minied_total; wallet.alias_available = data.is_alias_operations_available; + wallet.has_bare_unspent_outputs = data.has_bare_unspent_outputs ?? false; }); } }); diff --git a/html_source/src/app/pages/wallet/tabs/send/modals/wallet-modals.module.ts b/html_source/src/app/pages/wallet/tabs/send/modals/wallet-modals.module.ts index 1eb6946e..0296b1ba 100644 --- a/html_source/src/app/pages/wallet/tabs/send/modals/wallet-modals.module.ts +++ b/html_source/src/app/pages/wallet/tabs/send/modals/wallet-modals.module.ts @@ -6,10 +6,11 @@ import { FlexLayoutModule } from '@angular/flex-layout'; import { TranslateModule } from '@ngx-translate/core'; import { ReactiveFormsModule } from '@angular/forms'; import { GetAssetInfoPipe } from '@parts/pipes'; +import { CopyButtonComponent } from '@parts/components/copy-button.component'; @NgModule({ declarations: [SendModalComponent, SendDetailsModalComponent], - imports: [CommonModule, TranslateModule, FlexLayoutModule, ReactiveFormsModule, GetAssetInfoPipe], + imports: [CommonModule, TranslateModule, FlexLayoutModule, ReactiveFormsModule, GetAssetInfoPipe, CopyButtonComponent], exports: [SendModalComponent, SendDetailsModalComponent], }) export class WalletModalsModule {} diff --git a/html_source/src/app/pages/wallet/wallet.module.ts b/html_source/src/app/pages/wallet/wallet.module.ts index 78217b41..8930646e 100644 --- a/html_source/src/app/pages/wallet/wallet.module.ts +++ b/html_source/src/app/pages/wallet/wallet.module.ts @@ -37,6 +37,8 @@ import { BreadcrumbsComponent } from '@parts/components/breadcrumbs/breadcrumbs. import { BackButtonComponent } from '@parts/components/back-button/back-button.component'; import { WalletModalsModule } from './tabs/send/modals/wallet-modals.module'; import { GetAssetInfoPipe } from '@parts/pipes/get-asset-info.pipe'; +import { MigrateWalletToZarcanumComponent } from './wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component'; +import { SuccessSweepBareOutsComponent } from './wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component'; @NgModule({ declarations: [ @@ -48,6 +50,8 @@ import { GetAssetInfoPipe } from '@parts/pipes/get-asset-info.pipe'; ReceiveComponent, ExportImportComponent, SendComponent, + MigrateWalletToZarcanumComponent, + SuccessSweepBareOutsComponent, ], imports: [ CommonModule, diff --git a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html new file mode 100644 index 00000000..0017c295 --- /dev/null +++ b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html @@ -0,0 +1,25 @@ +
+
+

+ {{ 'Migrate wallet to Zarcanum' | translate }} +

+ +
+

There are {{ dialogData.total_bare_outs }} outputs with total amount of {{ + dialogData.total_amount | intToMoney }} ZANO.

+

+ + {{ 'What does it mean?' | translate }} +

+
+

They can be converted in {{ dialogData.txs_count }} transactions with total fee = {{ + dialogData.expected_total_fee | intToMoney }}.

+
+ +
+ +
+
+
diff --git a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.scss b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.scss new file mode 100644 index 00000000..a133dedc --- /dev/null +++ b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.scss @@ -0,0 +1,10 @@ +.details { + padding: 0 2rem; + border-radius: 0.8rem; + border: 1px solid #33426E; + + hr { + border: none; + border-bottom: 1px solid #ffffff10; + } +} diff --git a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts new file mode 100644 index 00000000..f8b3b03d --- /dev/null +++ b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts @@ -0,0 +1,49 @@ +import { Component, inject } from '@angular/core'; +import { GetBareOutsStats, SweepBareOuts } from '@api/models/rpc.models'; +import { Dialog, DIALOG_DATA, DialogConfig, DialogRef } from '@angular/cdk/dialog'; +import { BackendService } from '@api/services/backend.service'; +import { VariablesService } from '@parts/services/variables.service'; +import { ParamsCallRpc } from '@api/models/call_rpc.model'; +import { ModalService } from '@parts/services/modal.service'; +import { SuccessSweepBareOutsComponent } from '../success-sweep-bare-outs/success-sweep-bare-outs.component'; +import { ScrollStrategy, ScrollStrategyOptions } from '@angular/cdk/overlay'; + +@Component({ + selector: 'app-migrate-wallet-to-zarcanum', + templateUrl: './migrate-wallet-to-zarcanum.component.html', + styleUrls: ['./migrate-wallet-to-zarcanum.component.scss'] +}) +export class MigrateWalletToZarcanumComponent { + readonly dialogData: GetBareOutsStats = inject(DIALOG_DATA); + private readonly _scrollStrategyOptions: ScrollStrategyOptions = inject(ScrollStrategyOptions); + private readonly _scrollStrategyNoop: ScrollStrategy = this._scrollStrategyOptions.noop(); + private readonly _dialog = inject(Dialog); + private readonly _dialogRef = inject(DialogRef); + private readonly _backendService = inject(BackendService); + private readonly _variableService = inject(VariablesService); + private readonly _modalService = inject(ModalService); + migrate(): void { + const { currentWallet: { wallet_id } } = this._variableService; + const params: ParamsCallRpc = { id: 0, jsonrpc: '2.0', method: 'sweep_bare_outs', params: {} }; + this._backendService.call_wallet_rpc([wallet_id, params], (status, response_data) => { + if (response_data?.result) { + const data = response_data.result; + + const dialogConfig: DialogConfig = { + maxWidth: '90vw', + width: '540px', + scrollStrategy: this._scrollStrategyNoop, + data + }; + + this._dialog.open(SuccessSweepBareOutsComponent, dialogConfig); + } else { + const message = response_data.error; + this._modalService.prepareModal('error', message); + } + + this._dialogRef.close(); + }); + } + +} diff --git a/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html new file mode 100644 index 00000000..eb9e4303 --- /dev/null +++ b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html @@ -0,0 +1,70 @@ +
+
+

+ {{ 'SEND_DETAILS_MODAL.TITLE1' | translate }} +

+ +
+
+
+ success +
+ +

+ {{ + 'Successfully sent' | translate + }} +

+
+ +
+
+

+ {{ 'SEND_DETAILS_MODAL.TITLE2' | translate }} +

+ +
+
+
    +
  • +

    {{ dialogData.txs_sent }} + transactions were successfully sent, {{ dialogData.bare_outs_swept }} bare outputs migrated, + {{ dialogData.amount_swept | intToMoney }} coins transferred, and {{ + dialogData.fee_spent | intToMoney }} + was spent for + fees.

    +
    • +
+
+
+
+
+ +
+
+
diff --git a/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.scss b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.ts b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.ts new file mode 100644 index 00000000..0900ef6a --- /dev/null +++ b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.ts @@ -0,0 +1,23 @@ +import { Component, inject, OnInit } from '@angular/core'; +import { SweepBareOuts } from '@api/models/rpc.models'; +import { DIALOG_DATA, DialogRef } from '@angular/cdk/dialog'; +import { BehaviorSubject } from 'rxjs'; + +@Component({ + selector: 'app-success-sweep-bare-outs', + templateUrl: './success-sweep-bare-outs.component.html', + styleUrls: ['./success-sweep-bare-outs.component.scss'] +}) +export class SuccessSweepBareOutsComponent { + readonly dialogData: SweepBareOuts = inject(DIALOG_DATA); + private readonly _dialogRef = inject(DialogRef); + stateDetails$ = new BehaviorSubject(false); + + toggleDetails(): void { + this.stateDetails$.next(!this.stateDetails$.value); + } + + close(): void { + this._dialogRef.close(); + } +} diff --git a/html_source/src/app/pages/wallet/wallet/wallet.component.ts b/html_source/src/app/pages/wallet/wallet/wallet.component.ts index 4f8e7ee5..89487ae2 100644 --- a/html_source/src/app/pages/wallet/wallet/wallet.component.ts +++ b/html_source/src/app/pages/wallet/wallet/wallet.component.ts @@ -21,6 +21,14 @@ import { Router, RouterEvent } from '@angular/router'; +import { ZARCANUM_MIGRATION } from '@parts/data/constants'; +import { + MigrateWalletToZarcanumComponent +} from './modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component'; +import { ScrollStrategy, ScrollStrategyOptions } from '@angular/cdk/overlay'; +import { ParamsCallRpc } from '@api/models/call_rpc.model'; +import { ModalService } from '@parts/services/modal.service'; +import { GetBareOutsStats } from '@api/models/rpc.models'; interface Tab { id: string; @@ -99,7 +107,7 @@ const objTabs: { [key in TabNameKeys]: Tab } = { template: `
-
+

@@ -132,7 +140,7 @@ const objTabs: { [key in TabNameKeys]: Tab } = { variablesService.currentWallet.alias_available " > - @@ -178,6 +186,20 @@ const objTabs: { [key in TabNameKeys]: Tab } = {

+ +
+
+ + +
+

Your wallet contains pre-zarcanum outputs

+

+ + {{ 'More Details' | translate }} +

+
+
+
@@ -345,15 +367,21 @@ export class WalletComponent implements OnInit, OnDestroy { loader = true; + scrollStrategyNoop: ScrollStrategy; + constructor( private backend: BackendService, public variablesService: VariablesService, private ngZone: NgZone, private store: Store, private dialog: Dialog, + private modalService: ModalService, private walletsService: WalletsService, - private router: Router + private router: Router, + private readonly scrollStrategyOptions: ScrollStrategyOptions ) { + this.scrollStrategyNoop = this.scrollStrategyOptions.noop(); + if (!this.variablesService.currentWallet && this.variablesService.wallets.length > 0) { this.variablesService.setCurrentWallet(0); } @@ -557,6 +585,38 @@ export class WalletComponent implements OnInit, OnDestroy { this.dialog.open(ExportHistoryModalComponent); } + openZarcanumMigration(): void { + this._openInBrowser(ZARCANUM_MIGRATION); + } + + openMigrateWalletToZarcanum(): void { + const { currentWallet: { wallet_id }} = this.variablesService; + const params: ParamsCallRpc = { + id: 0, jsonrpc: '2.0', method: 'get_bare_outs_stats', params: {} + + }; + this.backend.call_wallet_rpc([wallet_id, params], (status, response_data) => { + if (response_data?.result) { + const data = response_data.result; + + const dialogConfig: DialogConfig = { + maxWidth: '90vw', + width: '540px', + scrollStrategy: this.scrollStrategyNoop, + data + }; + this.dialog.open(MigrateWalletToZarcanumComponent, dialogConfig); + } else { + const message = response_data.error; + this.modalService.prepareModal('error', message); + } + }); + } + + private _openInBrowser(url: string) { + this.backend.openUrlInBrowser(url); + } + ngOnDestroy(): void { this.destroy$.next(); this.destroy$.complete(); diff --git a/html_source/src/app/parts/data/constants.ts b/html_source/src/app/parts/data/constants.ts index f9915cb6..3cf33b57 100644 --- a/html_source/src/app/parts/data/constants.ts +++ b/html_source/src/app/parts/data/constants.ts @@ -5,6 +5,7 @@ export const AUDITABLE_WALLET_HELP_PAGE = 'docs.zano.org/docs/use/auditable-wall export const CREATE_NEW_WALLET_HELP_PAGE = 'docs.zano.org/docs/use/wallets/gui-wallet'; export const LOCKED_BALANCE_HELP_PAGE = 'docs.zano.org/docs/use/locked-balance'; export const DOWNLOADS_PAGE_URL = 'zano.org/downloads'; +export const ZARCANUM_MIGRATION = 'docs.zano.org/docs/use/zarcanum-migration/'; export const BLOCK_EXPLORER_TX_URL_PREFIX = 'explorer.zano.org/transaction/'; export const BLOCK_EXPLORER_TN_TX_URL_PREFIX = 'testnet-explorer.zano.org/transaction/'; diff --git a/html_source/src/assets/scss/components/_migrate-alert.scss b/html_source/src/assets/scss/components/_migrate-alert.scss new file mode 100644 index 00000000..5d3d1069 --- /dev/null +++ b/html_source/src/assets/scss/components/_migrate-alert.scss @@ -0,0 +1,21 @@ +.migrate-alert { + .btn-migrate { + background-color: #1F8FEB33; + color: #1F8FEB; + font-size: 1.8rem; + line-height: 1.2; + padding: 0.8rem 2rem; + border-radius: 0.8rem; + cursor: pointer; + transition: background-color 0.2s ease; + + &:hover { + background-color: #1F8FEB50; + } + } + + .migration-details { + font-size: 1.6rem; + } +} + diff --git a/html_source/src/assets/scss/components/index.scss b/html_source/src/assets/scss/components/index.scss index 70df7163..cc8d7faf 100644 --- a/html_source/src/assets/scss/components/index.scss +++ b/html_source/src/assets/scss/components/index.scss @@ -5,6 +5,7 @@ @import 'forms'; @import 'icons'; @import 'loader'; +@import 'migrate-alert'; @import 'modals'; @import 'ng-select'; @import 'ngx-pagination'; diff --git a/html_source/src/assets/scss/helpers/_padding.scss b/html_source/src/assets/scss/helpers/_padding.scss index b9148a09..02e9f307 100644 --- a/html_source/src/assets/scss/helpers/_padding.scss +++ b/html_source/src/assets/scss/helpers/_padding.scss @@ -33,6 +33,12 @@ padding-bottom: 0.5rem; } +.py-0_8 { + padding-top: 0.8rem; + padding-bottom: 0.8rem; +} + + .py-1 { padding-top: 1rem; padding-bottom: 1rem; From 0ca8281e88974c4afc937e2b5fe7d078f0dbf6d6 Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Thu, 4 Apr 2024 14:42:35 +0300 Subject: [PATCH 4/6] Added success-sweep-bare-outs --- .../migrate-wallet-to-zarcanum.component.ts | 33 ++++++++++--------- .../success-sweep-bare-outs.component.html | 6 ++-- .../pages/wallet/wallet/wallet.component.ts | 30 +++++++++-------- .../src/assets/scss/modals/_send-details.scss | 2 +- 4 files changed, 39 insertions(+), 32 deletions(-) diff --git a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts index f8b3b03d..6396dc08 100644 --- a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts +++ b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts @@ -1,4 +1,4 @@ -import { Component, inject } from '@angular/core'; +import { Component, inject, NgZone } from '@angular/core'; import { GetBareOutsStats, SweepBareOuts } from '@api/models/rpc.models'; import { Dialog, DIALOG_DATA, DialogConfig, DialogRef } from '@angular/cdk/dialog'; import { BackendService } from '@api/services/backend.service'; @@ -22,27 +22,30 @@ export class MigrateWalletToZarcanumComponent { private readonly _backendService = inject(BackendService); private readonly _variableService = inject(VariablesService); private readonly _modalService = inject(ModalService); + private readonly _ngZone = inject(NgZone); migrate(): void { const { currentWallet: { wallet_id } } = this._variableService; const params: ParamsCallRpc = { id: 0, jsonrpc: '2.0', method: 'sweep_bare_outs', params: {} }; this._backendService.call_wallet_rpc([wallet_id, params], (status, response_data) => { - if (response_data?.result) { - const data = response_data.result; + this._ngZone.run(() => { + if (response_data?.result) { + const data = response_data.result; - const dialogConfig: DialogConfig = { - maxWidth: '90vw', - width: '540px', - scrollStrategy: this._scrollStrategyNoop, - data - }; + const dialogConfig: DialogConfig = { + maxWidth: '90vw', + width: '540px', + scrollStrategy: this._scrollStrategyNoop, + data + }; - this._dialog.open(SuccessSweepBareOutsComponent, dialogConfig); - } else { - const message = response_data.error; - this._modalService.prepareModal('error', message); - } + this._dialog.open(SuccessSweepBareOutsComponent, dialogConfig); + } else { + const message = response_data.error; + this._modalService.prepareModal('error', message); + } - this._dialogRef.close(); + this._dialogRef.close(); + }); }); } diff --git a/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html index eb9e4303..e12ffb69 100644 --- a/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html +++ b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html @@ -5,7 +5,7 @@

-
+
success
@@ -23,6 +23,7 @@

class="header overflow-hidden py-1 px-2 w-100 cursor-pointer" fxLayout="row" fxLayoutAlign="space-between center" + [ngStyle]="{'border-radius': (stateDetails$ | async) ? '0.8rem 0.8rem 0 0' : '0.8rem'}" >

{{ 'SEND_DETAILS_MODAL.TITLE2' | translate }} @@ -40,13 +41,14 @@

[class.px-2]="stateDetails$ | async" [class.py-1]="stateDetails$ | async" [fxHide]="!(stateDetails$ | async)" + [ngStyle]="{'border-radius': (stateDetails$ | async) ? '0 0 0.8rem 0.8rem ' : '0'}" class="details-wrapper" fxFlex="1 1 auto" fxLayout="row" >
  • diff --git a/html_source/src/app/pages/wallet/wallet/wallet.component.ts b/html_source/src/app/pages/wallet/wallet/wallet.component.ts index 89487ae2..bd46ff20 100644 --- a/html_source/src/app/pages/wallet/wallet/wallet.component.ts +++ b/html_source/src/app/pages/wallet/wallet/wallet.component.ts @@ -596,20 +596,22 @@ export class WalletComponent implements OnInit, OnDestroy { }; this.backend.call_wallet_rpc([wallet_id, params], (status, response_data) => { - if (response_data?.result) { - const data = response_data.result; - - const dialogConfig: DialogConfig = { - maxWidth: '90vw', - width: '540px', - scrollStrategy: this.scrollStrategyNoop, - data - }; - this.dialog.open(MigrateWalletToZarcanumComponent, dialogConfig); - } else { - const message = response_data.error; - this.modalService.prepareModal('error', message); - } + this.ngZone.run(() => { + if (response_data?.result) { + const data = response_data.result; + + const dialogConfig: DialogConfig = { + maxWidth: '90vw', + width: '540px', + scrollStrategy: this.scrollStrategyNoop, + data + }; + this.dialog.open(MigrateWalletToZarcanumComponent, dialogConfig); + } else { + const message = response_data.error; + this.modalService.prepareModal('error', message); + } + }); }); } diff --git a/html_source/src/assets/scss/modals/_send-details.scss b/html_source/src/assets/scss/modals/_send-details.scss index 7582d4e7..60c738d2 100644 --- a/html_source/src/assets/scss/modals/_send-details.scss +++ b/html_source/src/assets/scss/modals/_send-details.scss @@ -1,4 +1,4 @@ -app-send-details-modal { +app-send-details-modal, app-success-sweep-bare-outs { .status { .image { max-width: 13rem; From 26d8824a55e13f669e8860e6fbf12b4e13f350ec Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Thu, 4 Apr 2024 15:48:32 +0300 Subject: [PATCH 5/6] Added translations --- .../migrate-wallet-to-zarcanum.component.html | 22 +++++++++++++------ .../success-sweep-bare-outs.component.html | 14 ++++++------ .../pages/wallet/wallet/wallet.component.ts | 6 ++--- html_source/src/assets/i18n/af.json | 15 +++++++++++++ html_source/src/assets/i18n/ar.json | 15 +++++++++++++ html_source/src/assets/i18n/ca.json | 15 +++++++++++++ html_source/src/assets/i18n/cs.json | 15 +++++++++++++ html_source/src/assets/i18n/da.json | 15 +++++++++++++ html_source/src/assets/i18n/de.json | 15 +++++++++++++ html_source/src/assets/i18n/el.json | 15 +++++++++++++ html_source/src/assets/i18n/en.json | 15 +++++++++++++ html_source/src/assets/i18n/es.json | 15 +++++++++++++ html_source/src/assets/i18n/fi.json | 15 +++++++++++++ html_source/src/assets/i18n/fr.json | 15 +++++++++++++ html_source/src/assets/i18n/he.json | 15 +++++++++++++ html_source/src/assets/i18n/hu.json | 15 +++++++++++++ html_source/src/assets/i18n/id.json | 15 +++++++++++++ html_source/src/assets/i18n/it.json | 15 +++++++++++++ html_source/src/assets/i18n/ja.json | 15 +++++++++++++ html_source/src/assets/i18n/ko.json | 15 +++++++++++++ html_source/src/assets/i18n/nl.json | 15 +++++++++++++ html_source/src/assets/i18n/no.json | 15 +++++++++++++ html_source/src/assets/i18n/pl.json | 15 +++++++++++++ html_source/src/assets/i18n/pt.json | 15 +++++++++++++ html_source/src/assets/i18n/ro.json | 15 +++++++++++++ html_source/src/assets/i18n/ru.json | 15 +++++++++++++ html_source/src/assets/i18n/sr.json | 15 +++++++++++++ html_source/src/assets/i18n/sv.json | 15 +++++++++++++ html_source/src/assets/i18n/tr.json | 15 +++++++++++++ html_source/src/assets/i18n/uk.json | 15 +++++++++++++ html_source/src/assets/i18n/vi.json | 15 +++++++++++++ html_source/src/assets/i18n/zh.json | 15 +++++++++++++ 32 files changed, 460 insertions(+), 17 deletions(-) diff --git a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html index 0017c295..5b2b8a56 100644 --- a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html +++ b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html @@ -1,24 +1,32 @@

    - {{ 'Migrate wallet to Zarcanum' | translate }} + {{ 'MIGRATE_WALLET_TO_ZARCANUM.TITLE' | translate }}

    -

    There are {{ dialogData.total_bare_outs }} outputs with total amount of {{ - dialogData.total_amount | intToMoney }} ZANO.

    +

    + {{ 'MIGRATE_WALLET_TO_ZARCANUM.TEXT1' | translate: { + total_bare_outs: dialogData.total_bare_outs, + total_amount: dialogData.total_amount | intToMoney + } }} +

    - {{ 'What does it mean?' | translate }} + {{ 'MIGRATE_WALLET_TO_ZARCANUM.LINK1' | translate }}

    -

    They can be converted in {{ dialogData.txs_count }} transactions with total fee = {{ - dialogData.expected_total_fee | intToMoney }}.

    +

    + {{ 'MIGRATE_WALLET_TO_ZARCANUM.TEXT2' | translate: { + txs_count: dialogData.txs_count, + expected_total_fee: dialogData.expected_total_fee | intToMoney + } }} +

    diff --git a/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html index e12ffb69..0445555f 100644 --- a/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html +++ b/html_source/src/app/pages/wallet/wallet/modals/success-sweep-bare-outs/success-sweep-bare-outs.component.html @@ -12,7 +12,7 @@

    {{ - 'Successfully sent' | translate + 'TOR_LIB_STATE.STATE_SENT_SUCCESS' | translate }}

    @@ -52,12 +52,12 @@

    fxLayout="row nowrap" fxLayoutAlign=" center" > -

    {{ dialogData.txs_sent }} - transactions were successfully sent, {{ dialogData.bare_outs_swept }} bare outputs migrated, - {{ dialogData.amount_swept | intToMoney }} coins transferred, and {{ - dialogData.fee_spent | intToMoney }} - was spent for - fees.

    +

    {{ 'SUCCESS_SWEEP_BARE_OUTS.DETAILS' | translate: { + txs_sent: dialogData.txs_sent, + bare_outs_swept: dialogData.bare_outs_swept, + amount_swept: dialogData.amount_swept | intToMoney, + fee_spent: dialogData.fee_spent | intToMoney } }} +

diff --git a/html_source/src/app/pages/wallet/wallet/wallet.component.ts b/html_source/src/app/pages/wallet/wallet/wallet.component.ts index bd46ff20..011ef3fc 100644 --- a/html_source/src/app/pages/wallet/wallet/wallet.component.ts +++ b/html_source/src/app/pages/wallet/wallet/wallet.component.ts @@ -189,13 +189,13 @@ const objTabs: { [key in TabNameKeys]: Tab } = {
- +
-

Your wallet contains pre-zarcanum outputs

+

{{ 'WALLET.MIGRATE.TEXT1' | translate }}

- {{ 'More Details' | translate }} + {{ 'WALLET.MIGRATE.BUTTON1' | translate }}

diff --git a/html_source/src/assets/i18n/af.json b/html_source/src/assets/i18n/af.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/af.json +++ b/html_source/src/assets/i18n/af.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/ar.json b/html_source/src/assets/i18n/ar.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/ar.json +++ b/html_source/src/assets/i18n/ar.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/ca.json b/html_source/src/assets/i18n/ca.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/ca.json +++ b/html_source/src/assets/i18n/ca.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/cs.json b/html_source/src/assets/i18n/cs.json index 5d930ef0..04caebc4 100644 --- a/html_source/src/assets/i18n/cs.json +++ b/html_source/src/assets/i18n/cs.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/da.json b/html_source/src/assets/i18n/da.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/da.json +++ b/html_source/src/assets/i18n/da.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/de.json b/html_source/src/assets/i18n/de.json index 059149bc..8bc4d5b2 100644 --- a/html_source/src/assets/i18n/de.json +++ b/html_source/src/assets/i18n/de.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Senden", "SEND_PLACEHOLDER": "Nachricht eingeben..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Token hinzufügen", "CANCEL": "Abbrechen", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Zeitspanne:", "TITLE_TOTAL": "Gesamt" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Verschlüsseln", "LOCKED_BALANCE": "Gesperrt", "LOCKED_BALANCE_LINK": "Was bedeutet das?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset-ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/el.json b/html_source/src/assets/i18n/el.json index 1a42f395..baabe65f 100644 --- a/html_source/src/assets/i18n/el.json +++ b/html_source/src/assets/i18n/el.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/en.json b/html_source/src/assets/i18n/en.json index 40d125f1..8037456a 100644 --- a/html_source/src/assets/i18n/en.json +++ b/html_source/src/assets/i18n/en.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/es.json b/html_source/src/assets/i18n/es.json index 889ae377..3bd3d4db 100644 --- a/html_source/src/assets/i18n/es.json +++ b/html_source/src/assets/i18n/es.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/fi.json b/html_source/src/assets/i18n/fi.json index c8554bfe..28ab8a1b 100644 --- a/html_source/src/assets/i18n/fi.json +++ b/html_source/src/assets/i18n/fi.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/fr.json b/html_source/src/assets/i18n/fr.json index 0451f0ef..ca4a9fe5 100644 --- a/html_source/src/assets/i18n/fr.json +++ b/html_source/src/assets/i18n/fr.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Envoyer", "SEND_PLACEHOLDER": "Tapez un message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Ajouter un jeton", "CANCEL": "Annuler", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Période de temps:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Verrouillage", "LOCKED_BALANCE": "Vérouillé{{locked}}{{currency}}", "LOCKED_BALANCE_LINK": "Que signifie cela?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Identifiant de l'élément", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/he.json b/html_source/src/assets/i18n/he.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/he.json +++ b/html_source/src/assets/i18n/he.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/hu.json b/html_source/src/assets/i18n/hu.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/hu.json +++ b/html_source/src/assets/i18n/hu.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/id.json b/html_source/src/assets/i18n/id.json index abf24315..6579bf01 100644 --- a/html_source/src/assets/i18n/id.json +++ b/html_source/src/assets/i18n/id.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Kirim", "SEND_PLACEHOLDER": "Ketik sebuah pesan..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Tambahkan token", "CANCEL": "Batal", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Periode waktu:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Kunci", "LOCKED_BALANCE": "Terkunci", "LOCKED_BALANCE_LINK": "Apa yang dimaksudkan?\n", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "ID Aset", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/it.json b/html_source/src/assets/i18n/it.json index 1cad9fb7..d185ddf3 100644 --- a/html_source/src/assets/i18n/it.json +++ b/html_source/src/assets/i18n/it.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Invia", "SEND_PLACEHOLDER": "Digita un messaggio..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Aggiungi token", "CANCEL": "Annulla", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Periodo di tempo:", "TITLE_TOTAL": "Totale" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Blocca", "LOCKED_BALANCE": "Bloccato", "LOCKED_BALANCE_LINK": "Che cosa significa?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "ID risorsa", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/ja.json b/html_source/src/assets/i18n/ja.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/ja.json +++ b/html_source/src/assets/i18n/ja.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/ko.json b/html_source/src/assets/i18n/ko.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/ko.json +++ b/html_source/src/assets/i18n/ko.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/nl.json b/html_source/src/assets/i18n/nl.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/nl.json +++ b/html_source/src/assets/i18n/nl.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/no.json b/html_source/src/assets/i18n/no.json index c8554bfe..28ab8a1b 100644 --- a/html_source/src/assets/i18n/no.json +++ b/html_source/src/assets/i18n/no.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/pl.json b/html_source/src/assets/i18n/pl.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/pl.json +++ b/html_source/src/assets/i18n/pl.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/pt.json b/html_source/src/assets/i18n/pt.json index 356933a2..c25f9718 100644 --- a/html_source/src/assets/i18n/pt.json +++ b/html_source/src/assets/i18n/pt.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Enviar", "SEND_PLACEHOLDER": "Escreva uma mensagem..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Adicionar token", "CANCEL": "Cancelar", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Período de tempo:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Bloquear", "LOCKED_BALANCE": "Bloqueado", "LOCKED_BALANCE_LINK": "O que isso quer dizer?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "ID do recurso", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/ro.json b/html_source/src/assets/i18n/ro.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/ro.json +++ b/html_source/src/assets/i18n/ro.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/ru.json b/html_source/src/assets/i18n/ru.json index c211a452..2157f540 100644 --- a/html_source/src/assets/i18n/ru.json +++ b/html_source/src/assets/i18n/ru.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/sr.json b/html_source/src/assets/i18n/sr.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/sr.json +++ b/html_source/src/assets/i18n/sr.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/sv.json b/html_source/src/assets/i18n/sv.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/sv.json +++ b/html_source/src/assets/i18n/sv.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/tr.json b/html_source/src/assets/i18n/tr.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/tr.json +++ b/html_source/src/assets/i18n/tr.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/uk.json b/html_source/src/assets/i18n/uk.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/uk.json +++ b/html_source/src/assets/i18n/uk.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/vi.json b/html_source/src/assets/i18n/vi.json index 1d297b7d..555d3f7f 100644 --- a/html_source/src/assets/i18n/vi.json +++ b/html_source/src/assets/i18n/vi.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { diff --git a/html_source/src/assets/i18n/zh.json b/html_source/src/assets/i18n/zh.json index 99d03997..00935604 100644 --- a/html_source/src/assets/i18n/zh.json +++ b/html_source/src/assets/i18n/zh.json @@ -402,6 +402,13 @@ "SEND_BUTTON": "Send", "SEND_PLACEHOLDER": "Type a message..." }, + "MIGRATE_WALLET_TO_ZARCANUM": { + "BUTTON1": "Migrate", + "LINK1": "What does it mean?", + "TEXT1": "There are {{ total_bare_outs }} outputs with total amount of {{ total_amount }} ZANO.", + "TEXT2": "They can be converted in {{ txs_count }} transactions with total fee = {{ expected_total_fee }}.", + "TITLE": "Migrate wallet to Zarcanum" + }, "MODALS": { "ADD_TOKEN": "Add token", "CANCEL": "Cancel", @@ -721,6 +728,9 @@ "TITLE_PERIOD": "Time period:", "TITLE_TOTAL": "Total" }, + "SUCCESS_SWEEP_BARE_OUTS": { + "DETAILS": "{{ txs_sent }} transactions were successfully sent, {{ bare_outs_swept }} bare outputs migrated, {{ amount_swept }} coins transferred, and {{ fee_spent }} was spent for fees." + }, "SWAP": { "BUTTONS": { "BUTTON1": "Create Swap", @@ -800,6 +810,11 @@ "LOCK": "Lock", "LOCKED_BALANCE": "Locked", "LOCKED_BALANCE_LINK": "What does that mean?", + "MIGRATE": { + "BUTTON1": "More Details", + "BUTTON2": "Migrate", + "TEXT1": "Your wallet contains pre-zarcanum outputs" + }, "MODAL_ADD_CUSTOM_TOKEN": { "FIELD_TITLE": "Asset ID", "FORM_ERRORS": { From 12fe778376f3ff16e2de309969689ddf95c3ef73 Mon Sep 17 00:00:00 2001 From: Nazar Usov Date: Thu, 4 Apr 2024 15:59:43 +0300 Subject: [PATCH 6/6] Small fixes --- html_source/src/app/app.component.ts | 2 +- .../migrate-wallet-to-zarcanum.component.html | 3 +- .../migrate-wallet-to-zarcanum.component.ts | 59 +++++++++++-------- .../pages/wallet/wallet/wallet.component.ts | 6 +- 4 files changed, 37 insertions(+), 33 deletions(-) diff --git a/html_source/src/app/app.component.ts b/html_source/src/app/app.component.ts index 94b366f8..657e75cd 100644 --- a/html_source/src/app/app.component.ts +++ b/html_source/src/app/app.component.ts @@ -183,7 +183,7 @@ export class AppComponent implements OnInit, OnDestroy { wallet.balances = data.balances; wallet.mined_total = data.minied_total; wallet.alias_available = data.is_alias_operations_available; - wallet.has_bare_unspent_outputs = data.has_bare_unspent_outputs ?? false; + wallet.has_bare_unspent_outputs = data.has_bare_unspent_outputs; }); } }); diff --git a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html index 5b2b8a56..c4bb81ff 100644 --- a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html +++ b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.html @@ -11,7 +11,8 @@

total_amount: dialogData.total_amount | intToMoney } }}

-

+

{{ 'MIGRATE_WALLET_TO_ZARCANUM.LINK1' | translate }}

diff --git a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts index 6396dc08..1f484413 100644 --- a/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts +++ b/html_source/src/app/pages/wallet/wallet/modals/migrate-wallet-to-zarcanum/migrate-wallet-to-zarcanum.component.ts @@ -7,15 +7,16 @@ import { ParamsCallRpc } from '@api/models/call_rpc.model'; import { ModalService } from '@parts/services/modal.service'; import { SuccessSweepBareOutsComponent } from '../success-sweep-bare-outs/success-sweep-bare-outs.component'; import { ScrollStrategy, ScrollStrategyOptions } from '@angular/cdk/overlay'; +import { ZARCANUM_MIGRATION } from '@parts/data/constants'; @Component({ - selector: 'app-migrate-wallet-to-zarcanum', - templateUrl: './migrate-wallet-to-zarcanum.component.html', - styleUrls: ['./migrate-wallet-to-zarcanum.component.scss'] + selector: 'app-migrate-wallet-to-zarcanum', + templateUrl: './migrate-wallet-to-zarcanum.component.html', + styleUrls: ['./migrate-wallet-to-zarcanum.component.scss'], }) export class MigrateWalletToZarcanumComponent { readonly dialogData: GetBareOutsStats = inject(DIALOG_DATA); - private readonly _scrollStrategyOptions: ScrollStrategyOptions = inject(ScrollStrategyOptions); + private readonly _scrollStrategyOptions: ScrollStrategyOptions = inject(ScrollStrategyOptions); private readonly _scrollStrategyNoop: ScrollStrategy = this._scrollStrategyOptions.noop(); private readonly _dialog = inject(Dialog); private readonly _dialogRef = inject(DialogRef); @@ -23,30 +24,36 @@ export class MigrateWalletToZarcanumComponent { private readonly _variableService = inject(VariablesService); private readonly _modalService = inject(ModalService); private readonly _ngZone = inject(NgZone); - migrate(): void { - const { currentWallet: { wallet_id } } = this._variableService; - const params: ParamsCallRpc = { id: 0, jsonrpc: '2.0', method: 'sweep_bare_outs', params: {} }; - this._backendService.call_wallet_rpc([wallet_id, params], (status, response_data) => { - this._ngZone.run(() => { - if (response_data?.result) { - const data = response_data.result; - const dialogConfig: DialogConfig = { - maxWidth: '90vw', - width: '540px', - scrollStrategy: this._scrollStrategyNoop, - data - }; + migrate(): void { + const { + currentWallet: { wallet_id }, + } = this._variableService; + const params: ParamsCallRpc = { id: 0, jsonrpc: '2.0', method: 'sweep_bare_outs', params: {} }; + this._backendService.call_wallet_rpc([wallet_id, params], (status, response_data) => { + this._ngZone.run(() => { + if (response_data?.result) { + const data = response_data.result; - this._dialog.open(SuccessSweepBareOutsComponent, dialogConfig); - } else { - const message = response_data.error; - this._modalService.prepareModal('error', message); - } + const dialogConfig: DialogConfig = { + maxWidth: '90vw', + width: '540px', + scrollStrategy: this._scrollStrategyNoop, + data, + }; - this._dialogRef.close(); - }); - }); - } + this._dialog.open(SuccessSweepBareOutsComponent, dialogConfig); + } else { + const message = response_data.error; + this._modalService.prepareModal('error', message); + } + this._dialogRef.close(); + }); + }); + } + + openZarcanumMigration(): void { + this._backendService.openUrlInBrowser(ZARCANUM_MIGRATION); + } } diff --git a/html_source/src/app/pages/wallet/wallet/wallet.component.ts b/html_source/src/app/pages/wallet/wallet/wallet.component.ts index 011ef3fc..a727cffe 100644 --- a/html_source/src/app/pages/wallet/wallet/wallet.component.ts +++ b/html_source/src/app/pages/wallet/wallet/wallet.component.ts @@ -586,7 +586,7 @@ export class WalletComponent implements OnInit, OnDestroy { } openZarcanumMigration(): void { - this._openInBrowser(ZARCANUM_MIGRATION); + this.backend.openUrlInBrowser(ZARCANUM_MIGRATION); } openMigrateWalletToZarcanum(): void { @@ -615,10 +615,6 @@ export class WalletComponent implements OnInit, OnDestroy { }); } - private _openInBrowser(url: string) { - this.backend.openUrlInBrowser(url); - } - ngOnDestroy(): void { this.destroy$.next(); this.destroy$.complete();