diff --git a/src/channels/views/ChannelCreate/ChannelCreate.tsx b/src/channels/views/ChannelCreate/ChannelCreate.tsx index 808c5f1f7..1e28935b6 100644 --- a/src/channels/views/ChannelCreate/ChannelCreate.tsx +++ b/src/channels/views/ChannelCreate/ChannelCreate.tsx @@ -42,19 +42,17 @@ export const ChannelCreateView = ({}) => { }, }); - const [ - reorderChannelWarehouses, - reorderChannelWarehousesOpts, - ] = useChannelReorderWarehousesMutation({ - onCompleted: data => { - const errors = data.channelReorderWarehouses.errors; - if (errors.length) { - errors.forEach(error => handleError(error)); - } + const [reorderChannelWarehouses, reorderChannelWarehousesOpts] = + useChannelReorderWarehousesMutation({ + onCompleted: data => { + const errors = data.channelReorderWarehouses.errors; + if (errors.length) { + errors.forEach(error => handleError(error)); + } - navigate(channelPath(data.channelReorderWarehouses.channel?.id)); - }, - }); + navigate(channelPath(data.channelReorderWarehouses.channel?.id)); + }, + }); const handleSubmit = async ({ shippingZonesIdsToAdd, diff --git a/src/channels/views/ChannelDetails/ChannelDetails.tsx b/src/channels/views/ChannelDetails/ChannelDetails.tsx index f29b0cda0..ecc04fe84 100644 --- a/src/channels/views/ChannelDetails/ChannelDetails.tsx +++ b/src/channels/views/ChannelDetails/ChannelDetails.tsx @@ -84,29 +84,25 @@ export const ChannelDetails: React.FC = ({ }, }); - const [ - deactivateChannel, - deactivateChannelOpts, - ] = useChannelDeactivateMutation({ - onCompleted: data => { - const errors = data.channelDeactivate.errors; - if (errors.length) { - errors.forEach(error => handleError(error)); - } - }, - }); + const [deactivateChannel, deactivateChannelOpts] = + useChannelDeactivateMutation({ + onCompleted: data => { + const errors = data.channelDeactivate.errors; + if (errors.length) { + errors.forEach(error => handleError(error)); + } + }, + }); - const [ - reorderChannelWarehouses, - reorderChannelWarehousesOpts, - ] = useChannelReorderWarehousesMutation({ - onCompleted: data => { - const errors = data.channelReorderWarehouses.errors; - if (errors.length) { - errors.forEach(error => handleError(error)); - } - }, - }); + const [reorderChannelWarehouses, reorderChannelWarehousesOpts] = + useChannelReorderWarehousesMutation({ + onCompleted: data => { + const errors = data.channelReorderWarehouses.errors; + if (errors.length) { + errors.forEach(error => handleError(error)); + } + }, + }); const handleSubmit = async ({ name, diff --git a/src/components/Timeline/TimelineNote.tsx b/src/components/Timeline/TimelineNote.tsx index c000e1d0f..b09854ded 100644 --- a/src/components/Timeline/TimelineNote.tsx +++ b/src/components/Timeline/TimelineNote.tsx @@ -71,6 +71,7 @@ interface TimelineNoteProps { firstName?: string; lastName?: string; }; + hasPlainDate?: boolean; } interface NoteMessageProps { @@ -90,7 +91,7 @@ const NoteMessage: React.FC = ({ message }) => ( ); export const TimelineNote: React.FC = props => { - const { date, user, message } = props; + const { date, user, message, hasPlainDate } = props; const { user: currentUser } = useUser(); const classes = useStyles(props); @@ -127,7 +128,7 @@ export const TimelineNote: React.FC = props => {
{getUserTitleOrEmail()} - +
diff --git a/src/customers/components/CustomerListPage/CustomerListPage.tsx b/src/customers/components/CustomerListPage/CustomerListPage.tsx index 95544d102..1876f50af 100644 --- a/src/customers/components/CustomerListPage/CustomerListPage.tsx +++ b/src/customers/components/CustomerListPage/CustomerListPage.tsx @@ -76,10 +76,8 @@ const CustomerListPage: React.FC = ({ const userPermissions = useUserPermissions(); const structure = createFilterStructure(intl, filterOpts, userPermissions); - const { - CUSTOMER_OVERVIEW_CREATE, - CUSTOMER_OVERVIEW_MORE_ACTIONS, - } = useExtensions(extensionMountPoints.CUSTOMER_LIST); + const { CUSTOMER_OVERVIEW_CREATE, CUSTOMER_OVERVIEW_MORE_ACTIONS } = + useExtensions(extensionMountPoints.CUSTOMER_LIST); const extensionMenuItems = mapToMenuItemsForCustomerOverviewActions( CUSTOMER_OVERVIEW_MORE_ACTIONS, selectedCustomerIds, diff --git a/src/customers/components/CustomerStats/CustomerStats.tsx b/src/customers/components/CustomerStats/CustomerStats.tsx index deecff4fd..0e7c2eec0 100644 --- a/src/customers/components/CustomerStats/CustomerStats.tsx +++ b/src/customers/components/CustomerStats/CustomerStats.tsx @@ -49,7 +49,7 @@ const CustomerStats: React.FC = props => { {customer.lastLogin === null ? ( "-" ) : ( - + )} ) : ( @@ -69,6 +69,7 @@ const CustomerStats: React.FC = props => { ) : ( )} diff --git a/src/discounts/components/SaleList/SaleList.tsx b/src/discounts/components/SaleList/SaleList.tsx index c2ea15c46..33d74b4d3 100644 --- a/src/discounts/components/SaleList/SaleList.tsx +++ b/src/discounts/components/SaleList/SaleList.tsx @@ -214,14 +214,14 @@ const SaleList: React.FC = props => { {sale && sale.startDate ? ( - + ) : ( )} {sale && sale.endDate ? ( - + ) : sale && sale.endDate === null ? ( "-" ) : ( diff --git a/src/discounts/components/VoucherList/VoucherList.tsx b/src/discounts/components/VoucherList/VoucherList.tsx index 204a154dd..6361a9588 100644 --- a/src/discounts/components/VoucherList/VoucherList.tsx +++ b/src/discounts/components/VoucherList/VoucherList.tsx @@ -281,14 +281,14 @@ const VoucherList: React.FC = props => { {voucher?.startDate ? ( - + ) : ( )} {voucher?.endDate ? ( - + ) : voucher && voucher.endDate === null ? ( "-" ) : ( diff --git a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardHistory.tsx b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardHistory.tsx index 2395b4f42..31e511744 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardHistory.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardHistory.tsx @@ -87,6 +87,7 @@ const GiftCardHistory: React.FC = () => { user={user} message={message} key={id} + hasPlainDate /> ); } diff --git a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx index 34079df82..fbb57e13c 100644 --- a/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx +++ b/src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx @@ -122,7 +122,13 @@ const GiftCardTimelineEvent: React.FC = ({ event, }) => { const intl = useIntl(); - return ; + return ( + + ); }; export default GiftCardTimelineEvent; diff --git a/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeader.tsx b/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeader.tsx index 0c678f2f3..479ee85fe 100644 --- a/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeader.tsx +++ b/src/giftCards/GiftCardsList/GiftCardsListHeader/GiftCardsListHeader.tsx @@ -16,11 +16,8 @@ const GiftCardsListHeader: React.FC = () => { const intl = useIntl(); const navigate = useNavigator(); - const { - openCreateDialog, - openBulkCreateDialog, - openExportDialog, - } = useGiftCardListDialogs(); + const { openCreateDialog, openBulkCreateDialog, openExportDialog } = + useGiftCardListDialogs(); const openSettings = () => navigate(giftCardSettingsUrl); diff --git a/src/home/components/HomeActivityCard/HomeActivityCard.tsx b/src/home/components/HomeActivityCard/HomeActivityCard.tsx index 41adc489d..7d02e4ffa 100644 --- a/src/home/components/HomeActivityCard/HomeActivityCard.tsx +++ b/src/home/components/HomeActivityCard/HomeActivityCard.tsx @@ -68,7 +68,7 @@ const HomeActivityCard: React.FC = props => { {getActivityMessage(activity, intl)} } - secondary={} + secondary={} /> ) : ( diff --git a/src/products/components/ProductList/ProductList.tsx b/src/products/components/ProductList/ProductList.tsx index 5ce921616..d2f048b42 100644 --- a/src/products/components/ProductList/ProductList.tsx +++ b/src/products/components/ProductList/ProductList.tsx @@ -416,7 +416,7 @@ export const ProductList: React.FC = props => { > {product?.updatedAt ? ( - + ) : ( )} diff --git a/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx b/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx index c76c17875..c6ccc5c85 100644 --- a/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx +++ b/src/translations/components/TranslationsEntitiesListPage/TranslationsEntitiesListPage.tsx @@ -27,7 +27,8 @@ export interface TranslationsEntitiesFilters { onMenuItemsTabClick: () => void; } -export type TranslationsEntitiesListFilterTab = keyof typeof TranslatableEntities; +export type TranslationsEntitiesListFilterTab = + keyof typeof TranslatableEntities; const tabs: TranslationsEntitiesListFilterTab[] = [ "categories", @@ -41,7 +42,9 @@ const tabs: TranslationsEntitiesListFilterTab[] = [ "menuItems", ]; -const TranslationsEntitiesListPage: React.FC = props => { +const TranslationsEntitiesListPage: React.FC< + TranslationsEntitiesListPageProps +> = props => { const { filters, language, children } = props; const intl = useIntl(); diff --git a/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.tsx b/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.tsx index 915ec2aaf..f0f7c74c1 100644 --- a/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.tsx +++ b/src/translations/components/TranslationsLanguageListPage/TranslationsLanguageListPage.tsx @@ -9,9 +9,9 @@ export interface TranslationsLanguageListPageProps { languages: LanguageFragment[]; } -const TranslationsLanguageListPage: React.FC = ({ - languages, -}) => { +const TranslationsLanguageListPage: React.FC< + TranslationsLanguageListPageProps +> = ({ languages }) => { const intl = useIntl(); return (