Merge branch 'main' of github.com:mananjadhav/App into mj-revert-held…

…-expense-grey-approve

.eslintrc.changed.js

@@ -20,12 +20,6 @@ module.exports = {
         ],
     },
     overrides: [
-        {
-            files: ['src/libs/actions/IOU.ts', 'src/pages/workspace/WorkspaceInitialPage.tsx', 'src/pages/home/report/PureReportActionItem.tsx', 'src/libs/SidebarUtils.ts'],
-            rules: {
-                'rulesdir/no-default-id-values': 'off',
-            },
-        },
         {
             files: ['**/libs/**/*.{ts,tsx}'],
             rules: {

.eslintrc.js

@@ -3,14 +3,26 @@ const path = require('path');
 const restrictedImportPaths = [
     {
         name: 'react-native',
-        importNames: ['useWindowDimensions', 'StatusBar', 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', 'Text', 'ScrollView'],
+        importNames: [
+            'useWindowDimensions',
+            'StatusBar',
+            'TouchableOpacity',
+            'TouchableWithoutFeedback',
+            'TouchableNativeFeedback',
+            'TouchableHighlight',
+            'Pressable',
+            'Text',
+            'ScrollView',
+            'Animated',
+        ],
         message: [
             '',
             "For 'useWindowDimensions', please use '@src/hooks/useWindowDimensions' instead.",
             "For 'TouchableOpacity', 'TouchableWithoutFeedback', 'TouchableNativeFeedback', 'TouchableHighlight', 'Pressable', please use 'PressableWithFeedback' and/or 'PressableWithoutFeedback' from '@components/Pressable' instead.",
             "For 'StatusBar', please use '@libs/StatusBar' instead.",
             "For 'Text', please use '@components/Text' instead.",
             "For 'ScrollView', please use '@components/ScrollView' instead.",
+            "For 'Animated', please use 'Animated' from 'react-native-reanimated' instead.",
         ].join('\n'),
     },
     {
@@ -75,6 +87,10 @@ const restrictedImportPaths = [
         importNames: ['memoize'],
         message: "Please use '@src/libs/memoize' instead.",
     },
+    {
+        name: 'react-native-animatable',
+        message: "Please use 'react-native-reanimated' instead.",
+    },
 ];
 
 const restrictedImportPatterns = [
@@ -134,6 +150,10 @@ module.exports = {
             {
                 selector: ['variable', 'property'],
                 format: ['camelCase', 'UPPER_CASE', 'PascalCase'],
+                filter: {
+                    regex: '^private_[a-z][a-zA-Z0-9]+$',
+                    match: false,
+                },
             },
             {
                 selector: 'function',

.github/ISSUE_TEMPLATE/TooltipsTemplate.md

@@ -0,0 +1,28 @@
+---
+name: 'Tooltips Template'
+about: Create this issue when adding a new tooltip to New Expensify
+labels: Daily, Design, WaitingForCopy
+title: 'Tooltips Template'
+---
+Refer to https://stackoverflowteams.com/c/expensify/questions/20762 for the full process to add a tooltip.
+
+### Problem
+Enter the problem that currently exists without the tooltip.
+
+### Solution
+Enter the solution that implementing the tooltip will achieve. 
+
+### What is the purpose of the tooltip? 
+Enter the purpose.
+
+### How should the tooltip look
+Add the Figma Mock Up that Design builds.
+
+### Condition
+We should show this tooltip to:
+
+### Decide the prioritisation
+
+Priority score:
+
+NOTE: Only one tooltip is shown at a time.

.github/PULL_REQUEST_TEMPLATE.md

@@ -22,6 +22,13 @@ $
 PROPOSAL:
 
 
+<!--- 
+If you want to trigger adhoc build of hybrid app from specific Mobile-Expensify PR please specify it like follows:
+
+MOBILE-EXPENSIFY: PR number
+
+--->
+
 ### Tests
 <!---
 Add a numbered list of manual tests you performed that validates your changes work on all platforms, and that there are no regressions present.

.github/actions/composite/setupNode/action.yml

@@ -31,8 +31,8 @@ runs:
       uses: actions/cache@v4
       with:
         path: node_modules
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
-
+        key: ${{ inputs.IS_HYBRID_BUILD == 'true' && format('{0}-node-modules-{1}', runner.os, hashFiles('package-lock.json', 'patches/**', 'Mobile-Expensify/patches/**')) || format('{0}-node-modules-{1}', runner.os, hashFiles('package-lock.json', 'patches/**'))}}
+    
     - id: cache-old-dot-node-modules
       if: inputs.IS_HYBRID_BUILD == 'true'
       uses: actions/cache@v4

.github/workflows/README.md

@@ -94,6 +94,7 @@ The GitHub workflows require a large list of secrets to deploy, notify and test
 1. `CSC_LINK` - Required to be set for desktop code signing: https://www.electron.build/code-signing.html#travis-appveyor-and-other-ci-servers
 1. `CSC_KEY_PASSWORD` - Required to be set for desktop code signing: https://www.electron.build/code-signing.html#travis-appveyor-and-other-ci-servers
 1. `APPLE_ID` - Required for notarizing desktop code in `desktop/notarize.js`
+1. `APPLE_TEAM_ID` - Required for notarizing desktop code in `desktop/notarize.js`
 1. `APPLE_ID_PASSWORD` - Required for notarizing desktop code in `desktop/notarize.js`
 1. `AWS_ACCESS_KEY_ID` - Required for hosting website and desktop compiled code
 1. `AWS_SECRET_ACCESS_KEY` - Required for hosting website and desktop compiled code

.github/workflows/deploy.yml

@@ -318,6 +318,7 @@ jobs:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/testBuild.yml

@@ -266,6 +266,7 @@ jobs:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
+          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/testBuildHybrid.yml

@@ -1,21 +1,17 @@
-name: Build and deploy hybird apps for testing
+name: Build and deploy hybrid apps for testing
 
 on:
   workflow_dispatch:
     inputs:
       PULL_REQUEST_NUMBER:
         description: Pull Request number for correct placement of apps
         required: true
-      OLD_DOT_COMMIT:
-        description: The branch, tag or SHA to checkout on Old Dot side
-        required: false
   pull_request_target:
     types: [opened, synchronize, labeled]
     branches: ['*ci-test/**']
 
 env:
   PULL_REQUEST_NUMBER: ${{ github.event.number || github.event.inputs.PULL_REQUEST_NUMBER }}
-  OLD_DOT_COMMIT: ${{ github.event.inputs.OLD_DOT_COMMIT }}
 
 jobs:
   validateActor:
@@ -63,6 +59,51 @@ jobs:
           echo "REF=$(gh pr view ${{ github.event.inputs.PULL_REQUEST_NUMBER }} --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  getOldDotPR:
+    runs-on: ubuntu-latest
+    needs: validateActor
+    if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
+    outputs:
+      OLD_DOT_PR: ${{ steps.old-dot-pr.outputs.result }}
+    steps:
+      - name: Check if author specifed Old Dot PR
+        id: old-dot-pr
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ github.token }}
+          result-encoding: string
+          script: |
+            const pullRequest = await github.rest.pulls.get({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              pull_number: '${{ env.PULL_REQUEST_NUMBER }}'',
+            });
+            
+            const body = pullRequest.data.body;
+            const regex = /MOBILE-EXPENSIFY:(?<prNumber>\d+)/;
+            const found = body.match(regex)?.groups?.prNumber || "";
+
+            return found.trim();
+
+  getOldDotBranchRef:
+      runs-on: ubuntu-latest
+      needs: getOldDotPR
+      if: ${{ needs.getOldDotPR.outputs.OLD_DOT_PR != '' }}
+      outputs:
+        OLD_DOT_REF: ${{ steps.getHeadRef.outputs.REF }}
+      steps:
+        - name: Checkout
+          uses: actions/checkout@v4
+
+        - name: Check if pull request number is correct
+          id: getHeadRef
+          run: |
+            set -e
+            echo "REF=$(gh pr view ${{ needs.getOldDotPR.outputs.OLD_DOT_PR }} -R 'Expensify/Mobile-Expensify' --json headRefOid --jq '.headRefOid')" >> "$GITHUB_OUTPUT"
+          env:
+            GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
 
   postGitHubCommentBuildStarted:
     runs-on: ubuntu-latest
@@ -84,7 +125,7 @@ jobs:
 
   androidHybrid:
     name: Build Android HybridApp
-    needs: [validateActor, getBranchRef]
+    needs: [validateActor, getBranchRef, getOldDotBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     runs-on: ubuntu-latest-xl
     outputs:
@@ -100,15 +141,16 @@ jobs:
           fetch-depth: 0
 
       - name: Update submodule to match main
-        env: 
-          OLD_DOT_COMMIT: ${{ env.OLD_DOT_COMMIT }}
         run: |
           git submodule update --init --remote
-          if [[ -z "$OLD_DOT_COMMIT" ]]; then
-            git fetch
-            git checkout ${{ env.OLD_DOT_COMMIT }} 
-          fi 
 
+      - name: Checkout Old Dot to author specified branch or commit
+        if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
+        run: |
+          cd Mobile-Expensify
+          git fetch
+          git checkout ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
+      
       - name: Configure MapBox SDK
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}
 
@@ -194,7 +236,7 @@ jobs:
         
   iosHybrid:
     name: Build and deploy iOS for testing
-    needs: [validateActor, getBranchRef]
+    needs: [validateActor, getBranchRef, getOldDotBranchRef]
     if: ${{ fromJSON(needs.validateActor.outputs.READY_TO_BUILD) }}
     env:
       DEVELOPER_DIR: /Applications/Xcode_16.2.0.app/Contents/Developer
@@ -210,14 +252,15 @@ jobs:
           fetch-depth: 0
 
       - name: Update submodule to match main
-        env: 
-          OLD_DOT_COMMIT: ${{ env.OLD_DOT_COMMIT }}
         run: |
           git submodule update --init --remote
-          if [[ -z "$OLD_DOT_COMMIT" ]]; then
-            git fetch
-            git checkout ${{ env.OLD_DOT_COMMIT }} 
-          fi 
+
+      - name: Checkout Old Dot to author specified branch or commit
+        if: ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF != '' }}
+        run: |
+          cd Mobile-Expensify
+          git fetch
+          git checkout ${{ needs.getOldDotBranchRef.outputs.OLD_DOT_REF }}
 
       - name: Configure MapBox SDK
         run: ./scripts/setup-mapbox-sdk.sh ${{ secrets.MAPBOX_SDK_DOWNLOAD_TOKEN }}