- {{ fee.coinSymbol }} {{ fee.value | pretty }}
-
diff --git a/components/CoinSellAllForm.vue b/components/CoinSellAllForm.vue
index 6a40e6a9..d8671176 100644
--- a/components/CoinSellAllForm.vue
+++ b/components/CoinSellAllForm.vue
@@ -100,6 +100,7 @@
},
},
methods: {
+ prettyExact,
submit() {
if (this.$store.getters.isOfflineMode) {
this.generateTx();
@@ -345,7 +346,7 @@
{{ $td('You will send', 'form.convert-sell-confirm-send') }}
@@ -353,7 +354,7 @@
{{ $td('You will get approximately *', 'form.convert-sell-confirm-receive') }}
diff --git a/components/CoinSellForm.vue b/components/CoinSellForm.vue
index ac5fa5d7..1c1e62be 100644
--- a/components/CoinSellForm.vue
+++ b/components/CoinSellForm.vue
@@ -14,7 +14,7 @@
import FeeBus from '~/assets/fee';
import checkEmpty from '~/assets/v-check-empty';
import {getErrorText} from "~/assets/server-error";
- import {getExplorerTxUrl, pretty} from "~/assets/utils";
+ import {getExplorerTxUrl, pretty, prettyExact} from "~/assets/utils";
import FieldQr from '~/components/common/FieldQr';
import FieldUseMax from '~/components/common/FieldUseMax';
import InputUppercase from '~/components/common/InputUppercase';
@@ -160,6 +160,7 @@
},
methods: {
pretty,
+ prettyExact,
submit() {
if (this.$store.getters.isOfflineMode) {
this.generateTx();
@@ -449,7 +450,7 @@
{{ $td('You will send', 'form.convert-sell-confirm-send') }}
@@ -457,7 +458,7 @@
{{ $td('You will get approximately *', 'form.convert-sell-confirm-receive') }}
diff --git a/components/CoinSendForm.vue b/components/CoinSendForm.vue
index 7dd9fb82..a2929e25 100644
--- a/components/CoinSendForm.vue
+++ b/components/CoinSendForm.vue
@@ -15,7 +15,7 @@
import FeeBus from '~/assets/fee';
import checkEmpty from '~/assets/v-check-empty';
import {getServerValidator, fillServerErrors, getErrorText} from "~/assets/server-error";
- import {getExplorerTxUrl, pretty} from "~/assets/utils";
+ import {getExplorerTxUrl, pretty, prettyExact} from "~/assets/utils";
import FieldQr from '~/components/common/FieldQr';
import FieldUseMax from '~/components/common/FieldUseMax';
import InputUppercase from '~/components/common/InputUppercase';
@@ -158,6 +158,7 @@
},
methods: {
pretty,
+ prettyExact,
submit() {
if (this.$store.getters.isOfflineMode) {
this.generateTx();
@@ -435,14 +436,14 @@
{{ $td('You send', 'form.wallet-send-confirm-amount') }}
- {{ $td('To the Address', 'form.wallet-send-confirm-address') }}
diff --git a/components/ValidatorDelegateForm.vue b/components/ValidatorDelegateForm.vue
index f7ae3dd2..2f4456c6 100644
--- a/components/ValidatorDelegateForm.vue
+++ b/components/ValidatorDelegateForm.vue
@@ -7,6 +7,7 @@
import minValue from 'vuelidate/lib/validators/minValue';
import minLength from 'vuelidate/lib/validators/minLength';
import maxLength from 'vuelidate/lib/validators/maxLength';
+ import autosize from 'v-autosize';
import DelegateTxParams from "minter-js-sdk/src/tx-params/stake-delegate";
import {TX_TYPE_DELEGATE} from 'minterjs-tx/src/tx-types';
import {isValidPublic} from "minterjs-util/src/public";
@@ -15,12 +16,13 @@
import FeeBus from '~/assets/fee';
import checkEmpty from '~/assets/v-check-empty';
import {getErrorText} from "~/assets/server-error";
- import {getExplorerTxUrl, pretty} from "~/assets/utils";
+ import {getExplorerTxUrl, pretty, prettyExact} from "~/assets/utils";
import FieldQr from '~/components/common/FieldQr';
import FieldUseMax from '~/components/common/FieldUseMax';
import InputUppercase from '~/components/common/InputUppercase';
import InputMaskedInteger from '~/components/common/InputMaskedInteger';
import ButtonCopyIcon from '~/components/common/ButtonCopyIcon';
+ import Modal from '~/components/common/Modal';
let feeBus;
@@ -32,9 +34,11 @@
InputUppercase,
InputMaskedInteger,
ButtonCopyIcon,
+ Modal,
},
directives: {
checkEmpty,
+ autosize,
},
mixins: [validationMixin],
filters: {
@@ -63,6 +67,7 @@
isModeAdvanced: false,
/** @type FeeData */
fee: {},
+ isConfirmModalVisible: false,
signedTx: null,
};
},
@@ -154,13 +159,24 @@
},
methods: {
pretty,
+ prettyExact,
submit() {
if (this.$store.getters.isOfflineMode) {
this.generateTx();
} else {
- this.postTx();
+ this.submitConfirm();
}
},
+ submitConfirm() {
+ if (this.isFormSending) {
+ return;
+ }
+ if (this.$v.$invalid) {
+ this.$v.$touch();
+ return;
+ }
+ this.isConfirmModalVisible = true;
+ },
generateTx() {
if (this.$v.$invalid) {
this.$v.$touch();
@@ -181,13 +197,7 @@
this.clearForm();
},
postTx() {
- if (this.isFormSending) {
- return;
- }
- if (this.$v.$invalid) {
- this.$v.$touch();
- return;
- }
+ this.isConfirmModalVisible = false;
this.isFormSending = true;
this.signedTx = null;
this.serverError = '';
@@ -386,5 +396,49 @@
+
+
+
+
+
+
+
+
+
+ {{ $td('You delegate', 'form.delegation-delegate-confirm-amount') }}
+
+
+
+
+
+ {{ $td('To the masternode', 'form.delegation-delegate-confirm-address') }}
+
+
+
+
+ {{ $td('Confirm', 'form.submit-confirm-button') }}
+
+
+
+
+ {{ $td('Cancel', 'form.submit-cancel-button') }}
+
+
+
+
+
+
diff --git a/components/ValidatorReinvestForm.vue b/components/ValidatorReinvestForm.vue
index ce2ecec1..f643d212 100644
--- a/components/ValidatorReinvestForm.vue
+++ b/components/ValidatorReinvestForm.vue
@@ -272,7 +272,7 @@
{{ $td('Signed tx list:', 'form.delegation-reinvest-result') }}
-
+
diff --git a/components/ValidatorUnbondForm.vue b/components/ValidatorUnbondForm.vue
index 9fa45ef5..06374ce1 100644
--- a/components/ValidatorUnbondForm.vue
+++ b/components/ValidatorUnbondForm.vue
@@ -6,6 +6,7 @@
import minValue from 'vuelidate/lib/validators/minValue';
import minLength from 'vuelidate/lib/validators/minLength';
import maxLength from 'vuelidate/lib/validators/maxLength';
+ import autosize from 'v-autosize';
import UnbondTxParams from "minter-js-sdk/src/tx-params/stake-unbond";
import {TX_TYPE_UNBOND} from 'minterjs-tx/src/tx-types';
import {isValidPublic} from "minterjs-util/src/public";
@@ -14,12 +15,13 @@
import FeeBus from '~/assets/fee';
import checkEmpty from '~/assets/v-check-empty';
import {getErrorText} from "~/assets/server-error";
- import {getExplorerTxUrl, pretty} from "~/assets/utils";
+ import {getExplorerTxUrl, pretty, prettyExact} from "~/assets/utils";
import FieldQr from '~/components/common/FieldQr';
import InputUppercase from '~/components/common/InputUppercase';
import InputMaskedAmount from '~/components/common/InputMaskedAmount';
import InputMaskedInteger from '~/components/common/InputMaskedInteger';
import ButtonCopyIcon from '~/components/common/ButtonCopyIcon';
+ import Modal from '~/components/common/Modal';
let feeBus;
@@ -31,9 +33,11 @@
InputMaskedAmount,
InputMaskedInteger,
ButtonCopyIcon,
+ Modal,
},
directives: {
checkEmpty,
+ autosize,
},
mixins: [validationMixin],
filters: {
@@ -49,7 +53,7 @@
form: {
nonce: '',
publicKey: '',
- stake: null,
+ stake: '',
coinSymbol: '',
feeCoinSymbol: coinList && coinList.length ? coinList[0].coin : '',
message: '',
@@ -62,6 +66,7 @@
isModeAdvanced: false,
/** @type FeeData */
fee: {},
+ isConfirmModalVisible: false,
signedTx: null,
};
},
@@ -138,13 +143,24 @@
},
methods: {
pretty,
+ prettyExact,
submit() {
if (this.$store.getters.isOfflineMode) {
this.generateTx();
} else {
- this.postTx();
+ this.submitConfirm();
}
},
+ submitConfirm() {
+ if (this.isFormSending) {
+ return;
+ }
+ if (this.$v.$invalid) {
+ this.$v.$touch();
+ return;
+ }
+ this.isConfirmModalVisible = true;
+ },
generateTx() {
if (this.$v.$invalid) {
this.$v.$touch();
@@ -165,13 +181,7 @@
this.clearForm();
},
postTx() {
- if (this.isFormSending) {
- return;
- }
- if (this.$v.$invalid) {
- this.$v.$touch();
- return;
- }
+ this.isConfirmModalVisible = false;
this.isFormSending = true;
this.signedTx = null;
this.serverError = '';
@@ -215,7 +225,7 @@
},
clearForm() {
this.form.publicKey = '';
- this.form.stake = null;
+ this.form.stake = '';
this.form.coinSymbol = '';
this.form.feeCoinSymbol = this.balance && this.balance.length ? this.balance[0].coin : '';
this.form.message = '';
@@ -365,5 +375,49 @@
+
+
+
+
+
+
+
+
+
+
+ {{ $td('You unbond', 'form.delegation-unbond-confirm-amount') }}
+
+
+
+
+
+ {{ $td('From the masternode', 'form.delegation-unbond-confirm-address') }}
+
+
+
+
+ {{ $td('Confirm', 'form.submit-confirm-button') }}
+
+
+
+
+ {{ $td('Cancel', 'form.submit-cancel-button') }}
+
+
+
+
+
diff --git a/components/common/FieldQr.vue b/components/common/FieldQr.vue
index 8e3a8bc0..928d1129 100644
--- a/components/common/FieldQr.vue
+++ b/components/common/FieldQr.vue
@@ -54,7 +54,7 @@
@blur="$value.$touch()"
v-if="isInteger"
/>
-
-
diff --git a/lang/en.js b/lang/en.js
new file mode 100644
index 00000000..61f8e7b5
--- /dev/null
+++ b/lang/en.js
@@ -0,0 +1,6 @@
+export default {
+ form: {
+ 'delegation-delegate-confirm-note': 'Note: in case of unbond, your coins will return to your address in approximately
30 days (518 400 blocks) and will not be generating rewards during this period.',
+ 'delegation-unbond-confirm-description': 'Are you sure you want to unbond your coins? They will return to your address in approximately
30 days (518 400 blocks) and will not be generating rewards during this period.',
+ },
+};
diff --git a/lang/ru.js b/lang/ru.js
index 3a6c44f4..863b6951 100644
--- a/lang/ru.js
+++ b/lang/ru.js
@@ -185,6 +185,12 @@ export default {
'tx-table-check-nonce': 'Уникальный номер чека',
'tx-table-due-block': 'Действителен до блока',
},
+ broadcast: {
+ 'nonce-title': 'Получить nonce',
+ 'nonce-description': 'Получить nonce, необходимый для генерирования новой транзакции на оффлайн-устройстве.',
+ 'tx-title': 'Отправить подписанную транзакцию',
+ 'tx-description': 'Отправить транзакцию, сгенерированную на оффлайн-устройстве',
+ },
form: {
'toggle-simple-mode': 'Простой режим',
'toggle-advanced-mode': 'Расширенный режим',
@@ -201,6 +207,7 @@ export default {
'coin-error-required': 'Укажите монету',
'coin-error-min': 'Минимум 3 символа',
'coin-error-max': 'Максимум 10 символов',
+ 'coin-error-name': 'Некорректный символ монеты',
'amount-error-required': 'Укажите количество',
'number-invalid': 'Укажите положительное целое число',
'fee': 'Монета для оплаты комиссии',
@@ -291,7 +298,13 @@ export default {
'masternode-off-button': '«Выключить» мастерноду',
'delegation-delegate-button': 'Делегировать',
+ 'delegation-delegate-confirm-amount': 'Вы делегируете',
+ 'delegation-delegate-confirm-address': 'В мастерноду',
+ 'delegation-delegate-confirm-note': 'В случае отзыва монет, они вернутся на ваш кошелек примерно через
30 дней (518 400 блоков) и не будут приносить награды в течение этого времени.',
'delegation-unbond-button': 'Отозвать',
+ 'delegation-unbond-confirm-description': 'Вы уверены, что хотите отозвать монеты? Отозванные монеты вернутся на ваш кошелек примерно через
30 дней (518 400 блоков) и не будут приносить награды в течение этого времени.',
+ 'delegation-unbond-confirm-amount': 'Вы отзываете',
+ 'delegation-unbond-confirm-address': 'Из мастерноды',
'delegation-reinvest-tx-count': 'Количество транзакций',
'delegation-reinvest-tx-count-error-required': 'Укажите количество',
'delegation-reinvest-tx-count-help': '',
@@ -326,8 +339,20 @@ export default {
'coiner-create-crr-help': 'CRR отвечает за коэффициент постоянного резервирования монетами BIP в составе выпущенной новой. Чем выше коэффициент, тем больше обеспечение, а значит, меньше волатильность. И наоборот. Устанавливается в %, допустимое значение: от 10 до 100.',
'coiner-create-reserve': 'Количество резервируемых BIP',
'coiner-create-reserve-error-required': 'Укажите объем резерва',
- 'coiner-create-reserve-error-min': 'Минимальный резерв — 1000 {coin}',
+ 'coiner-create-reserve-error-min': 'Минимальный резерв — {coin} {min}',
+ 'coiner-create-form-price-error-min': 'Минимальнцая цена: {min}, текущая цена: {price}',
'coiner-create-button': 'Создать',
+ 'coiner-create-price': 'Начальная цена',
+ 'coiner-create-price-error-min': 'Минимальнцая цена: {min}',
+ 'coiner-create-confirm-warning': 'Внимание',
+ 'coiner-create-confirm-amount': 'Вы выпускаете',
+ 'coiner-create-confirm-crr': 'Монету с CRR',
+ 'coiner-create-confirm-reserve': 'Резервируя',
+ 'broadcast-nonce-button': 'Получить nonce',
+ 'broadcast-nonce-got': 'Nonce для новой транзакции:',
+ 'broadcast-tx': 'Подписанная транзакция',
+ 'broadcast-tx-error-required': 'Укажите подписанную транзакцию',
+ 'broadcast-tx-button': 'Отправить',
},
};
diff --git a/layouts/_footer.vue b/layouts/_footer.vue
index bf40ebcf..600b0b26 100644
--- a/layouts/_footer.vue
+++ b/layouts/_footer.vue
@@ -32,7 +32,7 @@