Merge branch 'main' into marcaaron-addOnfidoSDKs

.github/actions/getMergeCommitForPullRequest/getMergeCommitForPullRequest.js

@@ -9,8 +9,8 @@ const DEFAULT_PAYLOAD = {
 };
 
 const pullRequestNumber = ActionUtils.getJSONInput('PULL_REQUEST_NUMBER', {required: false}, null);
-const user = ActionUtils.getJSONInput('USER', {required: false}, null);
-const titleRegex = ActionUtils.getJSONInput('TITLE_REGEX', {required: false}, null);
+const user = core.getInput('USER', {required: false});
+let titleRegex = core.getInput('TITLE_REGEX', {required: false});
 
 if (pullRequestNumber) {
     console.log(`Looking for pull request w/ number: ${pullRequestNumber}`);
@@ -21,6 +21,7 @@ if (user) {
 }
 
 if (titleRegex) {
+    titleRegex = new RegExp(titleRegex);
     console.log(`Looking for pull request w/ title matching: ${titleRegex.toString()}`);
 }
 
@@ -58,7 +59,10 @@ if (pullRequestNumber) {
         .then(({data}) => outputMergeCommitHash(data))
         .catch(handleUnknownError);
 } else {
-    GithubUtils.octokit.pulls.list(DEFAULT_PAYLOAD)
+    GithubUtils.octokit.pulls.list({
+        ...DEFAULT_PAYLOAD,
+        state: 'all',
+    })
         .then(({data}) => {
             const matchingPR = _.find(data, PR => PR.user.login === user && titleRegex.test(PR.title));
             outputMergeCommitHash(matchingPR);

.github/actions/getMergeCommitForPullRequest/index.js

@@ -19,8 +19,8 @@ const DEFAULT_PAYLOAD = {
 };
 
 const pullRequestNumber = ActionUtils.getJSONInput('PULL_REQUEST_NUMBER', {required: false}, null);
-const user = ActionUtils.getJSONInput('USER', {required: false}, null);
-const titleRegex = ActionUtils.getJSONInput('TITLE_REGEX', {required: false}, null);
+const user = core.getInput('USER', {required: false});
+let titleRegex = core.getInput('TITLE_REGEX', {required: false});
 
 if (pullRequestNumber) {
     console.log(`Looking for pull request w/ number: ${pullRequestNumber}`);
@@ -31,6 +31,7 @@ if (user) {
 }
 
 if (titleRegex) {
+    titleRegex = new RegExp(titleRegex);
     console.log(`Looking for pull request w/ title matching: ${titleRegex.toString()}`);
 }
 
@@ -68,7 +69,10 @@ if (pullRequestNumber) {
         .then(({data}) => outputMergeCommitHash(data))
         .catch(handleUnknownError);
 } else {
-    GithubUtils.octokit.pulls.list(DEFAULT_PAYLOAD)
+    GithubUtils.octokit.pulls.list({
+        ...DEFAULT_PAYLOAD,
+        state: 'all',
+    })
         .then(({data}) => {
             const matchingPR = _.find(data, PR => PR.user.login === user && titleRegex.test(PR.title));
             outputMergeCommitHash(matchingPR);

.github/workflows/cherryPick.yml

@@ -71,6 +71,7 @@ jobs:
 
       - name: Create branch for new pull request
         run: |
+          git config user.name ${{ github.actor }}
           git checkout -b cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}
           git push --set-upstream origin cherry-pick-staging-${{ github.event.inputs.PULL_REQUEST_NUMBER }}
 
@@ -99,9 +100,11 @@ jobs:
           USER: OSBotify
           TITLE_REGEX: Update version to ${{ env.NEW_VERSION }}
 
-      - name: Cherry-pick the merge commit to new branch
+      - name: Cherry-pick the merge commits to new branch
         id: cherryPick
-        run: git cherry-pick ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }} ${{ steps.getVersionBumpMergeCommit.MERGE_COMMIT_SHA }} --mainline 1
+        run: |
+          git fetch
+          git cherry-pick ${{ steps.getCPMergeCommit.outputs.MERGE_COMMIT_SHA }} ${{ steps.getVersionBumpMergeCommit.outputs.MERGE_COMMIT_SHA }} --mainline 1
         continue-on-error: true
 
       # If there is a merge conflict, we'll just commit what we have,

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001006100
-        versionName "1.0.61-0"
+        versionCode 1001006300
+        versionName "1.0.63-0"
     }
     splits {
         abi {

desktop/main.js

@@ -130,7 +130,6 @@ const mainWindow = (() => {
                 width: 1200,
                 height: 900,
                 webPreferences: {
-                    enableRemoteModule: true,
                     nodeIntegration: true,
                 },
                 titleBarStyle: 'hidden',
@@ -229,7 +228,7 @@ const mainWindow = (() => {
             ipcMain.on(ELECTRON_EVENTS.REQUEST_VISIBILITY, (event) => {
                 // This is how synchronous messages work in Electron
                 // eslint-disable-next-line no-param-reassign
-                event.returnValue = browserWindow.isFocused();
+                event.returnValue = browserWindow && browserWindow.isFocused();
             });
 
             // This allows the renderer process to bring the app

ios/ExpensifyCash/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.61</string>
+	<string>1.0.63</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.61.0</string>
+	<string>1.0.63.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.61</string>
+	<string>1.0.63</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.61.0</string>
+	<string>1.0.63.0</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.61-0",
+  "version": "1.0.63-0",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -133,7 +133,7 @@
     "css-loader": "^5.2.4",
     "detox": "^17.8.3",
     "diff-so-fancy": "^1.3.0",
-    "electron": "^9.2.0",
+    "electron": "^11.4.8",
     "electron-builder": "^22.8.0",
     "electron-notarize": "^1.0.0",
     "electron-reloader": "^1.2.0",

src/CONST.js

@@ -10,6 +10,7 @@ const CONST = {
         ALL: 'all',
         CHRONOS_IN_CASH: 'chronosInCash',
         IOU: 'IOU',
+        PAY_WITH_EXPENSIFY: 'payWithExpensify',
     },
     BUTTON_STATES: {
         DEFAULT: 'default',
@@ -211,6 +212,7 @@ const CONST = {
         // not be changed.
         PAYMENT_TYPE: {
             ELSEWHERE: 'Elsewhere',
+            EXPENSIFY: 'Expensify',
             PAYPAL_ME: 'PayPal.me',
             VENMO: 'Venmo',
         },

src/ONYXKEYS.js

@@ -81,6 +81,7 @@ export default {
         REPORT_ACTIONS_DRAFTS: 'reportActionsDrafts_',
         REPORT_USER_IS_TYPING: 'reportUserIsTyping_',
         REPORT_IOUS: 'reportIOUs_',
+        POLICY: 'policy_',
     },
 
     // Indicates which locale should be used

src/components/FAB/FAB.js

@@ -59,6 +59,8 @@ class FAB extends PureComponent {
 
         return (
             <AnimatedPressable
+                accessibilityLabel={this.props.accessibilityLabel}
+                accessibilityRole={this.props.accessibilityRole}
                 onPress={this.props.onPress}
                 style={[
                     styles.floatingActionButton,

src/components/GrowlNotification/GrowlNotificationContainer/GrowlNotificationContainerPropTypes.js

@@ -1,15 +1,12 @@
 import {Animated} from 'react-native';
 import PropTypes from 'prop-types';
-import {windowDimensionsPropTypes} from '../../withWindowDimensions';
 
 const propTypes = {
     /** GrowlNotification content */
     children: PropTypes.node.isRequired,
 
     /** GrowlNotification Y postion, required to show or hide with fling animation */
     translateY: PropTypes.instanceOf(Animated.Value).isRequired,
-
-    ...windowDimensionsPropTypes,
 };
 
 export default propTypes;

src/components/GrowlNotification/GrowlNotificationContainer/index.js

@@ -1,8 +1,13 @@
 import React from 'react';
 import {Animated} from 'react-native';
 import styles from '../../../styles/styles';
-import withWindowDimensions from '../../withWindowDimensions';
-import propTypes from './GrowlNotificationContainerPropTypes';
+import withWindowDimensions, {windowDimensionsPropTypes} from '../../withWindowDimensions';
+import GrowlNotificationContainerPropTypes from './GrowlNotificationContainerPropTypes';
+
+const propTypes = {
+    ...GrowlNotificationContainerPropTypes,
+    ...windowDimensionsPropTypes,
+};
 
 const GrowlNotificationContainer = ({children, translateY, isSmallScreenWidth}) => (
     <Animated.View
@@ -18,5 +23,6 @@ const GrowlNotificationContainer = ({children, translateY, isSmallScreenWidth})
 );
 
 GrowlNotificationContainer.propTypes = propTypes;
+GrowlNotificationContainer.displayName = 'GrowlNotificationContainer';
 
 export default withWindowDimensions(GrowlNotificationContainer);