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

Jump to bottom

fix: [IOBP-950] Filter tabs behavior into biz events notices list #6363

Merged
merged 3 commits into from
Nov 5, 2024
+60 −30
Merged

fix: [IOBP-950] Filter tabs behavior into biz events notices list #6363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ab4a5f
fix: Filter tabs behavior into biz events notices list
Hantex9 Nov 5, 2024
af94827
chore: Extracted section list header into another file
Hantex9 Nov 5, 2024
19db878
Merge branch 'master' into IOBP-950-fix-tab-selected-filter-notices
Hantex9 Nov 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
36 changes: 36 additions & 0 deletions ts/features/payments/bizEventsTransaction/components/PaymentBizEventsSectionListHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import * as React from "react";
import { H2, VSpacer } from "@pagopa/io-app-design-system";
import { LayoutChangeEvent, View } from "react-native";
import I18n from "../../../../i18n";
import { PaymentBizEventsCategoryFilter } from "../types";
import { PaymentsBizEventsFilterTabs } from "./PaymentsBizEventsFilterTabs";

type PaymentBizEventsSectionListHeaderProps = {
onLayout: (event: LayoutChangeEvent) => void;
selectedCategory: PaymentBizEventsCategoryFilter;
onCategorySelected: (category: PaymentBizEventsCategoryFilter) => void;
};

export const PaymentBizEventsSectionListHeader = React.memo(
({
onLayout,
selectedCategory,
onCategorySelected
}: PaymentBizEventsSectionListHeaderProps) => (
<View onLayout={onLayout}>
<H2
accessibilityLabel={I18n.t("features.payments.transactions.title")}
accessibilityRole="header"
>
{I18n.t("features.payments.transactions.title")}
</H2>
<VSpacer size={16} />
<PaymentsBizEventsFilterTabs
selectedCategory={selectedCategory}
onCategorySelected={onCategorySelected}
/>
</View>
),
(prevProps, nextProps) =>
prevProps.selectedCategory === nextProps.selectedCategory
);
4 changes: 3 additions & 1 deletion ts/features/payments/bizEventsTransaction/components/PaymentsBizEventsFilterTabs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ const PaymentsBizEventsFilterTabs = ({

const handleFilterSelected = (index: number) => {
const categoryByIndex = paymentsBizEventsCategoryFilters[index];
onCategorySelected?.(categoryByIndex);
if (categoryByIndex !== selectedCategory) {
onCategorySelected?.(categoryByIndex);
}
};

return (
Expand Down
50 changes: 21 additions & 29 deletions ts/features/payments/bizEventsTransaction/screens/PaymentsTransactionBizEventsListScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {
ButtonLink,
Divider,
H2,
IOStyles,
ListItemHeader,
VSpacer
Expand Down Expand Up @@ -35,11 +34,11 @@ import { PaymentsTransactionBizEventsRoutes } from "../navigation/routes";
import { PaymentsTransactionRoutes } from "../../transaction/navigation/routes";
import { NoticeListItem } from "../../../../../definitions/pagopa/biz-events/NoticeListItem";
import * as analytics from "../analytics";
import { PaymentsBizEventsFilterTabs } from "../components/PaymentsBizEventsFilterTabs";
import { PaymentBizEventsCategoryFilter } from "../types";
import { OperationResultScreenContent } from "../../../../components/screens/OperationResultScreenContent";
import { PaymentsBizEventsFadeInOutAnimationView } from "../components/PaymentsBizEventsFadeInOutAnimationView";
import { PaymentsBizEventsTransactionLoadingList } from "../components/PaymentsBizEventsTransactionLoadingList";
import { PaymentBizEventsSectionListHeader } from "../components/PaymentBizEventsSectionListHeader";

export type PaymentsTransactionBizEventsListScreenProps = RouteProp<
PaymentsTransactionBizEventsParamsList,
Expand Down Expand Up @@ -139,16 +138,19 @@ const PaymentsTransactionBizEventsListScreen = () => {
);
};

const handleCategorySelected = (category: PaymentBizEventsCategoryFilter) => {
setNoticeCategory(category);
dispatch(
getPaymentsBizEventsTransactionsAction.request({
firstLoad: true,
noticeCategory: category,
onSuccess: handleOnSuccess
})
);
};
const handleCategorySelected = React.useCallback(
(category: PaymentBizEventsCategoryFilter) => {
setNoticeCategory(category);
dispatch(
getPaymentsBizEventsTransactionsAction.request({
firstLoad: true,
noticeCategory: category,
onSuccess: handleOnSuccess
})
);
},
[setNoticeCategory, dispatch]
);

useOnFirstRender(
React.useCallback(() => {
Expand Down Expand Up @@ -177,22 +179,6 @@ const PaymentsTransactionBizEventsListScreen = () => {
}
}, [transactionsPot]);

const SectionListHeaderTitle = (
<View onLayout={getTitleHeight}>
<H2
accessibilityLabel={I18n.t("features.payments.transactions.title")}
accessibilityRole="header"
>
{I18n.t("features.payments.transactions.title")}
</H2>
<VSpacer size={16} />
<PaymentsBizEventsFilterTabs
selectedCategory={noticeCategory}
onCategorySelected={handleCategorySelected}
/>
</View>
);

const ShowLegacyTransactionsButton = () => (
<View style={{ marginTop: 12 }}>
<VSpacer size={16} />
Expand Down Expand Up @@ -240,7 +226,13 @@ const PaymentsTransactionBizEventsListScreen = () => {
}}
onEndReached={fetchNextPage}
onEndReachedThreshold={0.25}
ListHeaderComponent={SectionListHeaderTitle}
ListHeaderComponent={
<PaymentBizEventsSectionListHeader
onLayout={getTitleHeight}
selectedCategory={noticeCategory}
onCategorySelected={handleCategorySelected}
/>
}
onScroll={scrollHandler}
stickySectionHeadersEnabled={false}
sections={
Expand Down
Loading