fix: resolve conflicts

.github/workflows/testBuild.yml

@@ -354,6 +354,6 @@ jobs:
  IOS: ${{ needs.iOS.result }}
  WEB: ${{ needs.web.result }}
  ANDROID_LINK: ${{steps.get_android_path.outputs.android_path}}
- DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensifyAdHoc.dmg
+ DESKTOP_LINK: https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/${{ env.PULL_REQUEST_NUMBER }}/NewExpensify.dmg
  IOS_LINK: ${{steps.get_ios_path.outputs.ios_path}}
  WEB_LINK: https://${{ env.PULL_REQUEST_NUMBER }}.pr-testing.expensify.com

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
  multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001037002
- versionName "1.3.70-2"
+ versionCode 1001037101
+ versionName "1.3.71-1"
  }
 
  flavorDimensions "default"

config/electronBuilder.config.js

@@ -21,24 +21,6 @@ const macIcon = {
  adhoc: './desktop/icon-adhoc.png',
 };
 
-const appIds = {
- production: 'com.expensifyreactnative.chat',
- staging: 'com.expensifyreactnative.dev.chat',
- adhoc: 'com.expensifyreactnative.adhoc.chat',
-};
-
-const productNames = {
- production: 'New Expensify',
- staging: 'New Expensify Dev',
- adhoc: 'New Expensify AdHoc',
-};
-
-const artifactNames = {
- production: 'NewExpensify.dmg',
- staging: 'NewExpensifyDev.dmg',
- adhoc: 'NewExpensifyAdHoc.dmg',
-};
-
 const isCorrectElectronEnv = ['production', 'staging', 'adhoc'].includes(process.env.ELECTRON_ENV);
 
 if (!isCorrectElectronEnv) {
@@ -50,8 +32,8 @@ if (!isCorrectElectronEnv) {
  * It can be used to create local builds of the same, by omitting the `--publish` flag
  */
 module.exports = {
- appId: appIds[process.env.ELECTRON_ENV],
- productName: productNames[process.env.ELECTRON_ENV],
+ appId: 'com.expensifyreactnative.chat',
+ productName: 'New Expensify',
  extraMetadata: {
  version,
  },
@@ -64,8 +46,8 @@ module.exports = {
  type: 'distribution',
  },
  dmg: {
- title: productNames[process.env.ELECTRON_ENV],
- artifactName: artifactNames[process.env.ELECTRON_ENV],
+ title: 'New Expensify',
+ artifactName: 'NewExpensify.dmg',
  internetEnabled: true,
  },
  publish: [
@@ -83,7 +65,7 @@ module.exports = {
  output: 'desktop-build',
  },
  protocols: {
- name: productNames[process.env.ELECTRON_ENV],
+ name: 'New Expensify',
  schemes: ['new-expensify'],
  },
 };

docs/assets/js/main.js

@@ -206,13 +206,6 @@ window.addEventListener('DOMContentLoaded', () => {
 
  // If there is a fixed article scroll container, set to calculate titles' offset
  scrollContainer: 'content-area',
-
- // onclick function to apply to all links in toc. will be called with
- // the event as the first parameter, and this can be used to stop,
- // propagation, prevent default or perform action
- onClick() {
- toggleHeaderMenu();
- },
  });
  }
 
@@ -226,6 +219,18 @@ window.addEventListener('DOMContentLoaded', () => {
 
  const articleContent = document.getElementById('article-content');
  const lhnContent = document.getElementById('lhn-content');
+
+ // This event listener checks if a link clicked in the LHN points to some section of the same page and toggles
+ // the LHN menu in responsive view.
+ lhnContent.addEventListener('click', (event) => {
+ const clickedLink = event.target;
+ if (clickedLink) {
+ const href = clickedLink.getAttribute('href');
+ if (href && href.startsWith('#') && !!document.getElementById(href.slice(1))) {
+ toggleHeaderMenu();
+ }
+ }
+ });
  lhnContent.addEventListener('wheel', (e) => {
  const scrollTop = lhnContent.scrollTop;
  const isScrollingPastLHNTop = e.deltaY < 0 && scrollTop === 0;

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
  <key>CFBundlePackageType</key>
  <string>APPL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.3.70</string>
+ <string>1.3.71</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
  </dict>
  </array>
  <key>CFBundleVersion</key>
- <string>1.3.70.2</string>
+ <string>1.3.71.1</string>
  <key>ITSAppUsesNonExemptEncryption</key>
  <false/>
  <key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
  <key>CFBundlePackageType</key>
  <string>BNDL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.3.70</string>
+ <string>1.3.71</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>
- <string>1.3.70.2</string>
+ <string>1.3.71.1</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
  "name": "new.expensify",
- "version": "1.3.70-2",
+ "version": "1.3.71-1",
  "author": "Expensify, Inc.",
  "homepage": "https://new.expensify.com",
  "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -94,7 +94,6 @@
  "domhandler": "^4.3.0",
  "expensify-common": "git+ssh://git@github.com/Expensify/expensify-common.git#35bff866a8d345b460ea6256f0a0f0a8a7f81086",
  "fbjs": "^3.0.2",
- "focus-trap-react": "^10.2.1",
  "htmlparser2": "^7.2.0",
  "idb-keyval": "^6.2.1",
  "jest-when": "^3.5.2",
@@ -132,10 +131,10 @@
  "react-native-linear-gradient": "^2.8.1",
  "react-native-localize": "^2.2.6",
  "react-native-modal": "^13.0.0",
- "react-native-onyx": "1.0.76",
+ "react-native-onyx": "1.0.77",
  "react-native-pager-view": "^6.2.0",
  "react-native-pdf": "^6.7.1",
- "react-native-performance": "^4.0.0",
+ "react-native-performance": "^5.1.0",
  "react-native-permissions": "^3.0.1",
  "react-native-picker-select": "git+https://github.com/Expensify/react-native-picker-select.git#eae05855286dc699954415cc1d629bfd8e8e47e2",
  "react-native-plaid-link-sdk": "^10.0.0",
@@ -145,7 +144,7 @@
  "react-native-render-html": "6.3.1",
  "react-native-safe-area-context": "4.4.1",
  "react-native-screens": "3.21.0",
- "react-native-svg": "^13.9.0",
+ "react-native-svg": "^13.13.0",
  "react-native-tab-view": "^3.5.2",
  "react-native-url-polyfill": "^2.0.0",
  "react-native-view-shot": "^3.6.0",