Skip to content

Commit dc9be70

Browse files
committed
#46 fixed FAQ & UserDashboard pages back button
1 parent 3aaafb0 commit dc9be70

File tree

2 files changed

+7
-13
lines changed

2 files changed

+7
-13
lines changed

mobile/src/views/FAQPage.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ion-header class="stickyHeader">
55
<ion-toolbar>
66
<ion-button class="stickyHeader-close" shape="round" slot="start" size="small" fill="outline"
7-
@click="triggerTabbedPageExitOrNavigate(`/user/dashboard`)">
7+
@click="goBackOrNavigateTo(ionRouter, `/user/dashboard`, 0)">
88
<ion-icon src="/assets/icons/line/arrow-left-line.svg"></ion-icon>
99
</ion-button>
1010
<ion-title class="stickyHeader-title" slot="start">{{ LL.Frequently_asked_questions() }}</ion-title>
@@ -71,15 +71,14 @@
7171

7272
<script setup lang="ts">
7373
import {typesafeI18n} from "@/i18n/i18n-vue";
74-
import {useTabbedPageNav} from "@/state/useTabbedPageNav";
74+
import {goBackOrNavigateTo} from "@/router";
75+
import {useIonRouter} from "@ionic/vue";
7576
7677
const publicUrl = import.meta.env.VITE_WHITE_LABEL_PUBLIC_URL
7778
79+
const ionRouter = useIonRouter();
7880
const { LL } = typesafeI18n()
7981
80-
81-
const {registerTabbedPageNavListeners, triggerTabbedPageExitOrNavigate} = useTabbedPageNav()
82-
registerTabbedPageNavListeners();
8382
</script>
8483

8584
<style lang="scss" scoped>

mobile/src/views/user/UserDashboardPage.vue

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<ion-header class="stickyHeader">
55
<ion-toolbar>
66
<ion-button class="stickyHeader-close" shape="round" slot="start" size="small" fill="outline"
7-
@click="triggerTabbedPageExitOrNavigate(`/event-selector`)">
7+
@click="goBackOrNavigateTo(ionRouter, `/event-selector`, 0)">
88
<ion-icon src="/assets/icons/line/arrow-left-line.svg"></ion-icon>
99
</ion-button>
1010
<ion-title class="stickyHeader-title" slot="start">{{ LL.Profile() }}</ion-title>
@@ -95,14 +95,13 @@
9595

9696
<script setup lang="ts">
9797
98-
import {IonFooter, useIonRouter} from "@ionic/vue";
99-
import {useTabbedPageNav} from "@/state/useTabbedPageNav";
98+
import {useIonRouter} from "@ionic/vue";
10099
import {useCurrentUser} from "@/state/useCurrentUser";
101-
import {shieldCheckmark, checkmarkCircle, warning, closeCircle} from "ionicons/icons";
102100
import Callout from "@/components/ui/Callout.vue";
103101
import {typesafeI18n} from "@/i18n/i18n-vue";
104102
import {computed, toValue} from "vue";
105103
import {useUserTokensWallet} from "@/state/useUserTokensWallet";
104+
import {goBackOrNavigateTo} from "@/router";
106105
107106
const ionRouter = useIonRouter();
108107
@@ -111,10 +110,6 @@ const { LL } = typesafeI18n()
111110
112111
const { userTokensWalletRef } = useUserTokensWallet();
113112
114-
const {registerTabbedPageNavListeners, triggerTabbedPageExitOrNavigate} = useTabbedPageNav()
115-
116-
registerTabbedPageNavListeners();
117-
118113
const isMyTalksButtonEnabled = computed(() => {
119114
const userTokensWallet = toValue(userTokensWalletRef);
120115
if(!userTokensWallet) {

0 commit comments

Comments
 (0)