remove Trans nesting in favour of typecast

actualbudget · Jan 2, 2025 · 30bf0c6 · 30bf0c6
1 parent 05bb2ed
commit 30bf0c6
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/packages/desktop-client/src/components/LoggedInUser.tsx b/packages/desktop-client/src/components/LoggedInUser.tsx
@@ -205,7 +205,12 @@ export function LoggedInUser({
         userData?.displayName &&
         !hasSyncedPrefs && (
           <small>
-            (<Trans>logged in as:</Trans> <span>{userData?.displayName}</span>)
+            (
+            <Trans>
+              logged in as:{' '}
+              <span>{{ userName: userData?.displayName } as any}</span>
+            </Trans>
+            )
           </small>
         )}
       {!loading &&
@@ -214,10 +219,15 @@ export function LoggedInUser({
         userData?.displayName &&
         hasSyncedPrefs && (
           <small>
-            (<Trans>logged in as:</Trans>{' '}
-            <span>
-              <PrivacyFilter>{userData?.displayName}</PrivacyFilter>
-            </span>
+            (
+            <Trans>
+              logged in as:{' '}
+              <span>
+                <PrivacyFilter>
+                  {{ userName: userData?.displayName } as any}
+                </PrivacyFilter>
+              </span>
+            </Trans>
             )
           </small>
         )}

diff --git a/packages/desktop-client/src/components/modals/CloseAccountModal.tsx b/packages/desktop-client/src/components/modals/CloseAccountModal.tsx
@@ -121,10 +121,7 @@ export function CloseAccountModal({
             <Paragraph>
               <Trans>
                 Are you sure you want to close{' '}
-                <strong>
-                  <Trans>{{ accountName: account.name }}</Trans>
-                </strong>
-                ?{' '}
+                <strong>{{ accountName: account.name } as any}</strong>?{' '}
               </Trans>
               {canDelete ? (
                 <span>
@@ -154,7 +151,7 @@ export function CloseAccountModal({
                     <Trans>
                       This account has a balance of{' '}
                       <strong>
-                        <Trans>{{ balance: integerToCurrency(balance) }}</Trans>
+                        {{ balance: integerToCurrency(balance) } as any}
                       </strong>
                       . To close this account, select a different account to
                       transfer this balance to:

diff --git a/packages/desktop-client/src/components/reports/SaveReportDelete.tsx b/packages/desktop-client/src/components/reports/SaveReportDelete.tsx
@@ -25,9 +25,7 @@ export function SaveReportDelete({
           <Text style={{ color: theme.errorText, marginBottom: 5 }}>
             Are you sure you want to delete report:{' '}
           </Text>
-          <View>
-            <Trans>{{ name }}</Trans>
-          </View>
+          <View>{{ name } as any}</View>
         </Trans>
       </View>
 

diff --git a/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx b/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx
@@ -539,7 +539,8 @@ function RecurringScheduleTooltip({
               htmlFor="solve_dropdown"
               style={{ userSelect: 'none', marginLeft: 5 }}
             >
-              <Trans> {{ beforeOrAfter: '' }} weekend</Trans>
+              {' '}
+              {{ beforeOrAfter: '' } as any} weekend
             </label>
           </Trans>
         </View>