fix conflicts

.env.example

@@ -1,10 +1,8 @@
-/**
- * Rename this file to `.env` and put your local config in here
- */
-EXPENSIFY_URL_COM=https://www.expensify.com.dev/
 EXPENSIFY_URL_CASH=https://expensify.cash/
-EXPENSIFY_PARTNER_NAME=android
-EXPENSIFY_PARTNER_PASSWORD=c3a9ac418ea3f152aae2
+EXPENSIFY_URL_SECURE=https://secure.expensify.com.dev/
+EXPENSIFY_URL_COM=https://www.expensify.com.dev/
+EXPENSIFY_PARTNER_NAME=chat-expensify-com
+EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=ac6d22b891daae55283a
 NGROK_URL=https://expensify-user.ngrok.io/
 USE_NGROK=false

.env.production

@@ -1,6 +1,8 @@
 EXPENSIFY_URL_CASH=https://expensify.cash/
+EXPENSIFY_URL_SECURE=https://secure.expensify.com/
 EXPENSIFY_URL_COM=https://www.expensify.com/
 EXPENSIFY_PARTNER_NAME=chat-expensify-com
 EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
+ENVIRONMENT=PROD

.env.staging

@@ -0,0 +1,8 @@
+EXPENSIFY_URL_CASH=https://staging.expensify.cash/
+EXPENSIFY_URL_SECURE=https://staging-secure.expensify.com/
+EXPENSIFY_URL_COM=https://www.expensify.com/
+EXPENSIFY_PARTNER_NAME=chat-expensify-com
+EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
+PUSHER_APP_KEY=268df511a204fbb60884
+USE_WEB_PROXY=false
+ENVIRONMENT=STG

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
     extends: 'expensify',
     parser: 'babel-eslint',
