Merge branch 'main' into exclude-magic-code-from-last-visited-path

.eslintrc.js

@@ -100,7 +100,6 @@ module.exports = {
         __DEV__: 'readonly',
     },
     rules: {
-        '@typescript-eslint/no-unsafe-call': 'off',
         '@typescript-eslint/no-unsafe-member-access': 'off',
         '@typescript-eslint/no-unsafe-assignment': 'off',
 
@@ -167,6 +166,7 @@ module.exports = {
 
         // Rulesdir specific rules
         'rulesdir/no-default-props': 'error',
+        'rulesdir/prefer-type-fest': 'error',
         'rulesdir/no-multiple-onyx-in-file': 'off',
         'rulesdir/prefer-underscore-method': 'off',
         'rulesdir/prefer-import-module-contents': 'off',
@@ -235,8 +235,21 @@ module.exports = {
         ],
     },
 
-    // Remove once no JS files are left
     overrides: [
+        // Enforces every Onyx type and its properties to have a comment explaining its purpose.
+        {
+            files: ['src/types/onyx/**/*.ts'],
+            rules: {
+                'jsdoc/require-jsdoc': [
+                    'error',
+                    {
+                        contexts: ['TSInterfaceDeclaration', 'TSTypeAliasDeclaration', 'TSPropertySignature'],
+                    },
+                ],
+            },
+        },
+
+        // Remove once no JS files are left
         {
             files: ['*.js', '*.jsx'],
             rules: {

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

@@ -1,6 +1,15 @@
 import * as core from '@actions/core';
 import fs from 'fs';
 
+type RegressionEntry = {
+    metadata?: {
+        creationDate: string;
+    };
+    name: string;
+    meanDuration: number;
+    meanCount: number;
+};
+
 const run = () => {
     // Prefix path to the graphite metric
     const GRAPHITE_PATH = 'reassure';
@@ -24,11 +33,11 @@ const run = () => {
         }
 
         try {
-            const current = JSON.parse(entry);
+            const current: RegressionEntry = JSON.parse(entry);
 
             // Extract timestamp, Graphite accepts timestamp in seconds
             if (current.metadata?.creationDate) {
-                timestamp = Math.floor(new Date(current.metadata.creationDate as string).getTime() / 1000);
+                timestamp = Math.floor(new Date(current.metadata.creationDate).getTime() / 1000);
             }
 
             if (current.name && current.meanDuration && current.meanCount && timestamp) {

.github/libs/GitUtils.ts

@@ -66,11 +66,11 @@ function getCommitHistoryAsJSON(fromTag: string, toTag: string): Promise<CommitT
         console.log(`Running command: git ${args.join(' ')}`);
         const spawnedProcess = spawn('git', args);
         spawnedProcess.on('message', console.log);
-        spawnedProcess.stdout.on('data', (chunk) => {
+        spawnedProcess.stdout.on('data', (chunk: Buffer) => {
             console.log(chunk.toString());
             stdout += chunk.toString();
         });
-        spawnedProcess.stderr.on('data', (chunk) => {
+        spawnedProcess.stderr.on('data', (chunk: Buffer) => {
             console.error(chunk.toString());
             stderr += chunk.toString();
         });

.github/scripts/enforceRedirect.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# HelpDot - Whenever an article is moved/renamed/deleted we should verify that
+# we have added a redirect link for it in redirects.csv. This ensures that we don't have broken links.
+
+declare -r RED='\033[0;31m'
+declare -r GREEN='\033[0;32m'
+declare -r NC='\033[0m'
+
+declare -r ARTICLES_DIRECTORY="docs/articles"
+declare -r REDIRECTS_FILE="docs/redirects.csv"
+
+hasRenamedOrDeletedArticle=false
+hasModifiedRedirect=false
+
+if git log origin/main..HEAD --name-status --pretty=format: $ARTICLES_DIRECTORY | grep -q -E "^(R|D)"
+then
+    echo "Articles have been renamed/moved/deleted"
+    hasRenamedOrDeletedArticle=true
+fi
+
+if git log origin/main..HEAD --name-status --pretty=format: $REDIRECTS_FILE | grep -q -E "^(M)"
+then
+    echo "Redirects.csv has been modified"
+    hasModifiedRedirect=true
+fi
+
+if [[ $hasRenamedOrDeletedArticle == true  && $hasModifiedRedirect == false ]]
+then
+    echo -e "${RED}Articles have been renamed or deleted. Please add a redirect link for the old article links in redirects.csv${NC}"
+    exit 1
+fi
+
+echo -e "${GREEN}Articles aren't moved or deleted, or a redirect has been added. Please verify that a redirect has been added for all the files moved or deleted${NC}"
+exit 0

.github/workflows/deployExpensifyHelp.yml

@@ -29,9 +29,12 @@ jobs:
     env:
       IS_PR_FROM_FORK: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork }}
     runs-on: ubuntu-latest
+    continue-on-error: true
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup NodeJS
         uses: ./.github/actions/composite/setupNode
@@ -42,6 +45,9 @@ jobs:
       - name: Check for duplicates and cycles in redirects.csv
         run: ./.github/scripts/verifyRedirect.sh
 
+      - name: Enforce that a redirect link has been created
+        run: ./.github/scripts/enforceRedirect.sh
+
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@0143c158f4fa0c5dcd99499a5d00859d79f70b0e
         with:

.github/workflows/testGithubActionsWorkflows.yml

@@ -25,6 +25,13 @@ jobs:
       - name: Setup Homebrew
         uses: Homebrew/actions/setup-homebrew@master
 
+      - name: Login to GitHub Container Regstry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: OSBotify
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Install Act
         run: brew install act
 

.gitignore

@@ -37,6 +37,11 @@ local.properties
 android/app/src/main/java/com/expensify/chat/generated/
 .cxx/
 
+# VIM
+*.swp
+*.swo
+*~
+
 # Vscode
 .vscode
 

.storybook/webpack.config.ts

@@ -3,6 +3,7 @@
 /* eslint-disable no-param-reassign */
 
 /* eslint-disable @typescript-eslint/naming-convention */
+import type Environment from 'config/webpack/types';
 import dotenv from 'dotenv';
 import path from 'path';
 import {DefinePlugin} from 'webpack';
@@ -18,6 +19,8 @@ type CustomWebpackConfig = {
     };
 };
 
+type CustomWebpackFunction = ({file, platform}: Environment) => CustomWebpackConfig;
+
 let envFile: string;
 switch (process.env.ENV) {
     case 'production':
@@ -31,9 +34,9 @@ switch (process.env.ENV) {
 }
 
 const env = dotenv.config({path: path.resolve(__dirname, `../${envFile}`)});
-const custom: CustomWebpackConfig = require('../config/webpack/webpack.common').default({
-    envFile,
-});
+const customFunction: CustomWebpackFunction = require('../config/webpack/webpack.common').default;
+
+const custom: CustomWebpackConfig = customFunction({file: envFile});
 
 const webpackConfig = ({config}: {config: Configuration}) => {
     if (!config.resolve) {

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001048011
-        versionName "1.4.80-11"
+        versionCode 1001048200
+        versionName "1.4.82-0"
         // Supported language variants must be declared here to avoid from being removed during the compilation.
         // This also helps us to not include unnecessary language variants in the APK.
         resConfigs "en", "es"

config/webpack/webpack.common.ts

@@ -4,14 +4,27 @@ import dotenv from 'dotenv';
 import fs from 'fs';
 import HtmlWebpackPlugin from 'html-webpack-plugin';
 import path from 'path';
-import type {Configuration} from 'webpack';
+import type {Compiler, Configuration} 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;
+};
+
 // 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 = require('@vue/preload-webpack-plugin');
+const PreloadWebpackPlugin: PreloadWebpackPluginClass = require('@vue/preload-webpack-plugin');
 
 const includeModules = [
     'react-native-animatable',

desktop/createDownloadQueue.ts

@@ -17,6 +17,11 @@ type DownloadItem = {
     options: Options;
 };
 
+type CreateDownloadQueue = () => {
+    enqueueDownloadItem: (item: DownloadItem) => void;
+    dequeueDownloadItem: () => DownloadItem | undefined;
+};
+
 /**
  * Returns the filename with extension based on the given name and MIME type.
  * @param name - The name of the file.
@@ -28,7 +33,7 @@ const getFilenameFromMime = (name: string, mime: string): string => {
     return `${name}.${extensions}`;
 };
 
-const createDownloadQueue = () => {
+const createDownloadQueue: CreateDownloadQueue = () => {
     const downloadItemProcessor = (item: DownloadItem): Promise<void> =>
         new Promise((resolve, reject) => {
             let downloadTimeout: NodeJS.Timeout;
@@ -114,3 +119,4 @@ const createDownloadQueue = () => {
 };
 
 export default createDownloadQueue;
+export type {DownloadItem, CreateDownloadQueue};

desktop/main.ts

@@ -13,9 +13,10 @@ import CONST from '@src/CONST';
 import type {TranslationPaths} from '@src/languages/types';
 import type PlatformSpecificUpdater from '@src/setup/platformSetup/types';
 import type {Locale} from '@src/types/onyx';
+import type {CreateDownloadQueue, DownloadItem} from './createDownloadQueue';
 import ELECTRON_EVENTS from './ELECTRON_EVENTS';
 
-const createDownloadQueue = require('./createDownloadQueue').default;
+const createDownloadQueue: CreateDownloadQueue = require('./createDownloadQueue').default;
 
 const port = process.env.PORT ?? 8082;
 const {DESKTOP_SHORTCUT_ACCELERATOR, LOCALES} = CONST;
@@ -617,7 +618,7 @@ const mainWindow = (): Promise<void> => {
 
                 const downloadQueue = createDownloadQueue();
                 ipcMain.on(ELECTRON_EVENTS.DOWNLOAD, (event, downloadData) => {
-                    const downloadItem = {
+                    const downloadItem: DownloadItem = {
                         ...downloadData,
                         win: browserWindow,
                     };

docs/README.md

@@ -186,9 +186,18 @@ Just update the content for each variable accordingly or remove it if the inform
 Assume that we want to rename the article `The Free Plan` to `Freemium Features` for the hub `billing and plan types` in New Expensify platform.
 1. Go to `docs/articles/new-expensify/billing-and-plan-types`
 2. Rename `The-Free-Plan.md` to `Freemium-Features.md`. Use dashes for spaces in the file name.
+3. Add an entry in redirects.csv for the old article pointing to the new article.
 
 Note: It is important that the file has `.md` extension.
 
+# How to hide an article temporarily
+Video demo available [here 🧵](https://expensify.slack.com/archives/C02NK2DQWUX/p1717772272605829?thread_ts=1717523271.137469&cid=C02NK2DQWUX).
+1. Open github's in built code editor by pressing `.` on your keyboard. ([instructions here](https://docs.github.com/en/codespaces/the-githubdev-web-based-editor#opening-the-githubdev-editor))
+2. Go to the article that you want to hide `docs/articles/...`.
+3. Drag and drop the article inside the hidden folder `docs/Hidden/`.
+4. Add a redirect for it in `docs/redirects.csv` to ensure that we don't have broken links. You can choose to point it to the home page or the article's hub.
+5. Commit the changes and raise a PR.
+
 # How the site is deployed
 This site is hosted on Cloudflare pages. Whenever code is merged to main, the github action `deployExpensifyHelp` will run.
 

docs/_data/_routes.yml

@@ -71,7 +71,7 @@ platforms:
 
       - href: integrations
         title: Integrations
-        icon: /assets/images/workflow.svg
+        icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Integrate with accounting or HR software to streamline expense approvals.
 
       - href: spending-insights
@@ -131,7 +131,7 @@ platforms:
 
       - href: connections
         title: Connections
-        icon: /assets/images/workflow.svg
+        icon: /assets/images/simple-illustration__monitor-remotesync.svg
         description: Connect to accounting software to streamline expense approvals.
 
       - href: settings