fix(ministry): report submission flow

sws2apps · Dec 8, 2024 · 4d2a285 · 4d2a285
1 parent adb25e4
commit 4d2a285
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "firebase": "^11.0.2",
     "i18next": "^24.0.5",
     "interweave": "^13.1.0",
+    "jotai": "^2.10.3",
     "jszip": "^3.10.1",
     "jw-epub-parser": "^3.29.1",
     "mui-one-time-password-input": "^3.0.1",

diff --git a/...res/ministry/report/publisher_report/monthly_report/withdraw_report/useWithdrawReport.tsx b/...res/ministry/report/publisher_report/monthly_report/withdraw_report/useWithdrawReport.tsx
@@ -81,7 +81,6 @@ const useWithdrawReport = ({ onClose }: WithdrawReportProps) => {
       );
 
       const report = structuredClone(findReport);
-
       report.report_data.status = 'pending';
 
       await dbUserFieldServiceReportsSave(report);

diff --git a/src/pages/ministry/ministry_report/useMinistryReport.tsx b/src/pages/ministry/ministry_report/useMinistryReport.tsx
@@ -21,6 +21,8 @@ const useMinistryReport = () => {
 
     if (status === 'confirmed') return true;
 
+    if (status === 'received') return true;
+
     return !shared_ministry;
   }, [settings, shared_ministry, status]);
 

diff --git a/src/services/app/index.ts b/src/services/app/index.ts
@@ -59,7 +59,13 @@ export const handleDeleteDatabase = async () => {
   await dbAppDelete();
   await userSignOut();
 
-  const freezeKeys = ['userConsent', 'organized_whatsnew'];
+  const freezeKeys = [
+    'userConsent',
+    'organized_whatsnew',
+    'theme',
+    'ui_lang',
+    'app_font',
+  ];
 
   const storageKeys = Object.keys(localStorage).filter(
     (key) => !freezeKeys.includes(key)
-Original file line number
+Diff line change
@@ Expand Up @@
           );
           const report = structuredClone(findReport);
           report.report_data.status = 'pending';
           await dbUserFieldServiceReportsSave(report);
@@ Expand Down @@