Update version to 1.0.89-0 on staging

.github/actions/checkDeployBlockers/checkDeployBlockers.js

@@ -49,7 +49,7 @@ const run = function () {
 
             console.log('Verifying that the last comment is the :shipit: seal of approval');
             const lastComment = comments.data.pop();
-            const shipItRegex = /:shipit:/g;
+            const shipItRegex = /^:shipit:/g;
             if (_.isNull(shipItRegex.exec(lastComment.body))) {
                 console.log('The last comment on the issue was not :shipit');
                 core.setOutput('HAS_DEPLOY_BLOCKERS', true);

.github/actions/checkDeployBlockers/index.js

@@ -59,7 +59,7 @@ const run = function () {
 
             console.log('Verifying that the last comment is the :shipit: seal of approval');
             const lastComment = comments.data.pop();
-            const shipItRegex = /:shipit:/g;
+            const shipItRegex = /^:shipit:/g;
             if (_.isNull(shipItRegex.exec(lastComment.body))) {
                 console.log('The last comment on the issue was not :shipit');
                 core.setOutput('HAS_DEPLOY_BLOCKERS', true);

.github/workflows/README.md

@@ -1,5 +1,42 @@
 # [New Expensify](https://new.expensify.com) GitHub Workflows
 
+## Important tip for creating GitHub Workflows
+All inputs and outputs to GitHub Actions and any data passed between jobs or workflows is JSON-encoded (AKA, strings). Keep this in mind whenever writing GitHub workflows – you may need to JSON-decode variables to access them accurately. Here's an example of a common way to misuse GitHub Actions data:
+
+```yaml
+name: CI
+on: pull_request
+jobs:
+  validate:
+    runs-on: ubuntu-latest
+    steps:
+      - id: myTrueAction
+        uses: Expensify/my-action-outputs-true@main
+
+      - id: myFalseAction
+        uses: Expensify/my-action-outputs-false@main
+
+      # This correctly outputs `true`, but it's a string
+      - run: echo ${{ steps.myTrueAction.outputs.isTrue }}
+
+      # This correctly outputs `false`, but it's a string
+      - run: echo ${{ steps.myFalseAction.outputs.isFalse }}
+
+      # This correctly outputs `true`, and it's a boolean
+      - run: echo ${{ true == true }}
+
+      # This correctly outputs `false`, and it's a boolean.
+      - run: echo ${{ true == false }}
+
+      # Watch out! This seems like it should be true, but it's false!
+      # What we have here is `'false' || true`, and since the first half is a string the expression resolves to 'false'
+      - run: echo ${{ steps.myFalseAction.outputs.isFalse || github.actor == 'roryabraham' }}
+```
+
+We've found that the best way to avoid this pitfall is to always wrap any reference to the output of an action in a call to `fromJSON`. This should force it to resolve to the expected type.
+
+**Note:** Action inputs and outputs aren't the only thing that's JSON-encoded! Any data passed between jobs via a `needs` parameter is also JSON-encoded!
+
 ## Security Rules 🔐
 1. Do **not** use `pull_request_target` trigger unless an external fork needs access to secrets, or a _write_ `GITHUB_TOKEN`.
 1. Do **not ever** write a `pull_request_target` trigger with an explicit PR checkout, e.g. using `actions/checkout@v2`. This is [discussed further here](https://securitylab.github.com/research/github-actions-preventing-pwn-requests)
@@ -94,3 +131,5 @@ There are several reasons why we created these "imperative workflows" or "subrou
 1. It greatly simplifies the handling of race conditions, particularly when used in combination with the [`softprops/turnstyle` action](https://github.com/softprops/turnstyle).
 1. It promotes code reuse. A common set of yaml steps defined in a workflow can be extracted into an imperative workflow which can be executed from other workflows in just a few lines.
 1. If a workflow is defined to execute in response to the `workflow_dispatch` event, it can be manually started by an authorized actor in the GitHub UI.
+
+#### Dummy change - delete me

.github/workflows/cherryPick.yml

@@ -15,7 +15,7 @@ jobs:
   validateActor:
     runs-on: ubuntu-latest
     outputs:
-      IS_DEPLOYER: ${{ steps.isUserDeployer.outputs.isTeamMember || github.actor == 'OSBotify' }}
+      IS_DEPLOYER: ${{ fromJSON(steps.isUserDeployer.outputs.isTeamMember) || github.actor == 'OSBotify' }}
     steps:
       - id: isUserDeployer
         uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872
@@ -27,7 +27,7 @@ jobs:
   createNewVersion:
     needs: validateActor
     runs-on: ubuntu-latest
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER && github.event.inputs.NEW_VERSION == '' }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' && github.event.inputs.NEW_VERSION == '' }}
     outputs:
       NEW_VERSION: ${{ steps.getNewVersion.outputs.NEW_VERSION }}
     steps:
@@ -59,7 +59,7 @@ jobs:
 
   cherryPick:
     needs: [validateActor, createNewVersion]
-    if: ${{ always() && needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ always() && needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: ubuntu-latest
     steps:
       # Version: 2.3.4

.github/workflows/finishReleaseCycle.yml

@@ -11,7 +11,7 @@ jobs:
     if: contains(github.event.issue.labels.*.name, 'StagingDeployCash')
 
     outputs:
-      isValid: ${{ steps.validateActor.outputs.isTeamMember && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'false' }}
+      isValid: ${{ fromJSON(steps.validateActor.outputs.isTeamMember) && !fromJSON(steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS) }}
 
     steps:
       - name: Validate actor is deployer
@@ -23,7 +23,7 @@ jobs:
           team: mobile-deployers
 
       - name: Reopen and comment on issue
-        if: ${{ !steps.validateActor.outputs.isTeamMember }}
+        if: ${{ steps.validateActor.outputs.isTeamMember == 'false' }}
         uses: Expensify/App/.github/actions/reopenIssueWithComment@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -33,15 +33,15 @@ jobs:
             Reopening!
 
       - name: Check for any deploy blockers
-        if: ${{ steps.validateActor.outputs.isTeamMember }}
+        if: ${{ steps.validateActor.outputs.isTeamMember == 'true' }}
         id: checkDeployBlockers
         uses: Expensify/App/.github/actions/checkDeployBlockers@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
           ISSUE_NUMBER: ${{ github.event.issue.number }}
 
       - name: Reopen and comment on issue
-        if: ${{ steps.validateActor.outputs.isTeamMember && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'true' }}
+        if: ${{ steps.validateActor.outputs.isTeamMember == 'true' && steps.checkDeployBlockers.outputs.HAS_DEPLOY_BLOCKERS == 'true' }}
         uses: Expensify/App/.github/actions/reopenIssueWithComment@main
         with:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
@@ -54,7 +54,7 @@ jobs:
   updateProduction:
     runs-on: ubuntu-latest
     needs: validate
-    if: ${{ needs.validate.outputs.isValid }}
+    if: ${{ needs.validate.outputs.isValid == 'true' }}
     steps:
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
         with:
@@ -72,7 +72,7 @@ jobs:
   createNewStagingDeployCash:
     runs-on: macos-11
     needs: validate
-    if: ${{ needs.validate.outputs.isValid }}
+    if: ${{ needs.validate.outputs.isValid == 'true' }}
     steps:
       # Version: 2.3.4
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

.github/workflows/platformDeploy.yml

@@ -28,7 +28,7 @@ jobs:
   android:
     name: Build and deploy Android
     needs: validateActor
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -92,7 +92,7 @@ jobs:
   desktop:
     name: Build and deploy Desktop
     needs: validateActor
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
@@ -148,7 +148,7 @@ jobs:
   iOS:
     name: Build and deploy iOS
     needs: validateActor
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
@@ -232,7 +232,7 @@ jobs:
   web:
     name: Build and deploy Web
     needs: validateActor
-    if: ${{ needs.validateActor.outputs.IS_DEPLOYER }}
+    if: ${{ needs.validateActor.outputs.IS_DEPLOYER == 'true' }}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001008807
-        versionName "1.0.88-7"
+        versionCode 1001008900
+        versionName "1.0.89-0"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.88</string>
+	<string>1.0.89</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.88.7</string>
+	<string>1.0.89.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.88</string>
+	<string>1.0.89</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.88.7</string>
+	<string>1.0.89.0</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.0.88-7",
+  "version": "1.0.89-0",
   "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.",

src/ONYXKEYS.js

@@ -119,4 +119,7 @@ export default {
 
     // Stores information about the active reimbursement account being set up
     REIMBURSEMENT_ACCOUNT: 'reimbursementAccount',
+
+    // Stores Workspace ID that will be tied to reimbursement account during setup
+    REIMBURSEMENT_ACCOUNT_WORKSPACE_ID: 'reimbursementAccountWorkspaceID',
 };

src/libs/DateUtils.js

@@ -8,19 +8,13 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
 import {translate} from './translate';
+import * as PersonalDetails from './actions/PersonalDetails';
 
 let timezone;
 Onyx.connect({
     key: ONYXKEYS.MY_PERSONAL_DETAILS,
     callback: (val) => {
-        timezone = val ? val.timezone : CONST.DEFAULT_TIME_ZONE.selected;
-
-        // Make sure that if we have a timezone in object format that we're getting the selected timezone name
-        // Older timezone formats only include the timezone name, but the newer format also included whether or
-        // not the timezone was selected automatically
-        if (_.isObject(timezone)) {
-            timezone = val.timezone.selected;
-        }
+        timezone = val ? val.timezone : CONST.DEFAULT_TIME_ZONE;
     },
 });
 
@@ -37,7 +31,7 @@ Onyx.connect({
  */
 function getLocalMomentFromTimestamp(locale, timestamp) {
     moment.locale(locale);
-    return moment.unix(timestamp).tz(timezone);
+    return moment.unix(timestamp).tz(timezone.selected);
 }
 
 /**
@@ -115,13 +109,31 @@ function startCurrentDateUpdater() {
     });
 }
 
+/*
+ * Updates user's timezone, if their timezone is set to automatic and
+ * is different from current timezone
+ */
+function updateTimezone() {
+    const currentTimezone = moment.tz.guess(true);
+    if (timezone.automatic && timezone.selected !== currentTimezone) {
+        PersonalDetails.setPersonalDetails({timezone: {...timezone, selected: currentTimezone}});
+    }
+}
+
+/*
+ * Returns a version of updateTimezone function throttled by 5 minutes
+ */
+const throttledUpdateTimezone = _.throttle(() => updateTimezone(), 1000 * 60 * 5);
+
 /**
  * @namespace DateUtils
  */
 const DateUtils = {
     timestampToRelative,
     timestampToDateTime,
     startCurrentDateUpdater,
+    updateTimezone,
+    throttledUpdateTimezone,
 };
 
 export default DateUtils;

src/libs/actions/BankAccounts.js

@@ -30,6 +30,14 @@ Onyx.connect({
     },
 });
 
+let reimbursementAccountWorkspaceID = null;
+Onyx.connect({
+    key: ONYXKEYS.REIMBURSEMENT_ACCOUNT_WORKSPACE_ID,
+    callback: (val) => {
+        reimbursementAccountWorkspaceID = val;
+    },
+});
+
 /**
  * Gets the Plaid Link token used to initialize the Plaid SDK
  */
@@ -409,7 +417,7 @@ function fetchFreePlanVerifiedBankAccount(stepToOpen) {
                     let currentStep = reimbursementAccountInSetup.currentStep;
                     const achData = bankAccount ? bankAccount.toACHData() : {};
                     achData.useOnfido = true;
-                    achData.policyID = '';
+                    achData.policyID = reimbursementAccountWorkspaceID || '';
                     achData.isInSetup = !bankAccount || bankAccount.isInSetup();
                     achData.bankAccountInReview = bankAccount && bankAccount.isVerifying();
                     achData.domainLimit = 0;
@@ -803,6 +811,10 @@ function hideBankAccountErrors() {
     Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {error: '', existingOwnersList: ''});
 }
 
+function setWorkspaceIDForReimbursementAccount(workspaceID) {
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT_WORKSPACE_ID, workspaceID);
+}
+
 export {
     activateWallet,
     addPersonalBankAccount,
@@ -817,4 +829,5 @@ export {
     validateBankAccount,
     hideBankAccountErrors,
     showBankAccountFormValidationError,
+    setWorkspaceIDForReimbursementAccount,
 };

src/pages/home/ReportScreen.js

@@ -99,11 +99,12 @@ class ReportScreen extends React.Component {
     }
 
     componentDidUpdate(prevProps) {
-        const reportChanged = this.props.route.params.reportID !== prevProps.route.params.reportID;
-        if (reportChanged) {
-            this.prepareTransition();
-            this.storeCurrentlyViewedReport();
+        if (this.props.route.params.reportID === prevProps.route.params.reportID) {
+            return;
         }
+
+        this.prepareTransition();
+        this.storeCurrentlyViewedReport();
     }
 
     componentWillUnmount() {