Merge branch 'main' into MitchExpensify-patch-1

.github/actions/composite/setupGitForOSBotifyApp/action.yml

@@ -0,0 +1,53 @@
+# This is a duplicate for setupGitForOSBotify except we are using a Github App now for Github Authentication.
+# GitHub Apps have higher rate limits. The reason this is being duplicated is because the existing action is still in use
+# in open PRs/branches that aren't up to date with main and it ends up breaking action workflows as a result.
+name: "Setup Git for OSBotify"
+description: "Setup Git for OSBotify"
+
+inputs:
+ GPG_PASSPHRASE:
+ description: "Passphrase used to decrypt GPG key"
+ required: true
+ OS_BOTIFY_APP_ID:
+ description: "Application ID for OS Botify"
+ required: true
+ OS_BOTIFY_PRIVATE_KEY:
+ description: "OS Botify's private key"
+ required: true
+
+outputs:
+ # Do not try to use this for committing code. Use `secrets.OS_BOTIFY_COMMIT_TOKEN` instead
+ OS_BOTIFY_API_TOKEN:
+ description: Token to use for GitHub API interactions.
+ value: ${{ steps.generateToken.outputs.token }}
+
+runs:
+ using: composite
+ steps:
+ - name: Decrypt OSBotify GPG key
+ run: cd .github/workflows && gpg --quiet --batch --yes --decrypt --passphrase=${{ inputs.GPG_PASSPHRASE }} --output OSBotify-private-key.asc OSBotify-private-key.asc.gpg
+ shell: bash
+
+ - name: Import OSBotify GPG Key
+ shell: bash
+ run: cd .github/workflows && gpg --import OSBotify-private-key.asc
+
+ - name: Set up git for OSBotify
+ shell: bash
+ run: |
+ git config user.signingkey 367811D53E34168C
+ git config commit.gpgsign true
+ git config user.name OSBotify
+ git config user.email infra+osbotify@expensify.com
+
+ - name: Enable debug logs for git
+ shell: bash
+ if: runner.debug == '1'
+ run: echo "GIT_TRACE=true" >> "$GITHUB_ENV"
+
+ - name: Generate a token
+ id: generateToken
+ uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
+ with:
+ app_id: ${{ inputs.OS_BOTIFY_APP_ID }}
+ private_key: ${{ inputs.OS_BOTIFY_PRIVATE_KEY }}

.github/actions/javascript/bumpVersion/index.js

@@ -298,6 +298,9 @@ function getPreviousVersion(currentVersion, level) {
  if (patch === 0) {
  return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
  }
+ if (major === 1 && minor === 3 && patch === 83) {
+ return getVersionStringFromNumber(major, minor, patch - 2, 0);
+ }
  return getVersionStringFromNumber(major, minor, patch - 1, 0);
  }
 

.github/actions/javascript/createOrUpdateStagingDeploy/index.js

@@ -998,6 +998,9 @@ function getPreviousVersion(currentVersion, level) {
  if (patch === 0) {
  return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
  }
+ if (major === 1 && minor === 3 && patch === 83) {
+ return getVersionStringFromNumber(major, minor, patch - 2, 0);
+ }
  return getVersionStringFromNumber(major, minor, patch - 1, 0);
  }
 

.github/actions/javascript/getDeployPullRequestList/index.js

@@ -961,6 +961,9 @@ function getPreviousVersion(currentVersion, level) {
  if (patch === 0) {
  return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
  }
+ if (major === 1 && minor === 3 && patch === 83) {
+ return getVersionStringFromNumber(major, minor, patch - 2, 0);
+ }
  return getVersionStringFromNumber(major, minor, patch - 1, 0);
  }
 

.github/actions/javascript/getPreviousVersion/index.js

@@ -148,6 +148,9 @@ function getPreviousVersion(currentVersion, level) {
  if (patch === 0) {
  return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
  }
+ if (major === 1 && minor === 3 && patch === 83) {
+ return getVersionStringFromNumber(major, minor, patch - 2, 0);
+ }
  return getVersionStringFromNumber(major, minor, patch - 1, 0);
  }
 

.github/libs/versionUpdater.js

@@ -118,6 +118,9 @@ function getPreviousVersion(currentVersion, level) {
  if (patch === 0) {
  return getPreviousVersion(currentVersion, SEMANTIC_VERSION_LEVELS.MINOR);
  }
+ if (major === 1 && minor === 3 && patch === 83) {
+ return getVersionStringFromNumber(major, minor, patch - 2, 0);
+ }
  return getVersionStringFromNumber(major, minor, patch - 1, 0);
  }
 

.github/scripts/findUnusedKeys.sh

@@ -6,7 +6,7 @@ LIB_PATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && cd ../../ && pwd)"
 
 readonly SRC_DIR="${LIB_PATH}/src"
 readonly STYLES_DIR="${LIB_PATH}/src/styles"
-readonly STYLES_FILE="${LIB_PATH}/src/styles/styles.js"
+readonly STYLES_FILE="${LIB_PATH}/src/styles/styles.ts"
 readonly UTILITIES_STYLES_FILE="${LIB_PATH}/src/styles/utilities"
 readonly STYLES_KEYS_FILE="${LIB_PATH}/scripts/style_keys_list_temp.txt"
 readonly UTILITY_STYLES_KEYS_FILE="${LIB_PATH}/scripts/utility_keys_list_temp.txt"
