Skip to content
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

Fix - Search - When plenty of expenses are created already, haven't created expenses message shown #52059

Merged
merged 16 commits into from
Dec 6, 2024
Merged

Fix - Search - When plenty of expenses are created already, haven't created expenses message shown #52059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e55f5a8
updated EmptySearchView to show generic nothing to show message for e…
FitseTLT Nov 5, 2024
ea84512
rename variable
FitseTLT Nov 8, 2024
b0e3b2d
Merge branch 'main' into fix-empty-search-view
FitseTLT Nov 12, 2024
06adbca
updated comment
FitseTLT Nov 12, 2024
267e219
updated noExpenseCreated logic
FitseTLT Nov 12, 2024
13edffd
added no invoices created yet variant
FitseTLT Nov 12, 2024
2bdae0c
broke down the copy to two lines
FitseTLT Nov 13, 2024
9e59246
add spanish translation
FitseTLT Nov 13, 2024
3597309
added new line
FitseTLT Nov 13, 2024
0ef6bdd
Merge branch 'main' into fix-empty-search-view
FitseTLT Nov 19, 2024
f5ceb03
added redirect to expensify classic same as for create expense
FitseTLT Nov 19, 2024
b510534
Merge branch 'main' into fix-empty-search-view
FitseTLT Nov 22, 2024
133d2d0
Merge branch 'main' into fix-empty-search-view
FitseTLT Nov 22, 2024
fb63226
Merge branch 'main' into fix-empty-search-view
FitseTLT Dec 5, 2024
ce1abbc
implemented with hasResults
FitseTLT Dec 5, 2024
4eb86b4
remove unwanted import
FitseTLT Dec 5, 2024
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
5 changes: 4 additions & 1 deletion src/components/Search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,10 @@ function Search({queryJSON, onSearchListScroll, isSearchScreenFocused, contentCo
if (shouldShowEmptyState) {
return (
<View style={[shouldUseNarrowLayout ? styles.searchListContentContainerStyles : styles.mt3, styles.flex1]}>
<EmptySearchView type={type} />
<EmptySearchView
type={type}
hasResults={searchResults.search.hasResults}
/>
</View>
);
}
Expand Down
4 changes: 4 additions & 0 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4536,6 +4536,10 @@ const translations = {
title: "You haven't created any expenses yet",
subtitle: 'Use the green button below to create an expense or take a tour of Expensify to learn more.',
},
emptyInvoiceResults: {
title: "You haven't created any \ninvoices yet",
subtitle: 'Use the green button below to send an invoice or take a tour of Expensify to learn more.',
},
emptyTripResults: {
title: 'No trips to display',
subtitle: 'Get started by booking your first trip below.',
Expand Down
4 changes: 4 additions & 0 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4585,6 +4585,10 @@ const translations = {
title: 'Aún no has creado ningún gasto',
subtitle: 'Usa el botón verde de abajo para crear un gasto o haz un tour por Expensify para aprender más.',
},
emptyInvoiceResults: {
title: 'Aún no has creado \nninguna factura',
subtitle: 'Usa el botón verde de abajo para crear una factura o haz un tour por Expensify para aprender más.',
},
emptyTripResults: {
title: 'No tienes viajes',
subtitle: 'Reserva tu primer viaje a continuación.',
Expand Down
112 changes: 77 additions & 35 deletions src/pages/Search/EmptySearchView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import type {SearchDataTypes} from '@src/types/onyx/SearchResults';

type EmptySearchViewProps = {
type: SearchDataTypes;
hasResults: boolean;
};

const tripsFeatures: FeatureListItem[] = [
Expand All @@ -48,7 +49,7 @@ const tripsFeatures: FeatureListItem[] = [
},
];

function EmptySearchView({type}: EmptySearchViewProps) {
function EmptySearchView({type, hasResults}: EmptySearchViewProps) {
const theme = useTheme();
const StyleUtils = useStyleUtils();
const {translate} = useLocalize();
Expand Down Expand Up @@ -135,41 +136,81 @@ function EmptySearchView({type}: EmptySearchViewProps) {
lottieWebViewStyles: {backgroundColor: theme.travelBG, ...styles.emptyStateFolderWebStyles},
};
case CONST.SEARCH.DATA_TYPES.EXPENSE:
return {
headerMedia: LottieAnimations.GenericEmptyState,
title: translate('search.searchResults.emptyExpenseResults.title'),
subtitle: translate('search.searchResults.emptyExpenseResults.subtitle'),
buttons: [
...(!hasSeenTour
? [
{
buttonText: translate('emptySearchView.takeATour'),
buttonAction: () => {
Link.openExternalLink(navatticURL);
Welcome.setSelfTourViewed();
Task.completeTask(viewTourTaskReport);
if (!hasResults) {
return {
headerMedia: LottieAnimations.GenericEmptyState,
title: translate('search.searchResults.emptyExpenseResults.title'),
subtitle: translate('search.searchResults.emptyExpenseResults.subtitle'),
buttons: [
...(!hasSeenTour
? [
{
buttonText: translate('emptySearchView.takeATour'),
buttonAction: () => {
Link.openExternalLink(navatticURL);
Welcome.setSelfTourViewed();
Task.completeTask(viewTourTaskReport);
},
},
},
]
: []),
{
buttonText: translate('iou.createExpense'),
buttonAction: () =>
interceptAnonymousUser(() => {
if (shouldRedirectToExpensifyClassic) {
setModalVisible(true);
return;
}
IOU.startMoneyRequest(CONST.IOU.TYPE.CREATE, ReportUtils.generateReportID());
}),
success: true,
},
],
headerContentStyles: [styles.emptyStateFolderWebStyles, StyleUtils.getBackgroundColorStyle(theme.emptyFolderBG)],
lottieWebViewStyles: {backgroundColor: theme.emptyFolderBG, ...styles.emptyStateFolderWebStyles},
};
case CONST.SEARCH.DATA_TYPES.CHAT:
]
: []),
{
buttonText: translate('iou.createExpense'),
buttonAction: () =>
interceptAnonymousUser(() => {
if (shouldRedirectToExpensifyClassic) {
setModalVisible(true);
return;
}
IOU.startMoneyRequest(CONST.IOU.TYPE.CREATE, ReportUtils.generateReportID());
}),
success: true,
},
],
headerContentStyles: [styles.emptyStateFolderWebStyles, StyleUtils.getBackgroundColorStyle(theme.emptyFolderBG)],
lottieWebViewStyles: {backgroundColor: theme.emptyFolderBG, ...styles.emptyStateFolderWebStyles},
};
}
// We want to display the default nothing to show message if there is any filter applied.
// eslint-disable-next-line no-fallthrough
case CONST.SEARCH.DATA_TYPES.INVOICE:
if (!hasResults) {
return {
headerMedia: LottieAnimations.GenericEmptyState,
title: translate('search.searchResults.emptyInvoiceResults.title'),
subtitle: translate('search.searchResults.emptyInvoiceResults.subtitle'),
buttons: [
...(!hasSeenTour
? [
{
buttonText: translate('emptySearchView.takeATour'),
buttonAction: () => {
Link.openExternalLink(navatticURL);
Welcome.setSelfTourViewed();
Task.completeTask(viewTourTaskReport);
},
},
]
: []),
{
buttonText: translate('workspace.invoices.sendInvoice'),
buttonAction: () =>
interceptAnonymousUser(() => {
if (shouldRedirectToExpensifyClassic) {
setModalVisible(true);
return;
}
IOU.startMoneyRequest(CONST.IOU.TYPE.INVOICE, ReportUtils.generateReportID());
}),
success: true,
},
],
headerContentStyles: [styles.emptyStateFolderWebStyles, StyleUtils.getBackgroundColorStyle(theme.emptyFolderBG)],
lottieWebViewStyles: {backgroundColor: theme.emptyFolderBG, ...styles.emptyStateFolderWebStyles},
};
}
// eslint-disable-next-line no-fallthrough
case CONST.SEARCH.DATA_TYPES.CHAT:
default:
return {
headerMedia: LottieAnimations.GenericEmptyState,
Expand All @@ -191,8 +232,9 @@ function EmptySearchView({type}: EmptySearchViewProps) {
hasSeenTour,
ctaErrorMessage,
navatticURL,
viewTourTaskReport,
shouldRedirectToExpensifyClassic,
hasResults,
viewTourTaskReport,
]);

return (
Expand Down
4 changes: 4 additions & 0 deletions src/types/onyx/SearchResults.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ type SearchResultsInfo = {
/** Whether the user can fetch more search results */
hasMoreResults: boolean;

/** Whether the user has any valid data on the current search type, for instance,
* whether they have created any invoice yet when the search type is invoice */
hasResults: boolean;

/** Whether the search results are currently loading */
isLoading: boolean;

Expand Down
Loading