From c7f31e3f26711b7123e07fa2d630cc801d87786f Mon Sep 17 00:00:00 2001
From: Srikar Parsi <48188732+srikarparsi@users.noreply.github.com>
Date: Wed, 1 May 2024 15:11:05 -0400
Subject: [PATCH] Merge pull request #41436 from
Expensify/francois-fix-blocker-41422
[CP Staging] Fix markdown rendering for task descriptions, fix onboarding task descriptions
(cherry picked from commit 03821a82acf2ee38afd52c74f432427145336d04)
---
src/CONST.ts | 66 ++++++++++----------
src/components/ReportActionItem/TaskView.tsx | 3 -
2 files changed, 33 insertions(+), 36 deletions(-)
diff --git a/src/CONST.ts b/src/CONST.ts
index de5d5e574e6c..70137f7e955c 100755
--- a/src/CONST.ts
+++ b/src/CONST.ts
@@ -3717,12 +3717,12 @@ const CONST = {
autoCompleted: false,
title: 'Submit an expense',
description:
- 'Submit an expense by entering an amount or scanning a receipt.\n' +
+ '*Submit an expense* by entering an amount or scanning a receipt.\n' +
'\n' +
'Here’s how to submit an expense:\n' +
'\n' +
- '1. Click the green + button.\n' +
- '2. Choose Submit expense.\n' +
+ '1. Click the green *+* button.\n' +
+ '2. Choose *Submit expense*.\n' +
'3. Enter an amount or scan a receipt.\n' +
'4. Add your reimburser to the request.\n' +
'\n' +
@@ -3733,12 +3733,12 @@ const CONST = {
autoCompleted: false,
title: 'Enable your wallet',
description:
- 'You’ll need to enable your Expensify Wallet to get paid back. Don’t worry, it’s easy!\n' +
+ 'You’ll need to *enable your Expensify Wallet* to get paid back. Don’t worry, it’s easy!\n' +
'\n' +
'Here’s how to set up your wallet:\n' +
'\n' +
'1. Click your profile picture.\n' +
- '2. Click Wallet > Enable wallet.\n' +
+ '2. Click *Wallet* > *Enable wallet*.\n' +
'3. Connect your bank account.\n' +
'\n' +
'Once that’s done, you can request money from anyone and get paid back right into your personal bank account.',
@@ -3760,14 +3760,14 @@ const CONST = {
autoCompleted: true,
title: 'Create a workspace',
description:
- 'Create a workspace to track expenses, scan receipts, chat, and more.\n' +
+ '*Create a workspace* to track expenses, scan receipts, chat, and more.\n' +
'\n' +
'Here’s how to create a workspace:\n' +
'\n' +
'1. Click your profile picture.\n' +
- '2. Click Workspaces > New workspace.\n' +
+ '2. Click *Workspaces* > *New workspace*.\n' +
'\n' +
- 'Your new workspace is ready! It’ll keep all of your spend (and chats) in one place.',
+ '*Your new workspace is ready! It’ll keep all of your spend (and chats) in one place.*',
},
{
type: 'meetGuide',
@@ -3783,32 +3783,32 @@ const CONST = {
autoCompleted: false,
title: 'Set up categories',
description:
- 'Set up categories so your team can code expenses for easy reporting.\n' +
+ '*Set up categories* so your team can code expenses for easy reporting.\n' +
'\n' +
'Here’s how to set up categories:\n' +
'\n' +
'1. Click your profile picture.\n' +
- '2. Go to Workspaces > [your workspace].\n' +
- '3. Click Categories.\n' +
+ '2. Go to *Workspaces* > [your workspace].\n' +
+ '3. Click *Categories*.\n' +
'4. Enable and disable default categories.\n' +
- '5. Click Add categories to make your own.\n' +
+ '5. Click *Add categories* to make your own.\n' +
'\n' +
- 'For more controls like requiring a category for every expense, click Settings.',
+ 'For more controls like requiring a category for every expense, click *Settings*.',
},
{
type: 'addExpenseApprovals',
autoCompleted: false,
title: 'Add expense approvals',
description:
- 'Add expense approvals to review your team’s spend and keep it under control.\n' +
+ '*Add expense approvals* to review your team’s spend and keep it under control.\n' +
'\n' +
'Here’s how to add expense approvals:\n' +
'\n' +
'1. Click your profile picture.\n' +
- '2. Go to Workspaces > [your workspace].\n' +
- '3. Click More features.\n' +
- '4. Enable Workflows.\n' +
- '5. In Workflows, enable Add approvals.\n' +
+ '2. Go to *Workspaces* > [your workspace].\n' +
+ '3. Click *More features*.\n' +
+ '4. Enable *Workflows*.\n' +
+ '5. In *Workflows*, enable *Add approvals*.\n' +
'\n' +
'You’ll be set as the expense approver. You can change this to any admin once you invite your team.',
},
@@ -3817,13 +3817,13 @@ const CONST = {
autoCompleted: false,
title: 'Invite your team',
description:
- 'Invite your team to Expensify so they can start tracking expenses today.\n' +
+ '*Invite your team* to Expensify so they can start tracking expenses today.\n' +
'\n' +
'Here’s how to invite your team:\n' +
'\n' +
'1. Click your profile picture.\n' +
- '2. Go to Workspaces > [your workspace].\n' +
- '3. Click Members > Invite member.\n' +
+ '2. Go to *Workspaces* > [your workspace].\n' +
+ '3. Click *Members* > *Invite member*.\n' +
'4. Enter emails or phone numbers. \n' +
'5. Add an invite message if you want.\n' +
'\n' +
@@ -3846,14 +3846,14 @@ const CONST = {
autoCompleted: false,
title: 'Track an expense',
description:
- 'Track an expense in any currency, whether you have a receipt or not.\n' +
+ '*Track an expense* in any currency, whether you have a receipt or not.\n' +
'\n' +
'Here’s how to track an expense:\n' +
'\n' +
- '1. Click the green + button.\n' +
- '2. Choose Track expense.\n' +
+ '1. Click the green *+* button.\n' +
+ '2. Choose *Track expense*.\n' +
'3. Enter an amount or scan a receipt.\n' +
- '4. Click Track.\n' +
+ '4. Click *Track*.\n' +
'\n' +
'And you’re done! Yep, it’s that easy.',
},
@@ -3874,12 +3874,12 @@ const CONST = {
autoCompleted: false,
title: 'Start a chat',
description:
- 'Start a chat with a friend or group using their email or phone number.\n' +
+ '*Start a chat* with a friend or group using their email or phone number.\n' +
'\n' +
'Here’s how to start a chat:\n' +
'\n' +
- '1. Click the green + button.\n' +
- '2. Choose Start chat.\n' +
+ '1. Click the green *+* button.\n' +
+ '2. Choose *Start chat*.\n' +
'3. Enter emails or phone numbers.\n' +
'\n' +
'If any of your friends aren’t using Expensify already, they’ll be invited automatically.\n' +
@@ -3891,12 +3891,12 @@ const CONST = {
autoCompleted: false,
title: 'Split an expense',
description:
- 'Split an expense right in your chat with one or more friends.\n' +
+ '*Split an expense* right in your chat with one or more friends.\n' +
'\n' +
'Here’s how to request money:\n' +
'\n' +
- '1. Click the green + button.\n' +
- '2. Choose Split expense.\n' +
+ '1. Click the green *+* button.\n' +
+ '2. Choose *Split expense*.\n' +
'3. Scan a receipt or enter an amount.\n' +
'4. Add your friend(s) to the request.\n' +
'\n' +
@@ -3907,12 +3907,12 @@ const CONST = {
autoCompleted: false,
title: 'Enable your wallet',
description:
- 'You’ll need to enable your Expensify Wallet to get paid back. Don’t worry, it’s easy!\n' +
+ 'You’ll need to *enable your Expensify Wallet* to get paid back. Don’t worry, it’s easy!\n' +
'\n' +
'Here’s how to enable your wallet:\n' +
'\n' +
'1. Click your profile picture.\n' +
- '2. Click Wallet > Enable wallet.\n' +
+ '2. *Click Wallet* > *Enable wallet*.\n' +
'3. Add your bank account.\n' +
'\n' +
'Once that’s done, you can request money from anyone and get paid right into your personal bank account.',
diff --git a/src/components/ReportActionItem/TaskView.tsx b/src/components/ReportActionItem/TaskView.tsx
index ae361ce9dc47..9711e126907f 100644
--- a/src/components/ReportActionItem/TaskView.tsx
+++ b/src/components/ReportActionItem/TaskView.tsx
@@ -23,7 +23,6 @@ import getButtonState from '@libs/getButtonState';
import Navigation from '@libs/Navigation/Navigation';
import * as OptionsListUtils from '@libs/OptionsListUtils';
import * as ReportUtils from '@libs/ReportUtils';
-import * as Url from '@libs/Url';
import * as Session from '@userActions/Session';
import * as Task from '@userActions/Task';
import CONST from '@src/CONST';
@@ -150,8 +149,6 @@ function TaskView({report, shouldShowHorizontalRule, ...props}: TaskViewProps) {
shouldGreyOutWhenDisabled={false}
numberOfLinesTitle={0}
interactive={!isDisableInteractive}
- shouldRenderAsHTML
- shouldEscapeText={Url.hasURL(report.description ?? '') ? undefined : false}
/>