@@ -210,7 +210,12 @@ find_theme_style_and_store_keys() {
  fi
 
  # Check if we are inside an arrow function
- if [[ "$line" =~ ^[[:space:]]*([a-zA-Z0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\(\{ || "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
+ if [[ "$line" =~ ^[[:space:]]*([a-zA-Zgv 0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>'[[:space:]]*\(\{ || "$line" =~ ^[[:space:]]*([a-zA-Zgv 0-9_-])+:[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
+ inside_arrow_function=true
+ continue
+ fi
+
+ if [[ "$line" =~ ^[[:space:]]*(const|let|var)[[:space:]]+([a-zA-Z0-9_-]+)[[:space:]]*=[[:space:]]*\(.*\)[[:space:]]*'=>' ]]; then
  inside_arrow_function=true
  continue
  fi
@@ -348,7 +353,7 @@ echo "🔍 Looking for styles."
 find_utility_styles_store_prefix
 find_utility_usage_as_styles
 
-# Find and store keys from styles.js
+# Find and store keys from styles.ts
 find_styles_object_and_store_keys "$STYLES_FILE"
 find_styles_functions_and_store_keys "$STYLES_FILE"
 collect_theme_keys_from_styles "$STYLES_FILE"

.github/workflows/cherryPick.yml

@@ -41,15 +41,17 @@ jobs:
  token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
  - name: Set up git for OSBotify
- uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+ uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
  with:
  GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+ OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
+ OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
 
  - name: Get previous app version
  id: getPreviousVersion
  uses: Expensify/App/.github/actions/javascript/getPreviousVersion@main
  with:
- SEMVER_LEVEL: 'PATCH'
+ SEMVER_LEVEL: "PATCH"
 
  - name: Fetch history of relevant refs
  run: |
@@ -119,7 +121,7 @@ jobs:
  env:
  GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 
- - name: 'Announces a CP failure in the #announce Slack room'
+ - name: "Announces a CP failure in the #announce Slack room"
  uses: 8398a7/action-slack@v3
  if: ${{ failure() }}
  with:

.github/workflows/createNewVersion.yml

@@ -26,12 +26,18 @@ on:
  LARGE_SECRET_PASSPHRASE:
  description: Passphrase used to decrypt GPG key
  required: true
- OS_BOTIFY_TOKEN:
- description: Token for the OSBotify user
- required: true
  SLACK_WEBHOOK:
  description: Webhook used to comment in slack
  required: true
+ OS_BOTIFY_COMMIT_TOKEN:
+ description: OSBotify personal access token, used to workaround committing to protected branch
+ required: true
+ OS_BOTIFY_APP_ID:
+ description: Application ID for OS Botify App
+ required: true
+ OS_BOTIFY_PRIVATE_KEY:
+ description: OSBotify private key
+ required: true
 
 jobs:
  validateActor:
@@ -43,7 +49,7 @@ jobs:
  id: getUserPermissions
  run: echo "PERMISSION=$(gh api /repos/${{ github.repository }}/collaborators/${{ github.actor }}/permission | jq -r '.permission')" >> "$GITHUB_OUTPUT"
  env:
- GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+ GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
 
  createNewVersion:
  runs-on: macos-latest
@@ -65,18 +71,23 @@ jobs:
  uses: actions/checkout@v3
  with:
  ref: main
- token: ${{ secrets.OS_BOTIFY_TOKEN }}
+ # The OS_BOTIFY_COMMIT_TOKEN is a personal access token tied to osbotify
+ # This is a workaround to allow pushes to a protected branch
+ token: ${{ secrets.OS_BOTIFY_COMMIT_TOKEN }}
 
  - name: Setup git for OSBotify
- uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+ uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
+ id: setupGitForOSBotify
  with:
  GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+ OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
+ OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
 
  - name: Generate version
  id: bumpVersion
  uses: Expensify/App/.github/actions/javascript/bumpVersion@main
  with:
- GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+ GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
  SEMVER_LEVEL: ${{ inputs.SEMVER_LEVEL }}
 
  - name: Commit new version

.github/workflows/deploy.yml

@@ -14,11 +14,13 @@ jobs:
  with:
  ref: staging
  token: ${{ secrets.OS_BOTIFY_TOKEN }}
-
- - name: Setup git for OSBotify
- uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+ 
+ - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
+ id: setupGitForOSBotify
  with:
  GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+ OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
+ OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
 
  - name: Tag version
  run: git tag "$(npm run print-version --silent)"
@@ -30,16 +32,18 @@ jobs:
  runs-on: ubuntu-latest
  if: github.ref == 'refs/heads/production'
  steps:
- - name: Checkout
- uses: actions/checkout@v3
+ - uses: actions/checkout@v3
+ name: Checkout
  with:
  ref: production
  token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
- - name: Setup git for OSBotify
- uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+ - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
+ id: setupGitForOSBotify
  with:
  GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+ OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
+ OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
 
  - name: Get current app version
  run: echo "PRODUCTION_VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
@@ -49,7 +53,7 @@ jobs:
  uses: Expensify/App/.github/actions/javascript/getDeployPullRequestList@main
  with:
  TAG: ${{ env.PRODUCTION_VERSION }}
- GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+ GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}
  IS_PRODUCTION_DEPLOY: true
 
  - name: Generate Release Body
@@ -64,4 +68,4 @@ jobs:
  tag_name: ${{ env.PRODUCTION_VERSION }}
  body: ${{ steps.getReleaseBody.outputs.RELEASE_BODY }}
  env:
- GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+ GITHUB_TOKEN: ${{ steps.setupGitForOSBotify.outputs.OS_BOTIFY_API_TOKEN }}

.github/workflows/e2ePerformanceTests.yml

@@ -191,14 +191,15 @@ jobs:
  if: ${{ always() && runner.debug != null && fromJSON(runner.debug) }}
  run: cat "./Host_Machine_Files/\$WORKING_DIRECTORY/debug.log"
 
- - name: Check if test failed, if so post the results and add the DeployBlocker label
- run: |
- if grep -q '🔴' ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md; then
- gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
- gh pr comment ${{ inputs.PR_NUMBER }} -F ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md
- gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
- else
- echo '✅ no performance regression detected'
- fi
- env:
- GITHUB_TOKEN: ${{ github.token }}
+# TODO: Once tests are more reliable we should uncomment this
+# - name: Check if test failed, if so post the results and add the DeployBlocker label
+# run: |
+# if grep -q '🔴' ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md; then
+# gh pr edit ${{ inputs.PR_NUMBER }} --add-label DeployBlockerCash
+# gh pr comment ${{ inputs.PR_NUMBER }} -F ./Host_Machine_Files/\$WORKING_DIRECTORY/output.md
+# gh pr comment ${{ inputs.PR_NUMBER }} -b "@Expensify/mobile-deployers 📣 Please look into this performance regression as it's a deploy blocker."
+# else
+# echo '✅ no performance regression detected'
+# fi
+# env:
+# GITHUB_TOKEN: ${{ github.token }}

.github/workflows/finishReleaseCycle.yml

@@ -12,6 +12,19 @@ jobs:
  outputs:
  isValid: ${{ fromJSON(steps.isDeployer.outputs.IS_DEPLOYER) && !fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS) }}
  steps:
+ - name: Checkout
+ uses: actions/checkout@v3
+ with:
+ ref: main
+ token: ${{ secrets.OS_BOTIFY_TOKEN }}
+
+ - uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
+ id: setupGitForOSBotify
+ with:
+ GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+ OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
+ OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
+
  - name: Validate actor is deployer
  id: isDeployer
  run: |
@@ -70,9 +83,12 @@ jobs:
  token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
  - name: Setup Git for OSBotify
- uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+ id: setupGitForOSBotify
+ uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
  with:
  GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+ OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
+ OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
 
  - name: Update production branch
  run: |
@@ -109,9 +125,11 @@ jobs:
  token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
  - name: Setup Git for OSBotify
- uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+ uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
  with:
  GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+ OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
+ OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
 
  - name: Update staging branch to trigger staging deploy
  run: |

.github/workflows/preDeploy.yml

@@ -92,9 +92,11 @@ jobs:
  token: ${{ secrets.OS_BOTIFY_TOKEN }}
 
  - name: Setup Git for OSBotify
- uses: Expensify/App/.github/actions/composite/setupGitForOSBotify@main
+ uses: Expensify/App/.github/actions/composite/setupGitForOSBotifyApp@8c19d6da4a3d7ce3b15c9cd89a802187d208ecab
  with:
  GPG_PASSPHRASE: ${{ secrets.LARGE_SECRET_PASSPHRASE }}
+ OS_BOTIFY_APP_ID: ${{ secrets.OS_BOTIFY_APP_ID }}
+ OS_BOTIFY_PRIVATE_KEY: ${{ secrets.OS_BOTIFY_PRIVATE_KEY }}
 
  - name: Update staging branch from main
  run: |

.storybook/fonts.css

@@ -40,6 +40,13 @@
  src: url('../assets/fonts/web/ExpensifyMono-Bold.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyMono-Bold.woff') format('woff');
 }
 
+@font-face {
+ font-family: ExpensifyNewKansas-Medium;
+ font-weight: 400;
+ font-style: normal;
+ src: url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff2') format('woff2'), url('../assets/fonts/web/ExpensifyNewKansas-Medium.woff') format('woff');
+}
+
 * {
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;

README.md

@@ -3,7 +3,7 @@
   <img src="https://raw.githubusercontent.com/Expensify/App/main/web/favicon.png" width="64" height="64" alt="New Expensify Icon">
  </a>
  <h1>
-  <a href="https://new.expensify.com/">
+  <a href="https://new.expensify.com">
   New Expensify
   </a>
  </h1>

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
  multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001038107
- versionName "1.3.81-7"
+ versionCode 1001038400
+ versionName "1.3.84-0"
  }
 
  flavorDimensions "default"