Merge branch 'main' into arrow-feature-signed

Expensify · Jul 31, 2022 · 191d8d7 · 191d8d7
2 parents 0366275 + a06358c
commit 191d8d7
Show file tree

Hide file tree

Showing 92 changed files with 2,013 additions and 934 deletions.
diff --git a/.github/actions/composite/setupNode/action.yml b/.github/actions/composite/setupNode/action.yml
@@ -6,6 +6,8 @@ runs:
   steps:
     # Version: 3.0.2
     - uses: actions/checkout@2541b1294d2704b0964813337f33b291d3f8596b
+      with:
+        fetch-depth: 0
 
     - uses: actions/setup-node@09ba51f18e18a3756fea1f54d09c6745c064491d
       with:

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -338,9 +338,6 @@ jobs:
     steps:
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
-      - name: Fetch tags
-        run: git fetch --tags
-
       - name: Set version
         run: echo "VERSION=$(npm run print-version --silent)" >> "$GITHUB_ENV"
 

diff --git a/README.md b/README.md
@@ -45,6 +45,7 @@ You can use any IDE or code editing tool for developing on any platform. Use you
 For an M1 Mac, read this [SO](https://stackoverflow.com/c/expensify/questions/11580) for installing cocoapods.
 
 * To install the iOS dependencies, run: `npm install && cd ios/ && pod install && cd ..`
+* If you are an Expensify employee and want to point the emulator to your local VM, follow [this](https://stackoverflow.com/c/expensify/questions/7699)
 * To run a on a **Development Simulator**: `npm run ios`
 * Changes applied to Javascript will be applied automatically, any changes to native code will require a recompile
 
@@ -53,6 +54,7 @@ For an M1 Mac, read this [SO](https://stackoverflow.com/c/expensify/questions/11
 * To install the Android dependencies, run: `npm install`
 * Go through the instructions on [this SO post](https://stackoverflow.com/c/expensify/questions/13283/13284#13284) to start running the app on android.
 * For more information, go through the official React-Native instructions on [this page](https://reactnative.dev/docs/environment-setup#development-os) for "React Native CLI Quickstart" > Mac OS > Android
+* If you are an Expensify employee and want to point the emulator to your local VM, follow [this](https://stackoverflow.com/c/expensify/questions/7699)
 * To run a on a **Development Emulator**: `npm run android`
 * Changes applied to Javascript will be applied automatically, any changes to native code will require a recompile
 

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001018505
-        versionName "1.1.85-5"
+        versionCode 1001018605
+        versionName "1.1.86-5"
     }
     splits {
         abi {

diff --git a/assets/images/dot-indicator.svg b/assets/images/dot-indicator.svg
diff --git a/assets/images/product-illustrations/tada--blue.svg b/assets/images/product-illustrations/tada--blue.svg
diff --git a/config/webpack/webpack.common.js b/config/webpack/webpack.common.js
@@ -151,6 +151,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
         alias: {
             'react-native-config': 'react-web-config',
             'react-native$': 'react-native-web',
+            'react-content-loader/native': 'react-content-loader',
         },
 
         // React Native libraries may have web-specific module implementations that appear with the extension `.web.js`

diff --git a/contributingGuides/CONTRIBUTING.md b/contributingGuides/CONTRIBUTING.md
@@ -37,6 +37,8 @@ Payment for your contributions will be made no less than 7 days after the pull r
 
 New contributors are limited to working on one job at a time, however experienced contributors may work on numerous jobs simultaneously. 
 
+Please be aware that compensation for any support in solving an issue is provided **entirely at Expensify’s discretion**. Personal time or resources applied towards investigating a proposal **will not guarantee compensation**. Compensation is only guaranteed to those who **[propose a solution and get hired for that job](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#propose-a-solution-for-the-job)**. We understand there may be cases where a selected proposal may take inspiration from a previous proposal. Unfortunately, it’s not possible for us to evaluate every individual case and we have no process that can efficiently do so. Issues with higher rewards come with higher risk factors so try to keep things civil and make the best proposal you can. Once again, **any information provided may not necessarily lead to you getting hired for that issue or compensated in any way.**
+
 ## Finding Jobs
 There are two ways you can find a job that you can contribute to:
 

diff --git a/desktop/README.md b/desktop/README.md
@@ -48,6 +48,8 @@ Testing the auto-update process can be a little involved. The most effective way
 
 **Note:** In order to test with a notarized build you'll need to have a paid Apple developer account.
 
+You can inspect auto update related logs in the log file at `~/Library/Logs/new.expensify.desktop/main.log`
+
 ## Setting up Min.IO
 Rather than pushing new builds to the production S3 bucket, the best way to test locally is to use [Min.IO](https://min.io). Min.IO is an S3-compatible service that you can set up and deploy locally. In order to set up a local Min.IO instance to emulate an S3 bucket, follow these steps:
 
@@ -139,3 +141,9 @@ To see the actual `app.asar` content run the following script
 npx asar extract desktop-build/mac/New\ Expensify.app/Contents/Resources/app.asar ./unpacked-asar
 ```
 The expected size of `app.asar` = `desktop/dist/www/` + `desktop/node_modules/`;
+
+
+# Logging
+
+- `main` process logs are written to `~/Library/Logs/new.expensify.desktop/main.log`
+- `renderer` logs can be observed live in the developer console (⌘ Cmd + ⌥ Option + I)
diff --git a/desktop/main.js b/desktop/main.js
@@ -33,12 +33,12 @@ app.commandLine.appendSwitch('enable-network-information-downlink-max');
 // See https://github.com/sindresorhus/electron-context-menu
 contextMenu();
 
-// Send all autoUpdater logs to a log file: ~/Library/Logs/new.expensify/main.log
+// Send all autoUpdater logs to a log file: ~/Library/Logs/new.expensify.desktop/main.log
 // See https://www.npmjs.com/package/electron-log
 autoUpdater.logger = log;
 autoUpdater.logger.transports.file.level = 'info';
 
-// Send all Console logs to a log file: ~/Library/Logs/new.expensify/main.log
+// Send all Console logs to a log file: ~/Library/Logs/new.expensify.desktop/main.log
 // See https://www.npmjs.com/package/electron-log
 _.assign(console, log.functions);
 

diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.85</string>
+	<string>1.1.86</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.85.5</string>
+	<string>1.1.86.5</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist
@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.85</string>
+	<string>1.1.86</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.85.5</string>
+	<string>1.1.86.5</string>
 </dict>
 </plist>