Address review comments

Expensify · Jun 25, 2024 · 99cffb5 · 99cffb5
1 parent 021e09f
commit 99cffb5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/components/OfflineWithFeedback.tsx b/src/components/OfflineWithFeedback.tsx
@@ -107,7 +107,8 @@ function OfflineWithFeedback({
                     return child;
                 }
 
-                const childProps = child.props as {children?: React.ReactNode; style?: AllStyles};
+                type ChildComponentProps = ChildrenProps & {style?: AllStyles};
+                const childProps = child.props as ChildComponentProps;
                 const props: StrikethroughProps = {
                     style: StyleUtils.combineStyles(childProps.style ?? [], styles.offlineFeedback.deleted, styles.userSelectNone),
                 };

diff --git a/src/components/Tooltip/PopoverAnchorTooltip.tsx b/src/components/Tooltip/PopoverAnchorTooltip.tsx
@@ -10,7 +10,7 @@ function PopoverAnchorTooltip({shouldRender = true, children, ...props}: Tooltip
 
     const isPopoverRelatedToTooltipOpen = useMemo(() => {
         // eslint-disable-next-line @typescript-eslint/dot-notation
-        const tooltipNode = (tooltipRef.current?.['_childNode'] as Node) ?? null;
+        const tooltipNode = (tooltipRef.current?.['_childNode'] as Node | undefined) ?? null;
 
         if (
             isOpen &&

diff --git a/src/libs/Notification/PushNotification/index.native.ts b/src/libs/Notification/PushNotification/index.native.ts
@@ -1,4 +1,4 @@
-import type {JsonValue, PushPayload} from '@ua/react-native-airship';
+import type {PushPayload} from '@ua/react-native-airship';
 import Airship, {EventType} from '@ua/react-native-airship';
 import Onyx from 'react-native-onyx';
 import Log from '@libs/Log';
@@ -31,7 +31,7 @@ function pushNotificationEventCallback(eventType: EventType, notification: PushP
 
     // On Android, some notification payloads are sent as a JSON string rather than an object
     if (typeof payload === 'string') {
-        payload = JSON.parse(payload) as JsonValue;
+        payload = JSON.parse(payload) as string;
     }
 
     const data = payload as PushNotificationData;

diff --git a/src/libs/Notification/PushNotification/shouldShowPushNotification.ts b/src/libs/Notification/PushNotification/shouldShowPushNotification.ts
@@ -1,4 +1,4 @@
-import type {JsonValue, PushPayload} from '@ua/react-native-airship';
+import type {PushPayload} from '@ua/react-native-airship';
 import Log from '@libs/Log';
 import * as ReportActionUtils from '@libs/ReportActionsUtils';
 import * as Report from '@userActions/Report';
@@ -14,7 +14,7 @@ export default function shouldShowPushNotification(pushPayload: PushPayload): bo
 
     // The payload is string encoded on Android
     if (typeof payload === 'string') {
-        payload = JSON.parse(payload) as JsonValue;
+        payload = JSON.parse(payload) as string;
     }
 
     const data = payload as PushNotificationData;

diff --git a/src/libs/Notification/clearReportNotifications/index.native.ts b/src/libs/Notification/clearReportNotifications/index.native.ts
@@ -1,4 +1,4 @@
-import type {JsonValue, PushPayload} from '@ua/react-native-airship';
+import type {PushPayload} from '@ua/react-native-airship';
 import Airship from '@ua/react-native-airship';
 import Log from '@libs/Log';
 import type {PushNotificationData} from '@libs/Notification/PushNotification/NotificationType';
@@ -8,7 +8,7 @@ import type ClearReportNotifications from './types';
 const parseNotificationAndReportIDs = (pushPayload: PushPayload) => {
     let payload = pushPayload.extras.payload;
     if (typeof payload === 'string') {
-        payload = JSON.parse(payload) as JsonValue;
+        payload = JSON.parse(payload) as string;
     }
     const data = payload as PushNotificationData;
     return {