Skip to content

Don't show "Ask Concierge" in search router until the report is loaded #89580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhawryluk wants to merge 1 commit into
base: main
Choose a base branch
from
+21 −13
Open

Don't show "Ask Concierge" in search router until the report is loaded #89580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/components/Search/SearchRouter/SearchRouter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
const {shouldUseNarrowLayout} = useResponsiveLayout();
const listRef = useRef<SelectionListWithSectionsHandle>(null);
const expensifyIcons = useMemoizedLazyExpensifyIcons(['MagnifyingGlass', 'ConciergeAvatar']);
const askConcierge = useAskConcierge();
const {askConcierge, shouldShowAskConcierge} = useAskConcierge();

// The actual input text that the user sees
const [textInputValue, , setTextInputValue] = useDebouncedState('', 500);
Expand Down Expand Up @@ -210,15 +210,19 @@ function SearchRouter({onRouterClose, shouldHideInputCaret, isSearchRouterDispla
keyForList: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.FIND_ITEM,
searchItemType: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.SEARCH,
},
{
text: translate('search.askConcierge', textInputValue),
singleIcon: expensifyIcons.ConciergeAvatar,
shouldIconApplyFill: false,
searchQuery: textInputValue,
itemStyle: styles.activeComponentBG,
keyForList: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.ASK_CONCIERGE,
searchItemType: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.ASK_CONCIERGE,
},
...(shouldShowAskConcierge
? [
{
text: translate('search.askConcierge', textInputValue),
singleIcon: expensifyIcons.ConciergeAvatar,
shouldIconApplyFill: false,
searchQuery: textInputValue,
itemStyle: styles.activeComponentBG,
keyForList: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.ASK_CONCIERGE,
searchItemType: CONST.SEARCH.SEARCH_ROUTER_ITEM_TYPE.ASK_CONCIERGE,
},
]
: []),
]
: undefined;

Expand Down
10 changes: 7 additions & 3 deletions src/components/Search/SearchRouter/useAskConcierge.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import ONYXKEYS from '@src/ONYXKEYS';
/**
* Returns a callback that opens the side panel (or Concierge chat on native)
* and sends the provided search query as a message.
* Also returns a flag indicating whether the Ask Concierge item is ready to be displayed.
*/
function useAskConcierge() {
const sidePanelReportID = useSidePanelReportID();
Expand All @@ -20,13 +21,14 @@ function useAskConcierge() {
const [targetReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${getNonEmptyStringOnyxID(targetReportID)}`);
const {timezone, accountID: currentUserAccountID} = useCurrentUserPersonalDetails();
const delegateAccountID = useDelegateAccountID();
const shouldShowAskConcierge = !!targetReportID && !!targetReport;

return (searchQuery: string) => {
openConciergeAnywhere();
const askConcierge = (searchQuery: string) => {
const trimmedQuery = searchQuery.trim();
if (!trimmedQuery || !targetReport || !targetReportID) {
if (!trimmedQuery || !shouldShowAskConcierge) {
return;
}
openConciergeAnywhere();
addComment({
report: targetReport,
notifyReportID: targetReportID,
Expand All @@ -39,6 +41,8 @@ function useAskConcierge() {
delegateAccountID,
});
};

return {askConcierge, shouldShowAskConcierge};
}

export default useAskConcierge;
Loading