Skip to content

Commit

Permalink
Merge pull request #52728 from Expensify/jamesdeanexpensify-patch-2
Browse files Browse the repository at this point in the history
Remove "Let's get you set up 🔧 " line during onboarding
  • Loading branch information
Gonals authored Nov 19, 2024
2 parents 9b95150 + 23c6802 commit 1f91794
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
1 change: 0 additions & 1 deletion src/CONST.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4821,7 +4821,6 @@ const CONST = {

WELCOME_VIDEO_URL: `${CLOUDFRONT_URL}/videos/intro-1280.mp4`,

ONBOARDING_INTRODUCTION: 'Let’s get you set up 🔧',
ONBOARDING_CHOICES: {...onboardingChoices},
SELECTABLE_ONBOARDING_CHOICES: {...selectableOnboardingChoices},
COMBINED_TRACK_SUBMIT_ONBOARDING_CHOICES: {...combinedTrackSubmitOnboardingChoices},
Expand Down
19 changes: 1 addition & 18 deletions src/libs/actions/Report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3498,15 +3498,6 @@ function prepareOnboardingOptimisticData(
const targetChatReport = ReportUtils.getChatByParticipants([actorAccountID, currentUserAccountID]);
const {reportID: targetChatReportID = '', policyID: targetChatPolicyID = ''} = targetChatReport ?? {};

// Introductory message
const introductionComment = ReportUtils.buildOptimisticAddCommentReportAction(CONST.ONBOARDING_INTRODUCTION, undefined, actorAccountID);
const introductionCommentAction: OptimisticAddCommentReportAction = introductionComment.reportAction;
const introductionMessage: AddCommentOrAttachementParams = {
reportID: targetChatReportID,
reportActionID: introductionCommentAction.reportActionID,
reportComment: introductionComment.commentText,
};

// Text message
const textComment = ReportUtils.buildOptimisticAddCommentReportAction(data.message, undefined, actorAccountID, 1);
const textCommentAction: OptimisticAddCommentReportAction = textComment.reportAction;
Expand Down Expand Up @@ -3753,7 +3744,6 @@ function prepareOnboardingOptimisticData(
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
value: {
[introductionCommentAction.reportActionID]: introductionCommentAction as ReportAction,
[textCommentAction.reportActionID]: textCommentAction as ReportAction,
},
},
Expand All @@ -3776,7 +3766,6 @@ function prepareOnboardingOptimisticData(
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
value: {
[introductionCommentAction.reportActionID]: {pendingAction: null},
[textCommentAction.reportActionID]: {pendingAction: null},
},
});
Expand Down Expand Up @@ -3811,9 +3800,6 @@ function prepareOnboardingOptimisticData(
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${targetChatReportID}`,
value: {
[introductionCommentAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericAddCommentFailureMessage'),
} as ReportAction,
[textCommentAction.reportActionID]: {
errors: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('report.genericAddCommentFailureMessage'),
} as ReportAction,
Expand Down Expand Up @@ -3866,10 +3852,7 @@ function prepareOnboardingOptimisticData(
});
}

const guidedSetupData: GuidedSetupData = [
{type: 'message', ...introductionMessage},
{type: 'message', ...textMessage},
];
const guidedSetupData: GuidedSetupData = [{type: 'message', ...textMessage}];

if ('video' in data && data.video && videoCommentAction && videoMessage) {
optimisticData.push({
Expand Down

0 comments on commit 1f91794

Please sign in to comment.