escape interpolated dates

MutinyWallet · Apr 12, 2024 · dda1601 · dda1601
1 parent 019d4d0
commit dda1601
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/components/GenericItem.tsx b/src/components/GenericItem.tsx
@@ -112,7 +112,11 @@ export function GenericItem(props: {
                         <div class="flex w-full items-center gap-1 text-m-grey-400">
                             <Clock4 class="w-3" />
                             <span class="text-xs text-m-grey-400">
-                                {i18n.t("common.expires", { time: props.due })}
+                                {/* the date might include slashes so we don't want to escape those */}
+                                {i18n.t("common.expires", {
+                                    time: props.due,
+                                    interpolation: { escapeValue: false }
+                                })}
                             </span>
                         </div>
                     </Show>

diff --git a/src/utils/prettyPrintTime.ts b/src/utils/prettyPrintTime.ts
@@ -63,6 +63,8 @@ export function veryShortTimeStamp(ts?: number | bigint) {
         return `${elapsedHours}h`;
     } else if (elapsedDays < 7) {
         return `${elapsedDays}d`;
+    } else if (elapsedDays < 30) {
+        return `${Math.floor(elapsedDays / 7)}w`;
     } else {
         const date = new Date(timestamp);
         const day = String(date.getDate()).padStart(2, "0");