Merge remote-tracking branch 'upstream/main' into @janic/client-actio…

…n-chain

.eslintrc.js

@@ -109,7 +109,6 @@ module.exports = {
     },
     rules: {
         // TypeScript specific rules
-        '@typescript-eslint/no-unsafe-assignment': 'off',
         '@typescript-eslint/prefer-enum-initializers': 'error',
         '@typescript-eslint/no-var-requires': 'off',
         '@typescript-eslint/no-non-null-assertion': 'error',

.github/actions/javascript/bumpVersion/bumpVersion.ts

@@ -49,7 +49,7 @@ if (!semanticVersionLevel || !versionUpdater.isValidSemverLevel(semanticVersionL
     console.log(`Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`, `Defaulting to: ${semanticVersionLevel}`);
 }
 
-const {version: previousVersion}: PackageJson = JSON.parse(fs.readFileSync('./package.json').toString());
+const {version: previousVersion} = JSON.parse(fs.readFileSync('./package.json').toString()) as PackageJson;
 if (!previousVersion) {
     core.setFailed('Error: Could not read package.json');
 }

.github/actions/javascript/createOrUpdateStagingDeploy/createOrUpdateStagingDeploy.ts

@@ -8,13 +8,13 @@ import GitUtils from '@github/libs/GitUtils';
 
 type IssuesCreateResponse = Awaited<ReturnType<typeof GithubUtils.octokit.issues.create>>['data'];
 
-type PackageJSON = {
+type PackageJson = {
     version: string;
 };
 
 async function run(): Promise<IssuesCreateResponse | void> {
     // Note: require('package.json').version does not work because ncc will resolve that to a plain string at compile time
-    const packageJson: PackageJSON = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+    const packageJson = JSON.parse(fs.readFileSync('package.json', 'utf8')) as PackageJson;
     const newVersionTag = packageJson.version;
 
     try {

.github/actions/javascript/getGraphiteString/getGraphiteString.ts

@@ -33,7 +33,7 @@ const run = () => {
         }
 
         try {
-            const current: RegressionEntry = JSON.parse(entry);
+            const current = JSON.parse(entry) as RegressionEntry;
 
             // Extract timestamp, Graphite accepts timestamp in seconds
             if (current.metadata?.creationDate) {

.github/actions/javascript/getPreviousVersion/getPreviousVersion.ts

@@ -11,7 +11,7 @@ function run() {
         core.setFailed(`'Error: Invalid input for 'SEMVER_LEVEL': ${semverLevel}`);
     }
 
-    const {version: currentVersion}: PackageJson = JSON.parse(readFileSync('./package.json', 'utf8'));
+    const {version: currentVersion} = JSON.parse(readFileSync('./package.json', 'utf8')) as PackageJson;
     if (!currentVersion) {
         core.setFailed('Error: Could not read package.json');
     }

.github/actions/javascript/validateReassureOutput/validateReassureOutput.ts

@@ -3,7 +3,7 @@ import type {CompareResult, PerformanceEntry} from '@callstack/reassure-compare/
 import fs from 'fs';
 
 const run = (): boolean => {
-    const regressionOutput: CompareResult = JSON.parse(fs.readFileSync('.reassure/output.json', 'utf8'));
+    const regressionOutput = JSON.parse(fs.readFileSync('.reassure/output.json', 'utf8')) as CompareResult;
     const countDeviation = Number(core.getInput('COUNT_DEVIATION', {required: true}));
     const durationDeviation = Number(core.getInput('DURATION_DEVIATION_PERCENTAGE', {required: true}));
 

__mocks__/@ua/react-native-airship.ts

@@ -15,31 +15,31 @@ const iOS: Partial<typeof AirshipIOS> = {
     },
 };
 
-const pushIOS: AirshipPushIOS = jest.fn().mockImplementation(() => ({
+const pushIOS = jest.fn().mockImplementation(() => ({
     setBadgeNumber: jest.fn(),
     setForegroundPresentationOptions: jest.fn(),
     setForegroundPresentationOptionsCallback: jest.fn(),
-}))();
+}))() as AirshipPushIOS;
 
-const pushAndroid: AirshipPushAndroid = jest.fn().mockImplementation(() => ({
+const pushAndroid = jest.fn().mockImplementation(() => ({
     setForegroundDisplayPredicate: jest.fn(),
-}))();
+}))() as AirshipPushAndroid;
 
-const push: AirshipPush = jest.fn().mockImplementation(() => ({
+const push = jest.fn().mockImplementation(() => ({
     iOS: pushIOS,
     android: pushAndroid,
     enableUserNotifications: () => Promise.resolve(false),
     clearNotifications: jest.fn(),
     getNotificationStatus: () => Promise.resolve({airshipOptIn: false, systemEnabled: false, airshipEnabled: false}),
     getActiveNotifications: () => Promise.resolve([]),
-}))();
+}))() as AirshipPush;
 
-const contact: AirshipContact = jest.fn().mockImplementation(() => ({
+const contact = jest.fn().mockImplementation(() => ({
     identify: jest.fn(),
     getNamedUserId: () => Promise.resolve(undefined),
     reset: jest.fn(),
     module: jest.fn(),
-}))();
+}))() as AirshipContact;
 
 const Airship: Partial<AirshipRoot> = {
     addListener: jest.fn(),

__mocks__/fs.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 const {fs} = require('memfs');
 
 module.exports = fs;

__mocks__/react-native.ts

@@ -41,7 +41,7 @@ jest.doMock('react-native', () => {
         };
     };
 
-    const reactNativeMock: ReactNativeMock = Object.setPrototypeOf(
+    const reactNativeMock = Object.setPrototypeOf(
         {
             NativeModules: {
                 ...ReactNative.NativeModules,
@@ -105,7 +105,7 @@ jest.doMock('react-native', () => {
             },
         },
         ReactNative,
-    );
+    ) as ReactNativeMock;
 
     return reactNativeMock;
 });

config/webpack/webpack.common.ts

@@ -4,27 +4,24 @@ import dotenv from 'dotenv';
 import fs from 'fs';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import path from 'path';
-import type {Compiler, Configuration} from 'webpack';
+import type {Class} from 'type-fest';
+import type {Configuration, WebpackPluginInstance} from 'webpack';
 import {DefinePlugin, EnvironmentPlugin, IgnorePlugin, ProvidePlugin} from 'webpack';
 import {BundleAnalyzerPlugin} from 'webpack-bundle-analyzer';
 import CustomVersionFilePlugin from './CustomVersionFilePlugin';
 import type Environment from './types';
 
-// importing anything from @vue/preload-webpack-plugin causes an error
 type Options = {
     rel: string;
     as: string;
     fileWhitelist: RegExp[];
     include: string;
 };
 
-type PreloadWebpackPluginClass = {
-    new (options?: Options): PreloadWebpackPluginClass;
-    apply: (compiler: Compiler) => void;
-};
+type PreloadWebpackPluginClass = Class<WebpackPluginInstance, [Options]>;
 
-// require is necessary, there are no types for this package and the declaration file can't be seen by the build process which causes an error.
-const PreloadWebpackPlugin: PreloadWebpackPluginClass = require('@vue/preload-webpack-plugin');
+// require is necessary, importing anything from @vue/preload-webpack-plugin causes an error
+const PreloadWebpackPlugin = require('@vue/preload-webpack-plugin') as PreloadWebpackPluginClass;
 
 const includeModules = [
     'react-native-animatable',

desktop/main.ts

@@ -141,7 +141,7 @@ const manuallyCheckForUpdates = (menuItem?: MenuItem, browserWindow?: BrowserWin
 
     autoUpdater
         .checkForUpdates()
-        .catch((error) => {
+        .catch((error: unknown) => {
             isSilentUpdating = false;
             return {error};
         })
@@ -617,7 +617,7 @@ const mainWindow = (): Promise<void> => {
                 });
 
                 const downloadQueue = createDownloadQueue();
-                ipcMain.on(ELECTRON_EVENTS.DOWNLOAD, (event, downloadData) => {
+                ipcMain.on(ELECTRON_EVENTS.DOWNLOAD, (event, downloadData: DownloadItem) => {
                     const downloadItem: DownloadItem = {
                         ...downloadData,
                         win: browserWindow,

jest/setup.ts

@@ -1,5 +1,6 @@
 import '@shopify/flash-list/jestSetup';
 import 'react-native-gesture-handler/jestSetup';
+import type * as RNKeyboardController from 'react-native-keyboard-controller';
 import mockStorage from 'react-native-onyx/dist/storage/__mocks__';
 import type Animated from 'react-native-reanimated';
 import 'setimmediate';
@@ -71,5 +72,4 @@ jest.mock('react-native-reanimated', () => ({
     useReducedMotion: jest.fn,
 }));
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-jest.mock('react-native-keyboard-controller', () => require('react-native-keyboard-controller/jest'));
+jest.mock('react-native-keyboard-controller', () => require<typeof RNKeyboardController>('react-native-keyboard-controller/jest'));

jest/setupMockFullstoryLib.ts

@@ -15,7 +15,7 @@ export default function mockFSLibrary() {
         return {
             FSPage(): FSPageInterface {
                 return {
-                    start: jest.fn(),
+                    start: jest.fn(() => {}),
                 };
             },
             default: Fullstory,

src/CONST.ts

@@ -5087,7 +5087,6 @@ const CONST = {
     PAYMENT_CARD_CURRENCY: {
         USD: 'USD',
         AUD: 'AUD',
-        GBP: 'GBP',
         NZD: 'NZD',
     },
 

src/components/AddressForm.tsx

@@ -182,6 +182,7 @@ function AddressForm({
                     InputComponent={CountrySelector}
                     inputID={INPUT_IDS.COUNTRY}
                     value={country}
+                    onValueChange={onAddressChanged}
                     shouldSaveDraft={shouldSaveDraft}
                 />
             </View>

src/components/AttachmentModal.tsx

@@ -320,7 +320,7 @@ function AttachmentModal({
             }
             let fileObject = data;
             if ('getAsFile' in data && typeof data.getAsFile === 'function') {
-                fileObject = data.getAsFile();
+                fileObject = data.getAsFile() as FileObject;
             }
             if (!fileObject) {
                 return;

src/components/Attachments/AttachmentCarousel/index.tsx

@@ -135,7 +135,7 @@ function AttachmentCarousel({report, reportActions, parentReportActions, source,
                 return;
             }
 
-            const item: Attachment = entry.item;
+            const item = entry.item as Attachment;
             if (entry.index !== null) {
                 setPage(entry.index);
                 setActiveSource(item.source);

src/components/Composer/index.tsx

@@ -251,7 +251,7 @@ function Composer(
     }, []);
 
     useEffect(() => {
-        const scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling) => {
+        const scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling: boolean) => {
             isReportFlatListScrolling.current = scrolling;
         });
 

src/components/CountrySelector.tsx

@@ -2,6 +2,7 @@ import {useIsFocused} from '@react-navigation/native';
 import React, {forwardRef, useEffect, useRef} from 'react';
 import type {ForwardedRef} from 'react';
 import type {View} from 'react-native';
+import useGeographicalStateAndCountryFromRoute from '@hooks/useGeographicalStateAndCountryFromRoute';
 import useLocalize from '@hooks/useLocalize';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
@@ -31,25 +32,38 @@ type CountrySelectorProps = {
 function CountrySelector({errorText = '', value: countryCode, onInputChange = () => {}, onBlur}: CountrySelectorProps, ref: ForwardedRef<View>) {
     const styles = useThemeStyles();
     const {translate} = useLocalize();
+    const {country: countryFromUrl} = useGeographicalStateAndCountryFromRoute();
 
     const title = countryCode ? translate(`allCountries.${countryCode}`) : '';
     const countryTitleDescStyle = title.length === 0 ? styles.textNormal : null;
 
     const didOpenContrySelector = useRef(false);
     const isFocused = useIsFocused();
     useEffect(() => {
-        if (!isFocused || !didOpenContrySelector.current) {
+        // Check if the country selector was opened and no value was selected, triggering onBlur to display an error
+        if (isFocused && didOpenContrySelector.current) {
+            didOpenContrySelector.current = false;
+            if (!countryFromUrl) {
+                onBlur?.();
+            }
+        }
+
+        // If no country is selected from the URL, exit the effect early to avoid further processing.
+        if (!countryFromUrl) {
             return;
         }
-        didOpenContrySelector.current = false;
-        onBlur?.();
-    }, [isFocused, onBlur]);
 
-    useEffect(() => {
-        // This will cause the form to revalidate and remove any error related to country name
-        onInputChange(countryCode);
+        // If a country is selected, invoke `onInputChange` to update the form and clear any validation errors related to the country selection.
+        if (onInputChange) {
+            onInputChange(countryFromUrl);
+        }
+
+        // Clears the `country` parameter from the URL to ensure the component country is driven by the parent component rather than URL parameters.
+        // This helps prevent issues where the component might not update correctly if the country is controlled by both the parent and the URL.
+        Navigation.setParams({country: undefined});
+
         // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [countryCode]);
+    }, [countryFromUrl, isFocused, onBlur]);
 
     return (
         <MenuItemWithTopDescription

src/components/FlatList/index.tsx

@@ -54,7 +54,6 @@ function MVCPFlatList<TItem>({maintainVisibleContentPosition, horizontal = false
         return horizontal ? getScrollableNode(scrollRef.current)?.scrollLeft ?? 0 : getScrollableNode(scrollRef.current)?.scrollTop ?? 0;
     }, [horizontal]);
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     const getContentView = useCallback(() => getScrollableNode(scrollRef.current)?.childNodes[0], []);
 
     const scrollToOffset = useCallback(

src/components/Hoverable/ActiveHoverable.tsx

@@ -48,7 +48,7 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, shouldFreez
             return;
         }
 
-        const scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling) => {
+        const scrollingListener = DeviceEventEmitter.addListener(CONST.EVENTS.SCROLLING, (scrolling: boolean) => {
             isScrollingRef.current = scrolling;
             if (!isScrollingRef.current) {
                 setIsHovered(isHoveredRef.current);
@@ -102,7 +102,7 @@ function ActiveHoverable({onHoverIn, onHoverOut, shouldHandleScroll, shouldFreez
 
     const child = useMemo(() => getReturnValue(children, !isScrollingRef.current && isHovered), [children, isHovered]);
 
-    const {onMouseEnter, onMouseLeave, onMouseMove, onBlur}: OnMouseEvents = child.props;
+    const {onMouseEnter, onMouseLeave, onMouseMove, onBlur} = child.props as OnMouseEvents;
 
     const hoverAndForwardOnMouseEnter = useCallback(
         (e: MouseEvent) => {

src/components/IFrame.tsx

@@ -17,7 +17,7 @@ function getNewDotURL(url: string): string {
 
     let params: Record<string, string>;
     try {
-        params = JSON.parse(paramString);
+        params = JSON.parse(paramString) as Record<string, string>;
     } catch {
         params = {};
     }