From 90e2fe60d10f7f1a3a6b449a76b99d5559558d42 Mon Sep 17 00:00:00 2001
From: Tim <hello@timsmart.co>
Date: Tue, 24 Sep 2024 05:15:49 +1200
Subject: [PATCH] fix modals on mobile BudgetTable (#3487)

---
 .../components/mobile/budget/BudgetTable.jsx  | 19 +++++++++++--------
 upcoming-release-notes/3487.md                |  6 ++++++
 2 files changed, 17 insertions(+), 8 deletions(-)
 create mode 100644 upcoming-release-notes/3487.md

diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
index 6c48175df..ebe158289 100644
--- a/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
+++ b/packages/desktop-client/src/components/mobile/budget/BudgetTable.jsx
@@ -225,8 +225,9 @@ function BudgetCell({
   const format = useFormat();
   const { showUndoNotification } = useUndo();
   const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+  const modalBudgetType = budgetType === 'rollover' ? 'envelope' : 'tracking';
 
-  const categoryBudgetMenuModal = `${budgetType}-budget-menu`;
+  const categoryBudgetMenuModal = `${modalBudgetType}-budget-menu`;
   const categoryNotes = useNotes(category.id);
 
   const onOpenCategoryBudgetMenu = () => {
@@ -386,6 +387,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
   const goalValue = isGoalTemplatesEnabled ? goalTemp : null;
 
   const [budgetType = 'rollover'] = useSyncedPref('budgetType');
+  const modalBudgetType = budgetType === 'rollover' ? 'envelope' : 'tracking';
   const dispatch = useDispatch();
   const { showUndoNotification } = useUndo();
   const { list: categories } = useCategories();
@@ -397,9 +399,9 @@ const ExpenseCategory = memo(function ExpenseCategory({
         category: category.id,
         flag: carryover,
       });
-      dispatch(collapseModals(`${budgetType}-balance-menu`));
+      dispatch(collapseModals(`${modalBudgetType}-balance-menu`));
     },
-    [budgetType, category.id, dispatch, month, onBudgetAction],
+    [modalBudgetType, category.id, dispatch, month, onBudgetAction],
   );
 
   const catBalance = useSheetValue(
@@ -429,7 +431,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
             from: category.id,
             to: toCategoryId,
           });
-          dispatch(collapseModals(`${budgetType}-balance-menu`));
+          dispatch(collapseModals(`${modalBudgetType}-balance-menu`));
           showUndoNotification({
             message: `Transferred ${integerToCurrency(amount)} from ${category.name} to ${categoriesById[toCategoryId].name}.`,
           });
@@ -438,7 +440,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
       }),
     );
   }, [
-    budgetType,
+    modalBudgetType,
     catBalance,
     categoriesById,
     category.id,
@@ -460,7 +462,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
             to: category.id,
             from: fromCategoryId,
           });
-          dispatch(collapseModals(`${budgetType}-balance-menu`));
+          dispatch(collapseModals(`${modalBudgetType}-balance-menu`));
           showUndoNotification({
             message: `Covered ${category.name} overspending from ${categoriesById[fromCategoryId].name}.`,
           });
@@ -468,7 +470,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
       }),
     );
   }, [
-    budgetType,
+    modalBudgetType,
     categoriesById,
     category.id,
     category.name,
@@ -480,7 +482,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
 
   const onOpenBalanceMenu = useCallback(() => {
     dispatch(
-      pushModal(`${budgetType}-balance-menu`, {
+      pushModal(`${modalBudgetType}-balance-menu`, {
         categoryId: category.id,
         month,
         onCarryover,
@@ -488,6 +490,7 @@ const ExpenseCategory = memo(function ExpenseCategory({
       }),
     );
   }, [
+    modalBudgetType,
     budgetType,
     category.id,
     dispatch,
diff --git a/upcoming-release-notes/3487.md b/upcoming-release-notes/3487.md
new file mode 100644
index 000000000..081fe893b
--- /dev/null
+++ b/upcoming-release-notes/3487.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [tim-smart]
+---
+
+Fix modals not opening on mobile budget view
-- 
GitLab