shared type, shhh eslint

actualbudget · Jan 2, 2025 · 519926b · 519926b
1 parent 30bf0c6
commit 519926b
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 7 deletions.
diff --git a/packages/desktop-client/src/components/LoggedInUser.tsx b/packages/desktop-client/src/components/LoggedInUser.tsx
@@ -6,6 +6,7 @@ import { useLocation } from 'react-router-dom';
 import { closeBudget, getUserData, signOut } from 'loot-core/client/actions';
 import { type State } from 'loot-core/src/client/state-types';
 import { type RemoteFile, type SyncedLocalFile } from 'loot-core/types/file';
+import { type TransObjectLiteral } from 'loot-core/types/util';
 
 import { useAuth } from '../auth/AuthProvider';
 import { Permissions } from '../auth/types';
@@ -208,7 +209,9 @@ export function LoggedInUser({
             (
             <Trans>
               logged in as:{' '}
-              <span>{{ userName: userData?.displayName } as any}</span>
+              <span>
+                {{ userName: userData?.displayName } as TransObjectLiteral}
+              </span>
             </Trans>
             )
           </small>
@@ -224,7 +227,7 @@ export function LoggedInUser({
               logged in as:{' '}
               <span>
                 <PrivacyFilter>
-                  {{ userName: userData?.displayName } as any}
+                  {{ userName: userData?.displayName } as TransObjectLiteral}
                 </PrivacyFilter>
               </span>
             </Trans>

diff --git a/packages/desktop-client/src/components/modals/CloseAccountModal.tsx b/packages/desktop-client/src/components/modals/CloseAccountModal.tsx
@@ -11,6 +11,7 @@ import {
 } from 'loot-core/client/actions';
 import { integerToCurrency } from 'loot-core/src/shared/util';
 import { type AccountEntity } from 'loot-core/src/types/models';
+import { type TransObjectLiteral } from 'loot-core/types/util';
 
 import { useAccounts } from '../../hooks/useAccounts';
 import { useCategories } from '../../hooks/useCategories';
@@ -121,7 +122,10 @@ export function CloseAccountModal({
             <Paragraph>
               <Trans>
                 Are you sure you want to close{' '}
-                <strong>{{ accountName: account.name } as any}</strong>?{' '}
+                <strong>
+                  {{ accountName: account.name } as TransObjectLiteral}
+                </strong>
+                ?{' '}
               </Trans>
               {canDelete ? (
                 <span>
@@ -151,7 +155,11 @@ export function CloseAccountModal({
                     <Trans>
                       This account has a balance of{' '}
                       <strong>
-                        {{ balance: integerToCurrency(balance) } as any}
+                        {
+                          {
+                            balance: integerToCurrency(balance),
+                          } as TransObjectLiteral
+                        }
                       </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
@@ -1,6 +1,8 @@
 import React from 'react';
 import { Trans } from 'react-i18next';
 
+import { type TransObjectLiteral } from 'loot-core/types/util';
+
 import { theme } from '../../style/theme';
 import { Button } from '../common/Button2';
 import { Stack } from '../common/Stack';
@@ -25,7 +27,7 @@ export function SaveReportDelete({
           <Text style={{ color: theme.errorText, marginBottom: 5 }}>
             Are you sure you want to delete report:{' '}
           </Text>
-          <View>{{ name } as any}</View>
+          <View>{{ name } as TransObjectLiteral}</View>
         </Trans>
       </View>
 

diff --git a/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx b/packages/desktop-client/src/components/select/RecurringSchedulePicker.tsx
@@ -12,7 +12,10 @@ import { sendCatch } from 'loot-core/src/platform/client/fetch';
 import * as monthUtils from 'loot-core/src/shared/months';
 import { getRecurringDescription } from 'loot-core/src/shared/schedules';
 import { type RecurConfig, type RecurPattern } from 'loot-core/types/models';
-import { type WithRequired } from 'loot-core/types/util';
+import {
+  type TransObjectLiteral,
+  type WithRequired,
+} from 'loot-core/types/util';
 
 import { useDateFormat } from '../../hooks/useDateFormat';
 import { SvgAdd, SvgSubtract } from '../../icons/v0';
@@ -540,7 +543,7 @@ function RecurringScheduleTooltip({
               style={{ userSelect: 'none', marginLeft: 5 }}
             >
               {' '}
-              {{ beforeOrAfter: '' } as any} weekend
+              {{ beforeOrAfter: '' } as TransObjectLiteral} weekend
             </label>
           </Trans>
         </View>

diff --git a/packages/loot-core/src/types/util.d.ts b/packages/loot-core/src/types/util.d.ts
@@ -9,3 +9,8 @@ export type EverythingButIdOptional<T> = { id: T['id'] } & Partial<
 >;
 
 export type WithRequired<T, K extends keyof T> = T & Required<Pick<T, K>>;
+
+// Allows use of object literals inside child elements of `Trans` tags
+// see https://github.com/i18next/react-i18next/issues/1483
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type TransObjectLiteral = any;