diff --git a/package.json b/package.json index fa4aaf0d50..7251aebb63 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "prop-types": "Since we use former ddb-react components that depend on prop-types we keep this. Should be removed when usage of prop-types is deprecated." }, "dependencies": { - "@danskernesdigitalebibliotek/dpl-design-system": "2023.51.0-cd7e0937a067366392e60d85a9831b7d1cdf363e", + "@danskernesdigitalebibliotek/dpl-design-system": "0.0.0-53111dc1d5d35ee254a8e231f1e3721088240a4a", "@reach/alert": "^0.17.0", "@reach/dialog": "^0.18.0", "@reduxjs/toolkit": "^1.9.7", diff --git a/src/apps/advanced-search/AdvancedSearchResults.tsx b/src/apps/advanced-search/AdvancedSearchResults.tsx index 26eee21720..8fa91dfbad 100644 --- a/src/apps/advanced-search/AdvancedSearchResults.tsx +++ b/src/apps/advanced-search/AdvancedSearchResults.tsx @@ -88,7 +88,7 @@ const AdvancedSearchResult: React.FC = ({ }, [data, page]); const shouldShowSearchResults = isLoading || (!isLoading && hitcount > 0); - const shouldShowResultHeadline = hitcount && !isLoading; + const shouldShowResultHeadline = !!(hitcount && !isLoading); useEffect(() => { if (copiedLinkToSearch) { @@ -108,11 +108,14 @@ const AdvancedSearchResult: React.FC = ({ /* ID is used to scroll to the results upon hitting the search button. */ id="advanced-search-result" > - {isLoading && t("loadingResultsText")} - {shouldShowResultHeadline && - t("showingMaterialsText", { - placeholders: { "@hitcount": hitcount } - })} + {isLoading && <>{t("loadingResultsText")}} + {shouldShowResultHeadline && ( + <> + {t("showingMaterialsText", { + placeholders: { "@hitcount": hitcount } + })} + + )} {!showContentOnly && ( - )} - {showPaymentButton && ( - - {t("payText")} - - )} - +
+

+ {t("totalText", { + placeholders: { "@total": amount } + })} +

+
} >
{materials.map(({ recordId }) => ( ))}
diff --git a/src/apps/fee-list/stackable-fees/stackable-fees-list.tsx b/src/apps/fee-list/stackable-fees/stackable-fees-list.tsx index 7692743fb4..4703447e6a 100644 --- a/src/apps/fee-list/stackable-fees/stackable-fees-list.tsx +++ b/src/apps/fee-list/stackable-fees/stackable-fees-list.tsx @@ -9,13 +9,13 @@ import StatusBadge from "../../loan-list/materials/utils/status-badge"; import { FaustId } from "../../../core/utils/types/ids"; interface StackableFeeListProps { - creationDateFormatted: string; materials: FeeMaterialV2[]; + reasonForFee: string; } const StackableFeeList: FC = ({ materials, - creationDateFormatted + reasonForFee }) => { const t = useText(); @@ -25,23 +25,21 @@ const StackableFeeList: FC = ({ - } + statusBadgeComponent={} item={{ faust: recordId as FaustId }} key={recordId} statusMessageComponentMobile={
- {materialItemNumber} + {t("materialNumberText", { + placeholders: { "@materialNumber": materialItemNumber } + })}
} statusMessageComponentDesktop={
- {materialItemNumber} + {t("materialNumberText", { + placeholders: { "@materialNumber": materialItemNumber } + })}
} /> diff --git a/src/apps/fee-list/stackable-fees/stackable-fees.tsx b/src/apps/fee-list/stackable-fees/stackable-fees.tsx index 137923c47a..558545c9ec 100644 --- a/src/apps/fee-list/stackable-fees/stackable-fees.tsx +++ b/src/apps/fee-list/stackable-fees/stackable-fees.tsx @@ -31,12 +31,17 @@ const StackableFees: FC = ({ const { amount = 0, creationDate = "", reasonMessage = "" } = feeData; const stackSize = amountOfMaterialsWithDueDate - 1; const listReservationClass = clsx(["list-reservation", "my-32"], { - "list-reservation--stacked": stackSize > 1 + "list-reservation--stacked": stackSize > 0 }); return (