Merge branch 'keycommand-v3' of github.com:azimgd/expensify-app into …

…keycommand-v3

.github/workflows/testBuild.yml

@@ -71,6 +71,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -121,6 +127,12 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - uses: ruby/setup-ruby@eae47962baca661befdfd24e4d6c34ade04858f7
@@ -178,6 +190,12 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
           fetch-depth: 0
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i '' 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Decrypt Developer ID Certificate
@@ -192,7 +210,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build desktop app for testing
-        run: npm run desktop-build-internal -- --publish always
+        run: npm run desktop-build-adhoc -- --publish always
         env:
           CSC_LINK: ${{ secrets.CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
@@ -214,6 +232,12 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
+      - name: Create .env.adhoc file based on staging and add PULL_REQUEST_NUMBER env to it
+        run: |
+          cp .env.staging .env.adhoc
+          sed -i 's/ENVIRONMENT=staging/ENVIRONMENT=adhoc/' .env.adhoc  
+          echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.adhoc
+
       - uses: Expensify/App/.github/actions/composite/setupNode@main
 
       - name: Configure AWS Credentials
@@ -223,7 +247,7 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
 
       - name: Build web for testing
-        run: npm run build-staging
+        run: npm run build-adhoc
 
       - name: Build docs
         run: npm run storybook-build

android/app/build.gradle

@@ -106,8 +106,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001030202
-        versionName "1.3.2-2"
+        versionCode 1001030203
+        versionName "1.3.2-3"
     }
 
     splits {

config/electronBuilder.config.js

@@ -6,24 +6,24 @@ const pullRequestNumber = process.env.PULL_REQUEST_NUMBER;
 const s3Bucket = {
     production: 'expensify-cash',
     staging: 'staging-expensify-cash',
-    internal: 'ad-hoc-expensify-cash',
+    adhoc: 'ad-hoc-expensify-cash',
 };
 
 const s3Path = {
     production: '/',
     staging: '/',
-    internal: process.env.PULL_REQUEST_NUMBER
+    adhoc: process.env.PULL_REQUEST_NUMBER
         ? `/desktop/${pullRequestNumber}/`
         : '/',
 };
 
 const macIcon = {
     production: './desktop/icon.png',
     staging: './desktop/icon-stg.png',
-    internal: './desktop/icon-stg.png',
+    adhoc: './desktop/icon-adhoc.png',
 };
 
-const isCorrectElectronEnv = ['production', 'staging', 'internal'].includes(
+const isCorrectElectronEnv = ['production', 'staging', 'adhoc'].includes(
     process.env.ELECTRON_ENV,
 );
 

config/webpack/webpack.common.js

@@ -29,6 +29,7 @@ const envToLogoSuffixMap = {
     production: '',
     staging: '-stg',
     dev: '-dev',
+    adhoc: '-adhoc',
 };
 
 function mapEnvToLogoSuffix(envFile) {
@@ -120,7 +121,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
             // React Native JavaScript environment requires the global __DEV__ variable to be accessible.
             // react-native-render-html uses variable to log exclusively during development.
             // See https://reactnative.dev/docs/javascript-environment
-            __DEV__: /staging|prod/.test(envFile) === false,
+            __DEV__: /staging|prod|adhoc/.test(envFile) === false,
         }),
 
         // This allows us to interactively inspect JS bundle contents

desktop/main.js

@@ -241,7 +241,7 @@ const mainWindow = (() => {
     if (__DEV__) {
         console.debug('CONFIG: ', CONFIG);
         app.dock.setIcon(`${__dirname}/../icon-dev.png`);
-        app.setName('New Expensify');
+        app.setName('New Expensify Dev');
     }
 
     app.on('will-finish-launching', () => {

fastlane/Fastfile

@@ -39,7 +39,7 @@ platform :android do
 
   desc "Build app for testing"
   lane :build_internal do
-    ENV["ENVFILE"]=".env.staging"
+    ENV["ENVFILE"]=".env.adhoc"
 
     gradle(
         project_dir: './android',
@@ -118,7 +118,7 @@ platform :ios do
   desc "Build app for testing"
   lane :build_internal do
     require 'securerandom'
-    ENV["ENVFILE"]=".env.staging"
+    ENV["ENVFILE"]=".env.adhoc"
 
     keychain_password = SecureRandom.uuid
 

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.2.2</string>
+	<string>1.3.2.3</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.2.2</string>
+	<string>1.3.2.3</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.3.2-2",
+  "version": "1.3.2-3",
   "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.",
@@ -19,10 +19,11 @@
     "web-server": "webpack-dev-server --open --config config/webpack/webpack.dev.js",
     "build": "webpack --config config/webpack/webpack.common.js --env envFile=.env.production",
     "build-staging": "webpack --config config/webpack/webpack.common.js --env envFile=.env.staging",
+    "build-adhoc": "webpack --config config/webpack/webpack.common.js --env envFile=.env.adhoc",
     "desktop": "scripts/set-pusher-suffix.sh && node desktop/start.js",
     "desktop-build": "scripts/build-desktop.sh production",
     "desktop-build-staging": "scripts/build-desktop.sh staging",
-    "desktop-build-internal": "scripts/build-desktop.sh internal",
+    "desktop-build-adhoc": "scripts/build-desktop.sh adhoc",
     "ios-build": "fastlane ios build",
     "android-build": "fastlane android build",
     "android-build-e2e": "bundle exec fastlane android build_e2e",

scripts/build-desktop.sh

@@ -5,8 +5,8 @@ export ELECTRON_ENV=${1:-development}
 
 if [[ "$ELECTRON_ENV" == "staging" ]]; then
   ENV_FILE=".env.staging"
-elif [[ "$ELECTRON_ENV" == "internal" ]]; then
-  ENV_FILE=".env.staging"
+elif [[ "$ELECTRON_ENV" == "adhoc" ]]; then
+  ENV_FILE=".env.adhoc"
 elif [[ "$ELECTRON_ENV" == "production" ]]; then
   ENV_FILE=".env.production"
 else

src/CONST.js

@@ -12,6 +12,7 @@ const PLATFORM_IOS = 'iOS';
 const ANDROID_PACKAGE_NAME = 'com.expensify.chat';
 const USA_COUNTRY_NAME = 'United States';
 const CURRENT_YEAR = new Date().getFullYear();
+const PULL_REQUEST_NUMBER = lodashGet(Config, 'PULL_REQUEST_NUMBER', '');
 
 const keyModifierControl = lodashGet(KeyCommand, 'constants.keyModifierControl', 'keyModifierControl');
 const keyModifierCommand = lodashGet(KeyCommand, 'constants.keyModifierCommand', 'keyModifierCommand');
@@ -66,6 +67,8 @@ const CONST = {
         RESERVED_FIRST_NAMES: ['Expensify', 'Concierge'],
     },
 
+    PULL_REQUEST_NUMBER,
+
     CALENDAR_PICKER: {
         // Numbers were arbitrarily picked.
         MIN_YEAR: CURRENT_YEAR - 100,
@@ -358,6 +361,7 @@ const CONST = {
     PDF_VIEWER_URL: '/pdf/web/viewer.html',
     CLOUDFRONT_DOMAIN_REGEX: /^https:\/\/\w+\.cloudfront\.net/i,
     EXPENSIFY_ICON_URL: `${CLOUDFRONT_URL}/images/favicon-2019.png`,
+    CONCIERGE_ICON_URL: `${CLOUDFRONT_URL}/images/icons/concierge_2022.png`,
     UPWORK_URL: 'https://github.com/Expensify/App/issues?q=is%3Aopen+is%3Aissue+label%3A%22Help+Wanted%22',
     GITHUB_URL: 'https://github.com/Expensify/App',
     TERMS_URL: `${USE_EXPENSIFY_URL}/terms`,
@@ -750,6 +754,7 @@ const CONST = {
         DEV: 'development',
         STAGING: 'staging',
         PRODUCTION: 'production',
+        ADHOC: 'adhoc',
     },
 
     // Used to delay the initial fetching of reportActions when the app first inits or reconnects (e.g. returning

src/components/Badge.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
 import Text from './Text';
+import CONST from '../CONST';
 
 const propTypes = {
     /** Is Success type */
@@ -18,6 +19,9 @@ const propTypes = {
     /** Text to display in the Badge */
     text: PropTypes.string.isRequired,
 
+    /** Text to display in the Badge */
+    environment: PropTypes.string,
+
     /** Styles for Badge */
     // eslint-disable-next-line react/forbid-prop-types
     badgeStyles: PropTypes.arrayOf(PropTypes.object),
@@ -32,6 +36,7 @@ const defaultProps = {
     pressable: false,
     badgeStyles: [],
     onPress: undefined,
+    environment: CONST.ENVIRONMENT.DEV,
 };
 
 const Badge = (props) => {
@@ -40,7 +45,7 @@ const Badge = (props) => {
     const wrapperStyles = ({pressed}) => ([
         styles.badge,
         styles.ml2,
-        StyleUtils.getBadgeColorStyle(props.success, props.error, pressed),
+        StyleUtils.getBadgeColorStyle(props.success, props.error, pressed, props.environment === CONST.ENVIRONMENT.ADHOC),
         ...props.badgeStyles,
     ]);
 

src/components/EnvironmentBadge.js

@@ -3,11 +3,14 @@ import CONST from '../CONST';
 import withEnvironment, {environmentPropTypes} from './withEnvironment';
 import Badge from './Badge';
 import styles from '../styles/styles';
+import * as Environment from '../libs/Environment/Environment';
+import pkg from '../../package.json';
 
 const ENVIRONMENT_SHORT_FORM = {
     [CONST.ENVIRONMENT.DEV]: 'DEV',
     [CONST.ENVIRONMENT.STAGING]: 'STG',
     [CONST.ENVIRONMENT.PRODUCTION]: 'PROD',
+    [CONST.ENVIRONMENT.ADHOC]: 'ADHOC',
 };
 
 const EnvironmentBadge = (props) => {
@@ -16,12 +19,15 @@ const EnvironmentBadge = (props) => {
         return null;
     }
 
+    const text = Environment.isInternalTestBuild() ? `v${pkg.version} PR:${CONST.PULL_REQUEST_NUMBER}` : ENVIRONMENT_SHORT_FORM[props.environment];
+
     return (
         <Badge
-            success={props.environment === CONST.ENVIRONMENT.STAGING}
-            error={props.environment !== CONST.ENVIRONMENT.STAGING}
-            text={ENVIRONMENT_SHORT_FORM[props.environment]}
+            success={props.environment === CONST.ENVIRONMENT.STAGING || props.environment === CONST.ENVIRONMENT.ADHOC}
+            error={props.environment !== CONST.ENVIRONMENT.STAGING && props.environment !== CONST.ENVIRONMENT.ADHOC}
+            text={text}
             badgeStyles={[styles.alignSelfCenter]}
+            environment={props.environment}
         />
     );
 };

src/components/ExpensifyCashLogo.js

@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import ProductionLogo from '../../assets/images/new-expensify.svg';
 import DevLogo from '../../assets/images/new-expensify-dev.svg';
 import StagingLogo from '../../assets/images/new-expensify-stg.svg';
+import AdhocLogo from '../../assets/images/new-expensify-adhoc.svg';
 import CONST from '../CONST';
 import withEnvironment, {environmentPropTypes} from './withEnvironment';
 
@@ -20,6 +21,7 @@ const logoComponents = {
     [CONST.ENVIRONMENT.DEV]: DevLogo,
     [CONST.ENVIRONMENT.STAGING]: StagingLogo,
     [CONST.ENVIRONMENT.PRODUCTION]: ProductionLogo,
+    [CONST.ENVIRONMENT.ADHOC]: AdhocLogo,
 };
 
 const ExpensifyCashLogo = (props) => {

src/libs/ApiUtils.js

@@ -24,7 +24,7 @@ Environment.getEnvironment()
                     return;
                 }
 
-                const defaultToggleState = ENV_NAME === CONST.ENVIRONMENT.STAGING;
+                const defaultToggleState = ENV_NAME === CONST.ENVIRONMENT.STAGING || ENV_NAME === CONST.ENVIRONMENT.ADHOC;
                 shouldUseStagingServer = lodashGet(val, 'shouldUseStagingServer', defaultToggleState);
             },
         });