From d3fdbba7e2683815dec86260e7a4c20a3eac0429 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 26 Oct 2022 10:49:43 -0700 Subject: [PATCH 1/2] Add create chat to the option pending action --- src/libs/OptionsListUtils.js | 2 +- src/libs/SidebarUtils.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 2bc775724007..8db8f3a724f0 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -305,7 +305,7 @@ function createOption(logins, personalDetails, report, reportActions = {}, { result.shouldShowSubscript = result.isPolicyExpenseChat && !report.isOwnPolicyExpenseChat && !result.isArchivedRoom; result.allReportErrors = getAllReportErrors(report, reportActions); result.brickRoadIndicator = !_.isEmpty(result.allReportErrors) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''; - result.pendingAction = report.pendingFields ? report.pendingFields.addWorkspaceRoom : null; + result.pendingAction = report.pendingFields ? (report.pendingFields.addWorkspaceRoom || report.pendingFields.createChat) : null; result.ownerEmail = report.ownerEmail; result.reportID = report.reportID; result.isUnread = ReportUtils.isUnread(report); diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js index 2aefa7ed8558..095864ad2fff 100644 --- a/src/libs/SidebarUtils.js +++ b/src/libs/SidebarUtils.js @@ -222,7 +222,7 @@ function getOptionData(reportID) { result.isArchivedRoom = ReportUtils.isArchivedRoom(report); result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report); result.shouldShowSubscript = result.isPolicyExpenseChat && !report.isOwnPolicyExpenseChat && !result.isArchivedRoom; - result.pendingAction = report.pendingFields ? report.pendingFields.addWorkspaceRoom : null; + result.pendingAction = report.pendingFields ? (report.pendingFields.addWorkspaceRoom || report.pendingFields.createChat) : null; result.allReportErrors = OptionsListUtils.getAllReportErrors(report, reportActions); result.brickRoadIndicator = !_.isEmpty(result.allReportErrors) ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : ''; result.ownerEmail = report.ownerEmail; From 0870db71664564ec340a675c69e3826a173fa305 Mon Sep 17 00:00:00 2001 From: neil-marcellini Date: Wed, 26 Oct 2022 17:03:52 -0700 Subject: [PATCH 2/2] Define network prop for option row story --- src/stories/OptionRow.stories.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/stories/OptionRow.stories.js b/src/stories/OptionRow.stories.js index d8f34414678e..a3eac131f880 100644 --- a/src/stories/OptionRow.stories.js +++ b/src/stories/OptionRow.stories.js @@ -1,6 +1,8 @@ import React from 'react'; import OptionRow from '../components/OptionRow'; import * as Expensicons from '../components/Icon/Expensicons'; +import OnyxProvider from '../components/OnyxProvider'; +/* eslint-disable react/jsx-props-no-spreading */ /** * We use the Component Story Format for writing stories. Follow the docs here: @@ -43,8 +45,11 @@ export default { }, }; -// eslint-disable-next-line react/jsx-props-no-spreading -const Template = args => ; +const Template = args => ( + + + +); // Arguments can be passed to the component by binding // See: https://storybook.js.org/docs/react/writing-stories/introduction#using-args