Fix/30992: Workspace invitation message still preserved

src/ONYXKEYS.ts

@@ -246,6 +246,7 @@ const ONYXKEYS = {
         POLICY_TAGS: 'policyTags_',
         POLICY_RECENTLY_USED_TAGS: 'policyRecentlyUsedTags_',
         WORKSPACE_INVITE_MEMBERS_DRAFT: 'workspaceInviteMembersDraft_',
+        WORKSPACE_INVITE_MESSAGE_DRAFT: 'workspaceInviteMessageDraft_',
         REPORT: 'report_',
         // REPORT_METADATA is a perf optimization used to hold loading states (isLoadingInitialReportActions, isLoadingOlderReportActions, isLoadingNewerReportActions).
         // A lot of components are connected to the Report entity and do not care about the actions. Setting the loading state

src/libs/actions/Policy.js

@@ -1426,6 +1426,14 @@ function setWorkspaceInviteMembersDraft(policyID, invitedEmailsToAccountIDs) {
     Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${policyID}`, invitedEmailsToAccountIDs);
 }
 
+/**
+ * @param {String} policyID
+ * @param {String} message
+ */
+function setWorkspaceInviteMessageDraft(policyID, message) {
+    Onyx.set(`${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT}${policyID}`, message);
+}
+
 /**
  * @param {String} policyID
  */
@@ -1490,4 +1498,5 @@ export {
     openDraftWorkspaceRequest,
     buildOptimisticPolicyRecentlyUsedCategories,
     createDraftInitialWorkspace,
+    setWorkspaceInviteMessageDraft,
 };

src/pages/workspace/WorkspaceInviteMessagePage.js

@@ -1,3 +1,4 @@
+import {isEmpty} from 'lodash';
 import lodashGet from 'lodash/get';
 import PropTypes from 'prop-types';
 import React from 'react';
@@ -76,8 +77,11 @@ class WorkspaceInviteMessagePage extends React.Component {
         this.sendInvitation = this.sendInvitation.bind(this);
         this.validate = this.validate.bind(this);
         this.openPrivacyURL = this.openPrivacyURL.bind(this);
+        this.debouncedSaveDraf = _.debounce((newDraft) => {
+            Policy.setWorkspaceInviteMessageDraft(this.props.route.params.policyID, newDraft);
+        }, 2000);
         this.state = {
-            welcomeNote: this.props.savedWelcomeMessage || this.getDefaultWelcomeNote(),
+            welcomeNote: this.props.workspaceInviteMessageDraft || this.getDefaultWelcomeNote(),
         };
     }
 
@@ -229,8 +233,10 @@ class WorkspaceInviteMessagePage extends React.Component {
                                 containerStyles={[this.props.themeStyles.autoGrowHeightMultilineInput]}
                                 defaultValue={this.state.welcomeNote}
                                 value={this.state.welcomeNote}
-                                onChangeText={(text) => this.setState({welcomeNote: text})}
-                                shouldSaveDraft
+                                onChangeText={(text) => {
+                                    this.debouncedSaveDraf(text);
+                                    this.setState({welcomeNote: text});
+                                }}
                             />
                         </View>
                     </Form>
@@ -254,9 +260,9 @@ export default compose(
         invitedEmailsToAccountIDsDraft: {
             key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MEMBERS_DRAFT}${route.params.policyID.toString()}`,
         },
-        savedWelcomeMessage: {
-            key: `${ONYXKEYS.FORMS.WORKSPACE_INVITE_MESSAGE_FORM}Draft`,
-            selector: (draft) => (draft ? draft.welcomeMessage : ''),
+        workspaceInviteMessageDraft: {
+            key: ({route}) => `${ONYXKEYS.COLLECTION.WORKSPACE_INVITE_MESSAGE_DRAFT}${route.params.policyID.toString()}`,
+            selector: (draft) => (isEmpty(draft) ? '' : draft),
         },
     }),
     withNavigationFocus,