diff --git a/src/lib/ui/mobile.ts b/src/lib/ui/mobile.ts index 67086429..48998f88 100644 --- a/src/lib/ui/mobile.ts +++ b/src/lib/ui/mobile.ts @@ -50,6 +50,16 @@ export function hideLoading(): void { }); } +export function closePopover(selector: string): void { + f7ready((f7) => { + const popover = f7.popover.get(selector); + + if (popover) { + popover.close(); + } + }); +} + export function closeAllDialog(): void { f7ready((f7) => { return f7.dialog.close(); diff --git a/src/views/mobile/accounts/ReconciliationStatementPage.vue b/src/views/mobile/accounts/ReconciliationStatementPage.vue index 184481ad..117a5aa9 100644 --- a/src/views/mobile/accounts/ReconciliationStatementPage.vue +++ b/src/views/mobile/accounts/ReconciliationStatementPage.vue @@ -16,19 +16,20 @@ - + - + @click="showAccountBalanceTrendsCharts = false"> - + @click="showAccountBalanceTrendsCharts = true"> @@ -279,10 +280,10 @@ - + - (false); const chartDataDateAggregationType = ref(ChartDateAggregationType.Day.type); const transactionToDelete = ref(null); const newClosingBalance = ref(0); -const showDisplayModePopover = ref(false); const showCustomDateRangeSheet = ref(false); const showNewClosingBalanceSheet = ref(false); const showMoreActionSheet = ref(false); const showDeleteActionSheet = ref(false); -const showChartDataDateAggregationTypePopover = ref(false); const virtualDataItems = ref({ items: [], topPosition: 0 @@ -673,7 +672,6 @@ function removeTransaction(transaction: TransactionReconciliationStatementRespon function setChartDataDateAggregationType(type: number): void { chartDataDateAggregationType.value = type; - showChartDataDateAggregationTypePopover.value = false; } function renderExternal(vl: unknown, vlData: ReconciliationStatementVirtualListData): void { diff --git a/src/views/mobile/settings/TransactionTagFilterSettingsPage.vue b/src/views/mobile/settings/TransactionTagFilterSettingsPage.vue index 2062dcf4..ad804dcc 100644 --- a/src/views/mobile/settings/TransactionTagFilterSettingsPage.vue +++ b/src/views/mobile/settings/TransactionTagFilterSettingsPage.vue @@ -101,10 +101,10 @@ - + - {{ tt('Categorical Analysis') }} - {{ tt('Trend Analysis') }} - {{ tt('Asset Trends') }} - - + - - - - (null); const reloading = ref(false); -const showChartDataTypePopover = ref(false); -const showSortingTypePopover = ref(false); -const showDatePopover = ref(false); -const showDateAggregationPopover = ref(false); const showCustomDateRangeSheet = ref(false); const showCustomMonthRangeSheet = ref(false); const showMoreActionSheet = ref(false); @@ -674,8 +673,6 @@ function setChartDataType(type: number, chartDataType: number): void { chartDataType: chartDataType }); - showChartDataTypePopover.value = false; - if (analysisTypeChanged) { reload(); } @@ -683,32 +680,26 @@ function setChartDataType(type: number, chartDataType: number): void { function setSortingType(type: number): void { if (type < ChartSortingType.Amount.type || type > ChartSortingType.Name.type) { - showSortingTypePopover.value = false; return; } statisticsStore.updateTransactionStatisticsFilter({ sortingType: type }); - - showSortingTypePopover.value = false; } function setTrendDateAggregationType(type: number): void { trendDateAggregationType.value = type; - showDateAggregationPopover.value = false; } function setAssetTrendsDateAggregationType(type: number): void { assetTrendsDateAggregationType.value = type; - showDateAggregationPopover.value = false; } function setDateFilter(dateType: number): void { if (analysisType.value === StatisticsAnalysisType.CategoricalAnalysis) { if (dateType === DateRange.Custom.type) { // Custom showCustomDateRangeSheet.value = true; - showDatePopover.value = false; return; } else if (query.value.categoricalChartDateType === dateType) { return; @@ -716,7 +707,6 @@ function setDateFilter(dateType: number): void { } else if (analysisType.value === StatisticsAnalysisType.TrendAnalysis) { if (dateType === DateRange.Custom.type) { // Custom showCustomMonthRangeSheet.value = true; - showDatePopover.value = false; return; } else if (query.value.trendChartDateType === dateType) { return; @@ -724,7 +714,6 @@ function setDateFilter(dateType: number): void { } else if (analysisType.value === StatisticsAnalysisType.AssetTrends) { if (dateType === DateRange.Custom.type) { // Custom showCustomDateRangeSheet.value = true; - showDatePopover.value = false; return; } else if (query.value.assetTrendsChartDateType === dateType) { return; @@ -759,8 +748,6 @@ function setDateFilter(dateType: number): void { }); } - showDatePopover.value = false; - if (changed) { reload(); } diff --git a/src/views/mobile/transactions/ListPage.vue b/src/views/mobile/transactions/ListPage.vue index 288dd0f6..a4eba77f 100644 --- a/src/views/mobile/transactions/ListPage.vue +++ b/src/views/mobile/transactions/ListPage.vue @@ -30,14 +30,14 @@ - + - + @click="changePageType(type.type)"> @@ -299,11 +299,10 @@ {{ tt('Load More') }} - + - - + - + @@ -349,7 +349,8 @@ - @@ -380,7 +381,8 @@ - - -