add adhoc badge

.github/workflows/testBuild.yml

@@ -71,8 +71,11 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
-      - name: Add PULL_REQUEST_NUMBER to .env.staging file
-        run: echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.staging
+      - 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
 
@@ -124,8 +127,11 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
-      - name: Add PULL_REQUEST_NUMBER to .env.staging file
-        run: echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.staging
+      - 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
 
@@ -184,8 +190,11 @@ jobs:
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
           fetch-depth: 0
 
-      - name: Add PULL_REQUEST_NUMBER to .env.staging file
-        run: echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.staging
+      - 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
 
@@ -223,8 +232,11 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha || needs.getBranchRef.outputs.REF }}
 
-      - name: Add PULL_REQUEST_NUMBER to .env.staging file
-        run: echo "PULL_REQUEST_NUMBER=$PULL_REQUEST_NUMBER" >> .env.staging
+      - 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
 

config/electronBuilder.config.js

@@ -20,7 +20,7 @@ const s3Path = {
 const macIcon = {
     production: './desktop/icon.png',
     staging: './desktop/icon-stg.png',
-    internal: './desktop/icon-stg.png',
+    internal: './desktop/icon-adhoc.png',
 };
 
 const isCorrectElectronEnv = ['production', 'staging', 'internal'].includes(

config/webpack/webpack.common.js

@@ -29,6 +29,7 @@ const envToLogoSuffixMap = {
     production: '',
     staging: '-stg',
     dev: '-dev',
+    adhoc: '-adhoc',
 };
 
 function mapEnvToLogoSuffix(envFile) {

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
 

scripts/build-desktop.sh

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

src/CONST.js

@@ -691,6 +691,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/EnvironmentBadge.js

@@ -10,6 +10,7 @@ const ENVIRONMENT_SHORT_FORM = {
     [CONST.ENVIRONMENT.DEV]: 'DEV',
     [CONST.ENVIRONMENT.STAGING]: 'STG',
     [CONST.ENVIRONMENT.PRODUCTION]: 'PROD',
+    [CONST.ENVIRONMENT.ADHOC]: 'ADHOC',
 };
 
 const EnvironmentBadge = (props) => {
@@ -22,8 +23,8 @@ const EnvironmentBadge = (props) => {
 
     return (
         <Badge
-            success={props.environment === CONST.ENVIRONMENT.STAGING}
-            error={props.environment !== CONST.ENVIRONMENT.STAGING}
+            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]}
         />

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);
             },
         });

src/libs/Environment/Environment.js

@@ -8,12 +8,14 @@ const ENVIRONMENT_URLS = {
     [CONST.ENVIRONMENT.DEV]: CONST.DEV_NEW_EXPENSIFY_URL + CONFIG.DEV_PORT,
     [CONST.ENVIRONMENT.STAGING]: CONST.STAGING_NEW_EXPENSIFY_URL,
     [CONST.ENVIRONMENT.PRODUCTION]: CONST.NEW_EXPENSIFY_URL,
+    [CONST.ENVIRONMENT.ADHOC]: CONST.STAGING_NEW_EXPENSIFY_URL,
 };
 
 const OLDDOT_ENVIRONMENT_URLS = {
     [CONST.ENVIRONMENT.DEV]: CONST.INTERNAL_DEV_EXPENSIFY_URL,
     [CONST.ENVIRONMENT.STAGING]: CONST.STAGING_EXPENSIFY_URL,
     [CONST.ENVIRONMENT.PRODUCTION]: CONST.EXPENSIFY_URL,
+    [CONST.ENVIRONMENT.ADHOC]: CONST.STAGING_EXPENSIFY_URL,
 };
 
 /**
@@ -31,7 +33,7 @@ function isDevelopment() {
  * @return {boolean}
  */
 function isInternalTestBuild() {
-    return lodashGet(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV) === CONST.ENVIRONMENT.STAGING && lodashGet(Config, 'PULL_REQUEST_NUMBER', '');
+    return lodashGet(Config, 'ENVIRONMENT', CONST.ENVIRONMENT.DEV) === CONST.ENVIRONMENT.ADHOC && lodashGet(Config, 'PULL_REQUEST_NUMBER', '');
 }
 
 /**

src/libs/Environment/getEnvironment/index.native.js

@@ -25,7 +25,7 @@ function getEnvironment() {
         // If we haven't set the environment yet and we aren't on dev, check to see if this is a beta build
         betaChecker.isBetaBuild()
             .then((isBeta) => {
-                environment = isBeta || CONST.PULL_REQUEST_NUMBER ? CONST.ENVIRONMENT.STAGING : CONST.ENVIRONMENT.PRODUCTION;
+                environment = isBeta || CONST.PULL_REQUEST_NUMBER ? CONST.ENVIRONMENT.ADHOC : CONST.ENVIRONMENT.PRODUCTION;
                 resolve(environment);
             });
     });

src/pages/settings/Preferences/PreferencesPage.js

@@ -47,7 +47,7 @@ const PreferencesPage = (props) => {
     const languages = props.translate('languagePage.languages');
 
     // Enable additional test features in the staging or dev environments
-    const shouldShowTestToolMenu = _.contains([CONST.ENVIRONMENT.STAGING, CONST.ENVIRONMENT.DEV], props.environment);
+    const shouldShowTestToolMenu = _.contains([CONST.ENVIRONMENT.STAGING, CONST.ENVIRONMENT.ADHOC, CONST.ENVIRONMENT.DEV], props.environment);
 
     return (
         <ScreenWrapper includeSafeAreaPaddingBottom={false}>

src/styles/StyleUtils.js

@@ -323,10 +323,14 @@ function getBackgroundColorWithOpacityStyle(backgroundColor, opacity) {
  * @param {Boolean} success
  * @param {Boolean} error
  * @param {boolean} [isPressed=false]
+ * @param {boolean} [isAdHoc=false]
  * @return {Object}
  */
-function getBadgeColorStyle(success, error, isPressed = false) {
+function getBadgeColorStyle(success, error, isPressed = false, isAdHoc = false) {
     if (success) {
+        if (isAdHoc) {
+            return isPressed ? styles.badgeSuccessPressed : styles.badgeSuccess;
+        }
         return isPressed ? styles.badgeSuccessPressed : styles.badgeSuccess;
     }
     if (error) {

src/styles/colors.js

@@ -59,6 +59,7 @@ export default {
 
     pink200: '#FBCCFF',
     pink400: '#F68DFE',
+    pink600: '#CF4CD9',
     pink700: '#712A76',
     pink800: '#49225B',
 

src/styles/styles.js

@@ -667,6 +667,14 @@ const styles = {
         backgroundColor: themeColors.successHover,
     },
 
+    badgeAdHocSuccess: {
+        backgroundColor: themeColors.badgeAdHoc,
+    },
+
+    badgeAdHocSuccessPressed: {
+        backgroundColor: themeColors.badgeAdHocHover,
+    },
+
     badgeDanger: {
         backgroundColor: themeColors.danger,
     },

src/styles/themes/default.js

@@ -65,6 +65,8 @@ const darkTheme = {
     imageCropBackgroundColor: colors.greenIcons,
     fallbackIconColor: colors.green700,
     reactionActive: '#003C73',
+    badgeAdHoc: colors.pink600,
+    badgeAdHocHover: colors.pink700,
 };
 
 const oldTheme = {