Fix conflicts

.github/workflows/cla.yml

@@ -33,7 +33,7 @@ jobs:
           with:
               path-to-signatures: '${{ github.repository }}/cla.json'
               path-to-document: 'https://github.com/${{ github.repository }}/blob/main/CLA.md'
-              branch: 'master'
+              branch: 'main'
               remote-organization-name: 'Expensify'
               remote-repository-name: 'CLA'
               lock-pullrequest-aftermerge: false

CONTRIBUTING.md

@@ -70,6 +70,7 @@ In this scenario, it’s possible that you found a bug or enhancement that we ha
 #### Propose a solution for the job
 4. After you reproduce the issue, make a proposal for your solution and post it as a comment in the corresponding GitHub issue (linked in the Upwork job). Your solution proposal should include a brief technical explanation of the changes you will make.
     - Note: If you post a proposed solution in an issue that has not been tagged with the `External` label, Expensify has the right to use your proposal to fix said issue, without providing compensation for your solution.
+    - Note: Before submitting a proposal on an issue, be sure to read any other existing proposals. Any new proposal should be substantively different from existing proposals.
 5. Pause at this step until Expensify provides feedback on your proposal (do not begin coding or creating a pull request yet).
 6. If your solution proposal is accepted, Expensify will hire you on Upwork and assign the GitHub issue to you.
 

README.md

@@ -55,10 +55,37 @@ You can use any IDE or code editing tool for developing on any platform. Use you
 
 ## Troubleshooting
 1. If you are having issues with **_Getting Started_**, please reference [React Native's Documentation](https://reactnative.dev/docs/environment-setup)
-2. If you are running into issues communicating with the API please verify your `.env` file is [set up correctly](#getting-started) for the platform you are trying to run.
+2. If you are running into CORS errors like (in the browser dev console)
+   ```sh
+   Access to fetch at 'https://www.expensify.com/api?command=GetAccountStatus' from origin 'http://localhost:8080' has been blocked by CORS policy
+   ```
+   You probably have a misconfigured `.env` file - remove it (`rm .env`) and try again
 
 **Note:** Expensify engineers that will be testing with the API in your local dev environment please refer to [these additional instructions](https://stackoverflow.com/c/expensify/questions/7699/7700).
 
+## Environment variables
+Creating an `.env` file is not necessary. We advise external contributors against it. It can lead to errors when 
+variables referenced here get updated since your local `.env` file is ignored.
+
+- `EXPENSIFY_URL_CASH` - The root URL used for the website
+- `EXPENSIFY_URL_SECURE` - The URL used to hit the Expensify secure API
+- `EXPENSIFY_URL_COM` - The URL used to hit the Expensify API
+- `EXPENSIFY_PARTNER_NAME` - Constant used for the app when authenticating.
+- `EXPENSIFY_PARTNER_PASSWORD` - Another constant used for the app when authenticating. (This is OK to be public) 
+- `PUSHER_APP_KEY` - Key used to authenticate with Pusher.com
+- `SECURE_NGROK_URL` - Secure URL used for `ngrok` when testing
+- `NGROK_URL` - URL used for `ngrok` when testing
+- `USE_NGROK` - Flag to turn `ngrok` testing on or off
+- `USE_WDYR` - Flag to turn [`Why Did You Render`](https://github.com/welldone-software/why-did-you-render) testing on or off
+- `USE_WEB_PROXY`⚠️- Used in web/desktop development, it starts a server along the local development server to proxy
+   requests to the backend. External contributors should set this to `true` otherwise they'll have CORS errors.  
+   If you don't want to start the proxy server set this explicitly to `false`
+- `CAPTURE_METRICS` (optional) - Set this to `true` to capture performance metrics and see them in Flipper
+   see [PERFORMANCE.md](PERFORMANCE.md#performance-metrics-opt-in-on-local-release-builds) for more information
+- `ONYX_METRICS` (optional) - Set this to `true` to capture even more performance metrics and see them in Flipper
+   see [React-Native-Onyx#benchmarks](https://github.com/Expensify/react-native-onyx#benchmarks) for more information
+
+
 ----
 
 # Running the tests

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010001
-        versionName "1.1.0-1"
+        versionCode 1001010800
+        versionName "1.1.8-0"
     }
     splits {
         abi {

android/app/src/main/res/values/colors.xml

@@ -1,3 +1,6 @@
 <resources>
     <color name="bootsplash_background">#FFFFFF</color>
+    <color name="accent">#0185ff</color>
+    <color name="dark">#0b1b34</color>
+    <color name="gray4">#7D8B8F</color>
 </resources>

android/app/src/main/res/values/styles.xml

@@ -3,14 +3,13 @@
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <!-- Customize your theme here. -->
-        <item name="android:textColor">#000000</item>
-        <!-- colors.gray4 -->
-        <item name="android:colorEdgeEffect">#7D8B8F</item>
+        <item name="android:textColor">@color/dark</item>
+        <item name="android:colorEdgeEffect">@color/gray4</item>
+        <item name="colorAccent">@color/accent</item>
     </style>
 
     <style name="BootTheme" parent="AppTheme">
         <!-- set the generated bootsplash.xml drawable as activity background -->
         <item name="android:background">@drawable/bootsplash</item>
     </style>
-
 </resources>