diff --git a/src/common/store/session/actions.ts b/src/common/store/session/actions.ts index 1a1def25b..892b78728 100644 --- a/src/common/store/session/actions.ts +++ b/src/common/store/session/actions.ts @@ -122,9 +122,11 @@ export const actions: ActionTree = { .then((response: AxiosResponse) => { const [result] = response.data; commit(constants.SESSION_SET_BITCOIN_PRICE, result.current_price); + sessionStorage.setItem('BTC_LAST_PRICE_OBTAINED', result.current_price); }) .catch(() => { - commit(constants.SESSION_SET_BITCOIN_PRICE, 0); + const lastPrice = Number(sessionStorage.getItem('BTC_LAST_PRICE_OBTAINED')); + commit(constants.SESSION_SET_BITCOIN_PRICE, lastPrice > 0 ? lastPrice : 0); }) .finally(() => { commit(constants.SESSION_SET_TX_TYPE, 'PEG_IN_TRANSACTION_TYPE'); diff --git a/src/pegout/components/FlyoverPegout.vue b/src/pegout/components/FlyoverPegout.vue index 2025f5d3b..5943f508b 100644 --- a/src/pegout/components/FlyoverPegout.vue +++ b/src/pegout/components/FlyoverPegout.vue @@ -52,7 +52,7 @@ :formState="pegOutFormState" :isReadyToSign="isReadyToSign" :isReadyToCreate="isReadyToCreate" - :authorizedWalletToSignMessage="authorizedWalletToSignMessage" + :pegoutOptionAuthorizedWalletToSign="authorizedWalletToSignMessage" @openAddressDialog="showAddressDialog = true" @flyoverInputFocusChanged="handleFlyoverInputFocusChanged" @send="send(quote.quoteHash)" @@ -171,6 +171,7 @@ export default defineComponent({ const pegOutFormState = ref>(new Machine('fill')); const injectedProvider = ref(''); const isReadyToSign = ref(false); + let authorizedWalletToSignMessage = ref(false); const showAddressDialog = ref(false); const flyoverInputFocused = ref(false); const loadingQuotes = ref(false); @@ -252,11 +253,11 @@ export default defineComponent({ return ''; }); - const authorizedWalletToSignMessage = computed( - (): boolean => injectedProvider.value === constants.RLOGIN_METAMASK_WALLET + function walletAuthorizedToSign() { + authorizedWalletToSignMessage = injectedProvider.value === constants.RLOGIN_METAMASK_WALLET || isLedgerConnected.value - || session.value.rLogin?.provider.isTrezor, - ); + || session.value.rLogin?.provider.isTrezor; + } const validAmountToReceive = computed((): boolean => estimatedBtcToReceive.value.gt(0)); @@ -358,6 +359,7 @@ export default defineComponent({ } function getQuotes() { + walletAuthorizedToSign(); loadingQuotes.value = true; getPegoutQuotes(session.value.account) .catch(handlePegoutError) diff --git a/src/pegout/components/PegoutOption.vue b/src/pegout/components/PegoutOption.vue index 423c9da04..ef5e6f23e 100644 --- a/src/pegout/components/PegoutOption.vue +++ b/src/pegout/components/PegoutOption.vue @@ -74,7 +74,7 @@ {{session.btcDerivedAddress}} @@ -82,7 +82,7 @@ Get Bitcoin destination address - + As you are not using MetaMask, Ledger or Trezor, you need to follow