From a416dd8449ac02bc015508ecdbed48205d4f25bb Mon Sep 17 00:00:00 2001 From: OSBotify <76178356+OSBotify@users.noreply.github.com> Date: Thu, 4 May 2023 09:48:54 -0400 Subject: [PATCH 1/2] Merge pull request #18404 from Expensify/version-BUILD-B4B8A588-F597-42B0-943B-A1BA9A4958EC Update version to 1.3.9-20 on main (cherry picked from commit 7dd86efc25d4c9c0f72563bf5e8eece353ab3e16) --- android/app/build.gradle | 4 ++-- ios/NewExpensify/Info.plist | 2 +- ios/NewExpensifyTests/Info.plist | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 315a85ed7c90..a5f712b8c235 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -106,8 +106,8 @@ android { minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion multiDexEnabled rootProject.ext.multiDexEnabled - versionCode 1001030919 - versionName "1.3.9-19" + versionCode 1001030920 + versionName "1.3.9-20" } splits { diff --git a/ios/NewExpensify/Info.plist b/ios/NewExpensify/Info.plist index 2ac2fe6808cb..86cdffc82caa 100644 --- a/ios/NewExpensify/Info.plist +++ b/ios/NewExpensify/Info.plist @@ -30,7 +30,7 @@ CFBundleVersion - 1.3.9.19 + 1.3.9.20 ITSAppUsesNonExemptEncryption LSApplicationQueriesSchemes diff --git a/ios/NewExpensifyTests/Info.plist b/ios/NewExpensifyTests/Info.plist index e9524b5aa83d..a5c0eb351dc5 100644 --- a/ios/NewExpensifyTests/Info.plist +++ b/ios/NewExpensifyTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 1.3.9.19 + 1.3.9.20 diff --git a/package-lock.json b/package-lock.json index 981d2e6a1d20..97bdfc00075c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "new.expensify", - "version": "1.3.9-19", + "version": "1.3.9-20", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "new.expensify", - "version": "1.3.9-19", + "version": "1.3.9-20", "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 3c955d274bd2..a068e645914e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "new.expensify", - "version": "1.3.9-19", + "version": "1.3.9-20", "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.", From 3b016361352c14e99c23097fe627cba984e50bfb Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Thu, 4 May 2023 15:40:23 +0200 Subject: [PATCH 2/2] Merge pull request #18395 from abdulrahuman5196/InviteFollowup Followup fixes on invite message page implementation (cherry picked from commit 81a0609e1d6135d770540805a323643690bfadc1) --- .../workspace/WorkspaceInviteMessagePage.js | 9 +++++++- src/pages/workspace/WorkspaceInvitePage.js | 21 ++++++++----------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/pages/workspace/WorkspaceInviteMessagePage.js b/src/pages/workspace/WorkspaceInviteMessagePage.js index f91da6c12a8d..349aa0d8a195 100644 --- a/src/pages/workspace/WorkspaceInviteMessagePage.js +++ b/src/pages/workspace/WorkspaceInviteMessagePage.js @@ -42,6 +42,9 @@ const propTypes = { /** All of the personal details for everyone */ personalDetails: PropTypes.objectOf(personalDetailsPropTypes), + /** Beta features list */ + betas: PropTypes.arrayOf(PropTypes.string), + invitedMembersDraft: PropTypes.arrayOf(PropTypes.string), /** URL Route params */ @@ -60,6 +63,7 @@ const propTypes = { const defaultProps = { ...policyDefaultProps, personalDetails: {}, + betas: [], invitedMembersDraft: [], }; @@ -109,7 +113,7 @@ class WorkspaceInviteMessagePage extends React.Component { } sendInvitation() { - Policy.addMembersToWorkspace(this.props.invitedMembersDraft, this.state.welcomeNote || this.getWelcomeNote(), this.props.route.params.policyID); + Policy.addMembersToWorkspace(this.props.invitedMembersDraft, this.state.welcomeNote || this.getWelcomeNote(), this.props.route.params.policyID, this.props.betas); Policy.setWorkspaceInviteMembersDraft(this.props.route.params.policyID, []); Navigation.navigate(ROUTES.getWorkspaceMembersRoute(this.props.route.params.policyID)); } @@ -221,6 +225,9 @@ export default compose( personalDetails: { key: ONYXKEYS.PERSONAL_DETAILS, }, + betas: { + key: ONYXKEYS.BETAS, + }, invitedMembersDraft: { key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${route.params.policyID.toString()}`, }, diff --git a/src/pages/workspace/WorkspaceInvitePage.js b/src/pages/workspace/WorkspaceInvitePage.js index 8aff82ffb281..8881c8bf2ca2 100644 --- a/src/pages/workspace/WorkspaceInvitePage.js +++ b/src/pages/workspace/WorkspaceInvitePage.js @@ -89,7 +89,6 @@ class WorkspaceInvitePage extends React.Component { personalDetails, selectedOptions: [], userToInvite, - shouldDisableButton: false, }; } @@ -247,16 +246,14 @@ class WorkspaceInvitePage extends React.Component { return; } - this.setState({shouldDisableButton: true}, () => { - const logins = _.map(this.state.selectedOptions, option => option.login); - const filteredLogins = _.chain(logins) - .map(login => login.toLowerCase().trim()) - .compact() - .uniq() - .value(); - Policy.setWorkspaceInviteMembersDraft(this.props.route.params.policyID, filteredLogins); - Navigation.navigate(ROUTES.getWorkspaceInviteMessageRoute(this.props.route.params.policyID)); - }); + const logins = _.map(this.state.selectedOptions, option => option.login); + const filteredLogins = _.chain(logins) + .map(login => login.toLowerCase().trim()) + .compact() + .uniq() + .value(); + Policy.setWorkspaceInviteMembersDraft(this.props.route.params.policyID, filteredLogins); + Navigation.navigate(ROUTES.getWorkspaceInviteMessageRoute(this.props.route.params.policyID)); } /** @@ -321,7 +318,7 @@ class WorkspaceInvitePage extends React.Component {