From 0cedaecf4e39e1a930e6fec38fcfe43d1ce1af24 Mon Sep 17 00:00:00 2001 From: joemarct Date: Sat, 7 Oct 2023 19:20:49 +0800 Subject: [PATCH] Updated method for setting which language to load at app startup --- src/App.vue | 2 +- src/pages/transaction/index.vue | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/App.vue b/src/App.vue index 928623866..2f3ee864f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -190,7 +190,7 @@ export default { const index = vm.$store.getters['global/getWalletIndex'] const mnemonic = await getMnemonic(index) if (mnemonic) { - vm.$i18n.locale = vm.$store.getters['global/language'].value + vm.$q.lang.set(vm.$store.getters['global/language'].value) await vm.savingInitialChipnet(mnemonic) // first check if vaults are empty this.$store.dispatch('global/saveExistingWallet') diff --git a/src/pages/transaction/index.vue b/src/pages/transaction/index.vue index 1742d9078..9aeda69f8 100644 --- a/src/pages/transaction/index.vue +++ b/src/pages/transaction/index.vue @@ -453,11 +453,12 @@ export default { this.adjustTransactionsDivHeight() }, adjustTransactionsDivHeight (opts={timeout: 500}) { + const vm = this let timeout = opts?.timeout if (Number.isNaN(timeout)) timeout = 500 setTimeout(() => { - const sectionHeight = this.$refs.fixedSection.clientHeight - this.$refs.transactionSection.setAttribute( + const sectionHeight = vm.$refs.fixedSection.clientHeight + vm.$refs.transactionSection.setAttribute( 'style', `position: relative; margin-top: ${sectionHeight - 24}px; z-index: 1; transition: margin-top 0.25s ease-in-out` )