Make currency nullable

CruGlobal · Jan 8, 2025 · 580e7b1 · 580e7b1
1 parent 0463bfa
commit 580e7b1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 10 deletions.
diff --git a/pages/accountLists/[accountListId]/settings/preferences.page.tsx b/pages/accountLists/[accountListId]/settings/preferences.page.tsx
@@ -247,7 +247,7 @@ const Preferences: React.FC = () => {
               }
               accountListId={accountListId}
               currency={
-                accountPreferencesData?.accountList?.settings?.currency || ''
+                accountPreferencesData?.accountList?.settings?.currency || null
               }
               disabled={onSetupTour && setup !== 1}
               handleSetupChange={handleSetupChange}
@@ -267,7 +267,7 @@ const Preferences: React.FC = () => {
               handleAccordionChange={handleAccordionChange}
               expandedPanel={expandedPanel}
               currency={
-                accountPreferencesData?.accountList?.settings?.currency || ''
+                accountPreferencesData?.accountList?.settings?.currency || null
               }
               accountListId={accountListId}
               disabled={onSetupTour}

diff --git a/src/components/Settings/preferences/accordions/CurrencyAccordion/CurrencyAccordion.tsx b/src/components/Settings/preferences/accordions/CurrencyAccordion/CurrencyAccordion.tsx
@@ -20,7 +20,7 @@ const preferencesSchema: yup.ObjectSchema<
 interface CurrencyAccordionProps {
   handleAccordionChange: (panel: string) => void;
   expandedPanel: string;
-  currency: string;
+  currency: string | null;
   accountListId: string;
   disabled?: boolean;
 }
@@ -73,7 +73,7 @@ export const CurrencyAccordion: React.FC<CurrencyAccordionProps> = ({
       onAccordionChange={handleAccordionChange}
       expandedPanel={expandedPanel}
       label={label}
-      value={currency}
+      value={currency ?? ''}
       fullWidth
       disabled={disabled}
     >

diff --git a/...onents/Settings/preferences/accordions/MonthlyGoalAccordion/MonthlyGoalAccordion.test.tsx b/...onents/Settings/preferences/accordions/MonthlyGoalAccordion/MonthlyGoalAccordion.test.tsx
@@ -42,7 +42,7 @@ interface ComponentsProps {
 const Components: React.FC<ComponentsProps> = ({
   monthlyGoal,
   machineCalculatedGoal,
-  machineCalculatedGoalCurrency = null,
+  machineCalculatedGoalCurrency = 'USD',
   expandedPanel,
 }) => (
   <SnackbarProvider>

diff --git a/src/components/Settings/preferences/accordions/MonthlyGoalAccordion/MonthlyGoalAccordion.tsx b/src/components/Settings/preferences/accordions/MonthlyGoalAccordion/MonthlyGoalAccordion.tsx
@@ -21,14 +21,14 @@ const accountPreferencesSchema: yup.ObjectSchema<
 
 const formatMonthlyGoal = (
   goal: number | null,
-  currency: string,
+  currency: string | null,
   locale: string,
 ): string => {
   if (goal === null) {
     return '';
   }
 
-  if (currency && locale) {
+  if (currency) {
     return currencyFormat(goal, currency, locale);
   }
   return goal.toString();
@@ -39,7 +39,7 @@ interface MonthlyGoalAccordionProps {
   expandedPanel: string;
   monthlyGoal: number | null;
   accountListId: string;
-  currency: string;
+  currency: string | null;
   disabled?: boolean;
   handleSetupChange: () => Promise<void>;
 }
@@ -67,9 +67,14 @@ export const MonthlyGoalAccordion: React.FC<MonthlyGoalAccordionProps> = ({
   });
   const calculatedGoal = data?.healthIndicatorData[0]?.machineCalculatedGoal;
   const calculatedCurrency =
-    data?.healthIndicatorData[0]?.machineCalculatedGoalCurrency ?? currency;
+    data?.healthIndicatorData[0]?.machineCalculatedGoalCurrency;
   const formattedCalculatedGoal = useMemo(
-    () => formatMonthlyGoal(calculatedGoal ?? null, calculatedCurrency, locale),
+    () =>
+      formatMonthlyGoal(
+        calculatedGoal ?? null,
+        calculatedCurrency ?? null,
+        locale,
+      ),
     [calculatedGoal, calculatedCurrency, locale],
   );