From 3128e125220220a7427dceb21993817bcb7c8a8a Mon Sep 17 00:00:00 2001 From: onmax Date: Tue, 15 Feb 2022 19:33:15 +0100 Subject: [PATCH] updated sendBtcTransaction hub request --- src/components/FeeSelector.vue | 2 +- src/components/modals/BtcSendModal.vue | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/FeeSelector.vue b/src/components/FeeSelector.vue index b9e2231b1..537a78928 100644 --- a/src/components/FeeSelector.vue +++ b/src/components/FeeSelector.vue @@ -47,7 +47,7 @@ export default defineComponent({ } } - context.emit('fee', fee); + context.emit('fee', { fee, delay: delay.value }); }); const speed = computed(() => { diff --git a/src/components/modals/BtcSendModal.vue b/src/components/modals/BtcSendModal.vue index 6ac95a8a4..c36b83e8a 100644 --- a/src/components/modals/BtcSendModal.vue +++ b/src/components/modals/BtcSendModal.vue @@ -190,6 +190,8 @@ export default defineComponent({ } = useBtcLabelsStore(); const { state: network$, isFetchingTxHistory } = useBtcNetworkStore(); + const delay = ref(12); // Same value as Fee Selector default value + const recipientWithLabel = ref<{address: string, label: string, type: RecipientType} | null>(null); function saveRecipientLabel() { @@ -344,9 +346,12 @@ export default defineComponent({ amount.value = maxSendableAmount.value; } - function updateFee(newFeePerByte: number) { + interface FeeSelectorEvent {fee: number; delay: number} + function updateFee({ fee: newFeePerByte, delay: newDelay }: FeeSelectorEvent) { const isSendingMax = amount.value === maxSendableAmount.value; feePerByte.value = newFeePerByte; + + delay.value = newDelay; if (isSendingMax) sendMax(); } @@ -479,6 +484,10 @@ export default defineComponent({ value: requiredInputs.value.changeAmount, }, } : {}), + fiatCurrency: fiat$.currency, + fiatRate: exchangeRates.value.btc[fiat$.currency] || 0, // Hub will handle this + delay: delay.value, + feePerByte: feePerByte.value, }); if (!plainTx) {