-    ignorePatterns: ['src/vendor', '!.github/actions/*.js'],
+    ignorePatterns: ['!.*', 'src/vendor', '.github/actions/**/index.js'],
     rules: {
         'react/jsx-filename-extension': [1, {extensions: ['.js']}],
         'comma-dangle': ['error', 'always-multiline'],

.github/.eslintrc.js

@@ -0,0 +1,6 @@
+// For all these Node.js scripts, we do not want to disable `console` statements
+module.exports = {
+    rules: {
+        'no-console': 'off',
+    },
+};

.github/ISSUE_TEMPLATE.md

@@ -1,15 +1,36 @@
-If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/master/CONTRIBUTING.md) for onboarding!
+---
+name: Standard issue template
+about: A standard template to follow when creating an issue in this repository
+labels: AutoAssignerTriage
+---
+
+If you haven’t already, check out our [contributing guidelines](https://github.com/Expensify/ReactNativeChat/blob/main/CONTRIBUTING.md) for onboarding and email [email protected] to request to join our Slack channel!
 ___
 
-**Platform - version:**  
+## Expected Result:
+Describe what you think should've happened
+
+## Actual Result:
+Describe what actually happened
+
+## Action Performed:
+Break down in numbered steps
 
-**Action Performed (reproducible steps):**
+## Workaround:
+Can the user still use Expensify without this being fixed? Have you informed them of the workaround?
 
-**Expected Result:**
+## Platform:
+Where is this issue occurring?
 
-**Actual Result:**
+ Web
+ iOS
+ Android
+ Desktop App
+ Mobile Web
 
-**Notes/Photos/Videos:** 
-
-**Logs - JS/Android/iOS (if applicable)**:
+**Version Number:**
+**Logs:** https://stackoverflow.com/c/expensify/questions/4856
+**Notes/Photos/Videos:** Any additional supporting documentation
+**Expensify/Expensify Issue URL:**
 
+[View all open jobs on Upwork](https://www.upwork.com/ab/jobs/search/?q=Expensify%20React%20Native&sort=recency&user_location_match=2)

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,17 +1,29 @@
-<If necessary, assign reviewers that know the area or changes well. Feel free to tag any additional reviewers you see fit.>
+<!-- If necessary, assign reviewers that know the area or changes well. Feel free to tag any additional reviewers you see fit. -->
 
 ### Details
-<Explanation of the change or anything fishy that is going on>
+<!-- Explanation of the change or anything fishy that is going on -->
 
 ### Fixed Issues
-<Please replace GH_LINK with the link to the GitHub issue this Pull Request is fixing>
+<!-- Please replace GH_LINK with the link to the GitHub issue this Pull Request is fixing -->
 Fixes GH_LINK
 
 ### 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.
 Add any additional test steps if test steps are unique to a particular platform.
-Manual test steps should be written so that your reviewer can repeat and verify one or more expected outcomes.
+Manual test steps should be written so that your reviewer can repeat and verify one or more expected outcomes in the development environment.
+
+For example:
+1. Click on the text input to bring it into focus
+2. Upload an image via copy paste
+3. Verify a modal appears displaying a preview of that image 
+--->
+
+### QA Steps
+<!--- 
+Add a numbered list of manual tests that can be performed by our QA engineers on the staging environment to validate that your changes work on all platforms, and that there are no regressions present.
+Add any additional QA steps if test steps are unique to a particular platform.
+Manual test steps should be written so that the QA engineer can repeat and verify one or more expected outcomes in the staging environment.
 
 For example:
 1. Click on the text input to bring it into focus

.github/SECURITY.md

@@ -1 +1 @@
-If you've found a vulnerability, please email [email protected] with the subject `Vulnerability Report` instead of creating an issue.
+If you've found a vulnerability, please email [email protected] with the subject `Vulnerability Report`, instead of creating an issue.

.github/actions/bumpVersion/action.yml

@@ -0,0 +1,15 @@
+name: 'Bump npm version'
+description: 'Increase the application version (JS and native), based on git tags'
+inputs:
+    GITHUB_TOKEN:
+        description: Auth token for Expensify.cash Github
+        required: true
+    SEMVER_LEVEL:
+        description: Semantic Versioning Level
+        required: true
+outputs:
+    NEW_VERSION:
+        description: The new semver version of the application, updated in the JS and native layers.
+runs:
+    using: 'node12'
+    main: './index.js'

.github/actions/bumpVersion/bumpVersion.js

@@ -0,0 +1,70 @@
+const {promisify} = require('util');
+const fs = require('fs');
+const exec = promisify(require('child_process').exec);
+const _ = require('underscore');
+const core = require('@actions/core');
+const versionUpdater = require('../../libs/versionUpdater');
+const {updateAndroidVersion, updateiOSVersion, generateAndroidVersionCode} = require('../../libs/nativeVersionUpdater');
+
+/**
+ * Update the native app versions.
+ *
+ * @param {String} version
+ */
+function updateNativeVersions(version) {
+    console.log(`Updating native versions to ${version}`);
+
+    // Update Android
+    const androidVersionCode = generateAndroidVersionCode(version);
+    updateAndroidVersion(version, androidVersionCode)
+        .then(() => {
+            console.log('Successfully updated Android!');
+        })
+        .catch((err) => {
+            console.error('Error updating Android');
+            core.setFailed(err);
+        });
+
+    // Update iOS
+    try {
+        const cfBundleVersion = updateiOSVersion(version);
+        if (_.isString(cfBundleVersion) && cfBundleVersion.split('.').length === 4) {
+            core.setOutput('NEW_IOS_VERSION', cfBundleVersion);
+            console.log('Successfully updated iOS!');
+        } else {
+            core.setFailed(`Failed to set NEW_IOS_VERSION. CFBundleVersion: ${cfBundleVersion}`);
+        }
+    } catch (err) {
+        console.error('Error updating iOS');
+        core.setFailed(err);
+    }
+}
+
+let semanticVersionLevel = core.getInput('SEMVER_LEVEL', {require: true});
+if (!semanticVersionLevel || !_.contains(versionUpdater.SEMANTIC_VERSION_LEVELS, semanticVersionLevel)) {
+    console.log(
+        `Invalid input for 'SEMVER_LEVEL': ${semanticVersionLevel}`,
+        `Defaulting to: ${versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD}`,
+    );
+    semanticVersionLevel = versionUpdater.SEMANTIC_VERSION_LEVELS.BUILD;
+}
+
+const {version: previousVersion} = JSON.parse(fs.readFileSync('./package.json'));
+const newVersion = versionUpdater.incrementVersion(previousVersion, semanticVersionLevel);
+console.log(`Previous version: ${previousVersion}`, `New version: ${newVersion}`);
+
+updateNativeVersions(newVersion);
+
+console.log(`Setting npm version to ${newVersion}`);
+exec(`npm --no-git-tag-version version ${newVersion} -m "Update version to ${newVersion}"`)
+    .then(({stdout}) => {
+        // NPM and native versions successfully updated, output new version
+        console.log(stdout);
+        core.setOutput('NEW_VERSION', newVersion);
+    })
+    .catch(({stdout, stderr}) => {
+        // Log errors and retry
+        console.log(stdout);
+        console.error(stderr);
+        core.setFailed('An error occurred in the `npm version` command');
+    });