@africanies/angular-web-sdk 0.1.6 → 0.1.8

package/libs/africanies-core/src/index.ts

@@ -212,6 +212,7 @@ export {
 export {
   mapNotification,
   mapNotificationInboxItem,
+  isNotificationExternalLink,
   mapNotificationList,
   mapNotificationPayload,
   NOTIFICATION_READ_PATH,

package/libs/africanies-core/src/lib/notification/index.ts

@@ -7,4 +7,4 @@ export {
   NOTIFICATION_UPDATE_PATH,
 } from './notification.mapper';
 export { NotificationService } from './notification.service';
-export { resolveNotificationLinkForMode } from './notification-link';
+export { isNotificationExternalLink, resolveNotificationLinkForMode } from './notification-link';

package/libs/africanies-core/src/lib/notification/notification-link.spec.ts

@@ -1,25 +1,58 @@
-import { resolveNotificationLinkForMode } from './notification-link';
+import {
+  isNotificationExternalLink,
+  resolveNotificationLinkForMode,
+} from './notification-link';
 
 describe('resolveNotificationLinkForMode', () => {
   const exportLink =
     'https://test-admin-export.africaniestest.com/portal/customer/deliveries?page=1&shipment_app=shipfromnaija';
 
-  it('rewrites export links for STN import mode', () => {
+  it('preserves shipment_app and strips legacy host to a relative portal path', () => {
     expect(resolveNotificationLinkForMode(exportLink, 'stn')).toBe(
-      'https://test-admin-import.africaniestest.com/portal/customer/deliveries?page=1&shipment_app=shiptonaija',
+      '/portal/customer/deliveries?page=1&shipment_app=shipfromnaija',
     );
   });
 
-  it('rewrites import links for SFN export mode', () => {
+  it('preserves shipment_app on import portal links', () => {
     const importLink =
       'https://test-customer-import.africaniestest.com/portal/shipment/track-shipment/items/90?shipment_app=shiptonaija';
 
     expect(resolveNotificationLinkForMode(importLink, 'sfn')).toBe(
-      'https://test-customer-export.africaniestest.com/portal/shipment/track-shipment/items/90?shipment_app=shipfromnaija',
+      '/portal/shipment/track-shipment/items/90?shipment_app=shiptonaija',
+    );
+  });
+
+  it('leaves relative portal links with shipment_app unchanged', () => {
+    expect(resolveNotificationLinkForMode(exportLink, 'sfn')).toBe(
+      '/portal/customer/deliveries?page=1&shipment_app=shipfromnaija',
+    );
+  });
+
+  it('strips shipment_app from S3 export links', () => {
+    const url =
+      'https://africanies-staging-test.s3.amazonaws.com/var/www/html/storage/tmp/payouts.xlsx?X-Amz-Signature=abc&shipment_app=shipfromnaija';
+
+    expect(resolveNotificationLinkForMode(url, 'sfn')).toBe(
+      'https://africanies-staging-test.s3.amazonaws.com/var/www/html/storage/tmp/payouts.xlsx?X-Amz-Signature=abc',
     );
   });
 
-  it('leaves SFN export links unchanged when mode is SFN', () => {
-    expect(resolveNotificationLinkForMode(exportLink, 'sfn')).toBe(exportLink);
+  it('adds shipment_app when missing on absolute portal URLs', () => {
+    const link =
+      'https://test-admin-export.africaniestest.com/portal/customer/deliveries?page=1';
+
+    expect(resolveNotificationLinkForMode(link, 'stn')).toBe(
+      'https://test-admin-import.africaniestest.com/portal/customer/deliveries?page=1&shipment_app=shiptonaija',
+    );
+  });
+});
+
+describe('isNotificationExternalLink', () => {
+  it('treats S3 spreadsheet exports as external', () => {
+    expect(
+      isNotificationExternalLink(
+        'https://africanies-staging-test.s3.amazonaws.com/tmp/export.xlsx?X-Amz-Signature=abc',
+      ),
+    ).toBe(true);
   });
 });

package/libs/africanies-core/src/lib/notification/notification-link.ts

@@ -7,26 +7,68 @@ const SHIPMENT_APP_BY_MODE: Record<ShippingMode, string> = {
   sfn: 'shipfromnaija',
 };
 
+const QUERY_SHIPMENT_APP = 'shipment_app';
+
+const LEGACY_PORTAL_HOST =
+  /^(?:test-)?(?:admin|customer)-(?:export|import)\.africaniestest\.com$/i;
+
+/** Signed export downloads and other hosts that must not be rewritten in-app. */
+export function isNotificationExternalLink(link: string): boolean {
+  const trimmed = decodeNotificationLink(link).trim();
+  if (!trimmed) {
+    return false;
+  }
+  try {
+    const url = new URL(trimmed);
+    if (/\.(xlsx|xls|csv)(\?|$)/i.test(url.pathname)) {
+      return true;
+    }
+    if (/\.amazonaws\.com$/i.test(url.hostname)) {
+      return true;
+    }
+    return !isLegacyPortalHost(url.hostname);
+  } catch {
+    return false;
+  }
+}
+
 /**
- * Rewrite a notification portal URL for the active {@link ShippingMode}.
+ * Rewrite a notification href for the active {@link ShippingMode}.
  *
- * Swaps `-export` / `-import` host segments and sets `shipment_app` to
- * `shipfromnaija` (SFN) or `shiptonaija` (STN).
- * @param link
- * @param mode
+ * - Export / download URLs (S3, spreadsheets) pass through unchanged (no `shipment_app`).
+ * - Legacy portal hosts become relative `/portal/...` paths with query preserved.
+ * - When the notification already includes `shipment_app`, it is kept as-is.
+ * - Otherwise classic host / `shipment_app` rewriting applies for portal URLs.
  */
 export function resolveNotificationLinkForMode(
   link: string | null | undefined,
   mode: ShippingMode,
 ): string {
-  const trimmed = asString(link).trim();
+  const trimmed = decodeNotificationLink(asString(link)).trim();
   if (!trimmed) {
     return trimmed;
   }
 
+  if (isNotificationExternalLink(trimmed)) {
+    return stripShipmentAppFromLink(trimmed);
+  }
+
+  const relativePortal = toRelativePortalNotificationLink(trimmed);
+  if (relativePortal && hasShipmentAppQuery(relativePortal)) {
+    return relativePortal;
+  }
+
+  const relative = normalizeRelativePortalLink(trimmed);
+  if (relative && hasShipmentAppQuery(relative)) {
+    return relative;
+  }
+
   try {
     const url = new URL(trimmed);
-    url.searchParams.set('shipment_app', SHIPMENT_APP_BY_MODE[mode]);
+    if (url.searchParams.has(QUERY_SHIPMENT_APP)) {
+      return trimmed;
+    }
+    url.searchParams.set(QUERY_SHIPMENT_APP, SHIPMENT_APP_BY_MODE[mode]);
     url.hostname = rewriteNotificationHostForMode(url.hostname, mode);
     return url.toString();
   } catch {
@@ -48,6 +90,10 @@ function rewriteNotificationLinkFallback(
   link: string,
   mode: ShippingMode,
 ): string {
+  if (hasShipmentAppQuery(link)) {
+    return link;
+  }
+
   let out = link.replace(
     /shipment_app=(?:shipfromnaija|shiptonaija)/gi,
     `shipment_app=${SHIPMENT_APP_BY_MODE[mode]}`,
@@ -63,3 +109,93 @@ function rewriteNotificationLinkFallback(
   }
   return out.replace(/-import/gi, '-export');
 }
+
+function toRelativePortalNotificationLink(link: string): string | null {
+  try {
+    const url = new URL(link);
+    if (!isLegacyPortalHost(url.hostname)) {
+      return null;
+    }
+
+    let path = url.pathname.replace(/^\/+/, '');
+    if (path.startsWith('ng/portal/')) {
+      path = path.slice('ng/'.length);
+    }
+    if (!path.startsWith('portal/') && path !== 'portal') {
+      return null;
+    }
+
+    const query = url.searchParams.toString();
+    return `/${path}${query ? `?${query}` : ''}`;
+  } catch {
+    return null;
+  }
+}
+
+function normalizeRelativePortalLink(link: string): string | null {
+  let path = link.split('?')[0]?.split('#')[0] ?? '';
+  const query = link.includes('?') ? link.slice(link.indexOf('?')) : '';
+  path = path.replace(/^\/+/, '');
+  if (path.startsWith('ng/portal/')) {
+    path = path.slice('ng/'.length);
+  }
+  if (!path.startsWith('portal/') && path !== 'portal') {
+    return null;
+  }
+  return `/${path}${query}`;
+}
+
+function stripShipmentAppFromLink(link: string): string {
+  const trimmed = link.trim();
+  if (!trimmed) {
+    return trimmed;
+  }
+  try {
+    const url = new URL(trimmed);
+    if (!url.searchParams.has(QUERY_SHIPMENT_APP)) {
+      return trimmed;
+    }
+    url.searchParams.delete(QUERY_SHIPMENT_APP);
+    return url.toString();
+  } catch {
+    const params = new URLSearchParams(
+      trimmed.includes('?') ? trimmed.slice(trimmed.indexOf('?') + 1) : '',
+    );
+    if (!params.has(QUERY_SHIPMENT_APP)) {
+      return trimmed;
+    }
+    params.delete(QUERY_SHIPMENT_APP);
+    const query = params.toString();
+    const base = trimmed.split('?')[0] ?? trimmed;
+    return query ? `${base}?${query}` : base;
+  }
+}
+
+function hasShipmentAppQuery(link: string): boolean {
+  try {
+    const query = link.includes('?') ? link.slice(link.indexOf('?') + 1) : '';
+    return new URLSearchParams(query).has(QUERY_SHIPMENT_APP);
+  } catch {
+    return /(?:^|[?&])shipment_app=/i.test(link);
+  }
+}
+
+function decodeNotificationLink(link: string): string {
+  let value = (link ?? '').trim();
+  if (!value.includes('%')) {
+    return value;
+  }
+  try {
+    const decoded = decodeURIComponent(value);
+    if (decoded !== value) {
+      value = decoded;
+    }
+  } catch {
+    // Keep original when not valid URI encoding.
+  }
+  return value;
+}
+
+function isLegacyPortalHost(hostname: string): boolean {
+  return LEGACY_PORTAL_HOST.test(hostname);
+}

package/libs/africanies-icons/src/assets/icons.sprite.svg

@@ -744,6 +744,13 @@
 <path d="M14 8H10C9.5 8 9 8.5 9 9V13C9 13.5 9.5 14 10 14V20H14V14C14.5 14 15 13.5 15 13V9C15 8.5 14.5 8 14 8Z" fill="currentColor"/></symbol>
 <symbol id="hammer" viewBox="0 0 24 24"><path d="M9.99707 6L16.9971 13L19.9971 10L15.5171 5.52C15.5171 5.52 12.5471 6.55 10.9971 5L9.99707 6Z" fill="currentColor"/>
 <path d="M12.797 9.79004L4.267 18.31C4.102 18.488 4 18.727 4 18.99C4 19.253 4.101 19.492 4.267 19.671C4.448 19.854 4.7 19.968 4.978 19.968C5.231 19.968 5.462 19.874 5.638 19.72L14.207 11.201L12.797 9.79004Z" fill="currentColor"/></symbol>
+<symbol id="hand-coins" viewBox="0 0 16 15"><path
+    fill-rule="evenodd"
+    clip-rule="evenodd"
+    d="M0.142433 5.8125C0.142433 6.8115 0.394433 7.74975 0.836933 8.5695C0.62996 8.65739 0.447722 8.79474 0.30621 8.96949C0.164697 9.14424 0.0682364 9.35105 0.0252912 9.57178C-0.0176541 9.7925 -0.00577094 10.0204 0.0598977 10.2354C0.125566 10.4505 0.243013 10.6462 0.401933 10.8053L3.64643 14.049C3.95198 14.3546 4.32385 14.5858 4.73318 14.7244C5.14251 14.8631 5.57829 14.9055 6.00668 14.8485L10.4924 14.25H12.8924V15H15.5174V13.875H14.0174V8.25H15.5174V7.125H12.8924V7.875H11.3909C11.7249 6.99496 11.8402 6.04697 11.7269 5.11253C11.6135 4.17809 11.2749 3.28516 10.7402 2.51051C10.2054 1.73585 9.49058 1.10266 8.65704 0.665352C7.8235 0.228047 6.89622 -0.00028052 5.95493 2.58646e-07C4.41336 2.58646e-07 2.93493 0.612387 1.84488 1.70244C0.75482 2.7925 0.142433 4.27093 0.142433 5.8125ZM5.95493 1.125C5.0719 1.12517 4.20686 1.37472 3.45942 1.84492C2.71198 2.31512 2.11253 2.98685 1.73009 3.78277C1.34765 4.57869 1.19776 5.46644 1.29769 6.3438C1.39762 7.22116 1.7433 8.05247 2.29493 8.742L4.64768 9.7995C4.6685 9.54613 4.74629 9.30073 4.87525 9.08164C5.00421 8.86255 5.18101 8.67542 5.39243 8.53425V8.25H4.64243V7.125H6.14243C6.24189 7.125 6.33727 7.08549 6.4076 7.01517C6.47792 6.94484 6.51743 6.84946 6.51743 6.75C6.51743 6.65054 6.47792 6.55516 6.4076 6.48483C6.33727 6.41451 6.24189 6.375 6.14243 6.375H5.76743C5.40208 6.37536 5.04916 6.24237 4.77491 6.00099C4.50066 5.7596 4.32393 5.42642 4.2779 5.06398C4.23187 4.70155 4.3197 4.33477 4.52491 4.03249C4.73012 3.73022 5.03859 3.51323 5.39243 3.42225V2.625H6.51743V3.375H7.26743V4.5H5.76743C5.66798 4.5 5.57259 4.53951 5.50227 4.60984C5.43194 4.68016 5.39243 4.77554 5.39243 4.875C5.39243 4.97446 5.43194 5.06984 5.50227 5.14017C5.57259 5.21049 5.66798 5.25 5.76743 5.25H6.14243C6.50778 5.24964 6.8607 5.38263 7.13496 5.62402C7.40921 5.8654 7.58593 6.19858 7.63196 6.56102C7.67799 6.92345 7.59016 7.29023 7.38495 7.59251C7.17975 7.89478 6.87127 8.11177 6.51743 8.20275V8.25H9.23843L10.1249 7.9545C10.4921 7.23989 10.6693 6.44291 10.6398 5.64006C10.6102 4.8372 10.3748 4.05542 9.95615 3.36973C9.53748 2.68405 8.94961 2.11748 8.24894 1.72439C7.54827 1.33131 6.75833 1.12491 5.95493 1.125ZM5.62343 11.4705L1.47593 9.60675C1.42279 9.58303 1.36303 9.57868 1.30701 9.59444C1.25099 9.6102 1.20227 9.64509 1.16929 9.69304C1.13632 9.74098 1.12118 9.79897 1.1265 9.85691C1.13182 9.91486 1.15727 9.96911 1.19843 10.0103L4.44143 13.2533C4.6248 13.4368 4.84801 13.5756 5.09372 13.6588C5.33943 13.7421 5.60103 13.7675 5.85818 13.7333L10.4182 13.125H12.8924V9H10.5464L9.42143 9.375H6.32993C6.18075 9.375 6.03767 9.43426 5.93219 9.53975C5.8267 9.64524 5.76743 9.78832 5.76743 9.9375C5.76743 10.0867 5.8267 10.2298 5.93219 10.3352C6.03767 10.4407 6.18075 10.5 6.32993 10.5H9.56243L10.4774 11.415L9.68243 12.21L9.09743 11.625H6.32993C6.07793 11.625 5.83793 11.5695 5.62343 11.4705Z"
+    fill="currentColor"
+   
+  /></symbol>
 <symbol id="hand" viewBox="0 0 24 24"><path d="M17.4612 6.45C17.0612 6.05 16.4612 5.95 15.9612 6.15C15.9612 5.85 15.8612 5.55 15.5612 5.25C15.3612 5.05 14.9612 4.85 14.4612 4.85C14.1612 4.85 13.9612 4.95 13.7612 4.95C13.7612 4.75 13.6612 4.65 13.5612 4.45C13.0612 3.85 12.0612 3.85 11.5612 4.45C11.3612 4.65 11.1612 4.85 11.1612 5.05C10.9612 5.05 10.7612 4.95 10.5612 4.95C10.0612 4.95 9.76122 5.15 9.46122 5.45C8.96122 5.95 8.96122 6.75 8.96122 6.75V10.55C8.66122 10.25 8.16122 9.75 7.46122 9.75C7.26122 9.75 6.96122 9.85 6.76122 9.95C6.36122 10.15 6.16122 10.45 6.06122 10.85C5.76122 11.85 6.66122 13.25 6.66122 13.35C6.76122 13.45 7.86122 16.05 8.86122 17.15C9.86122 18.35 10.9612 19.05 13.7612 19.05C16.6612 19.05 17.9612 17.45 17.9612 13.95V8.45C17.9612 8.35 18.0612 7.15 17.4612 6.45ZM11.9612 6.05C11.9612 5.75 11.8612 5.05 12.4612 5.05C12.9612 5.05 12.9612 5.55 12.9612 6.05V10.05C12.9612 10.35 13.1612 10.55 13.4612 10.55C13.7612 10.55 13.9612 10.35 13.9612 10.05V6.25C13.9612 6.25 13.9612 5.85 14.4612 5.85C15.0612 5.85 14.9612 6.75 14.9612 6.75V10.05C14.9612 10.35 15.1612 10.55 15.4612 10.55C15.7612 10.55 15.9612 10.35 15.9612 10.05V7.65C15.9612 7.55 15.9612 7.05 16.4612 7.05C16.9612 7.05 16.9612 8.05 16.9612 8.05V13.95C16.9612 17.35 15.6612 18.05 13.7612 18.05C11.3612 18.05 10.4612 17.55 9.66122 16.45C8.76122 15.45 7.56122 12.85 7.56122 12.75C7.26122 12.45 6.86122 11.55 6.96122 11.15C6.96122 11.05 7.06122 10.95 7.16122 10.85C7.26122 10.85 7.36122 10.75 7.36122 10.75C7.76122 10.75 8.16122 11.25 8.26122 11.45L8.86122 12.35C8.96122 12.55 9.26122 12.65 9.46122 12.55C9.86122 12.55 9.96122 12.35 9.96122 12.15V6.95C9.96122 6.55 9.96122 5.95 10.4612 5.95C10.8612 5.95 10.9612 6.25 10.9612 6.75V10.05C10.9612 10.35 11.1612 10.55 11.4612 10.55C11.7612 10.55 11.9612 10.35 11.9612 10.05V6.05Z" fill="currentColor"/></symbol>
 <symbol id="handle-corner" viewBox="0 0 24 24"><path d="M8.4 17.7L17.7 8.4V7L7 17.7H8.4Z" fill="currentColor"/>
 <path d="M11.4 17.7L17.7 11.4V10L10 17.7H11.4Z" fill="currentColor"/>

package/libs/africanies-icons/src/lib/icon-name.ts

@@ -336,6 +336,7 @@ export const ICON_NAMES = [
   'grid',
   'group',
   'hammer',
+  'hand-coins',
   'hand',
   'handle-corner',
   'hands-up',

package/libs/africanies-models/src/lib/filters/configs/seed-configs.ts

@@ -122,7 +122,7 @@ export const updateShipmentsFilterConfig: ModuleFilterConfigModel = {
     },
     {
       key: 'shipment_method_id',
-      label: 'Shipment Carrier',
+      label: 'Shipment Methods',
       type: 'select',
       optionsSource: 'shipmentMethods',
       placeholder: 'Shipment Methods',
@@ -133,6 +133,7 @@ export const updateShipmentsFilterConfig: ModuleFilterConfigModel = {
       type: 'select',
       optionsSource: 'static',
       options: [
+        { value: '', label: 'None' },
         { value: 'individual', label: 'Individual' },
         { value: 'business', label: 'Business' },
       ],
@@ -148,17 +149,20 @@ export const updateShipmentsFilterConfig: ModuleFilterConfigModel = {
     {
       key: 'shipment_manifest_id',
       label: 'Shipment Manifest',
-      type: 'select',
-      optionsSource: 'shipmentManifests',
-      placeholder: 'Shipment Manifest',
+      type: 'enum',
+      exclusive: true,
+      options: [
+        { value: 'not_null', label: 'Manifest Added', color: '#25945c' },
+        { value: 'null', label: 'Manifest Not Added', color: '#667185' },
+      ],
     },
     {
       key: 'api_request',
       label: 'API Request',
       type: 'boolean',
       options: [
-        { value: '1', label: 'Yes' },
-        { value: '0', label: 'No' },
+        { value: '1', label: 'Yes', color: '#25945c' },
+        { value: '0', label: 'No', color: '#FF001C' },
       ],
     },
     {
@@ -166,8 +170,18 @@ export const updateShipmentsFilterConfig: ModuleFilterConfigModel = {
       label: 'Insured',
       type: 'boolean',
       options: [
-        { value: '1', label: 'Yes' },
-        { value: '0', label: 'No' },
+        { value: '1', label: 'Yes', color: '#3B82F6' },
+        { value: '0', label: 'No', color: '#f48220' },
+      ],
+    },
+    {
+      key: 'pay_later',
+      label: 'Pay Later',
+      type: 'enum',
+      exclusive: true,
+      options: [
+        { value: 'credit', label: 'Credit', color: '#25945c' },
+        { value: 'debit', label: 'Debit', color: '#667185' },
       ],
     },
   ],

package/libs/africanies-theme/src/lib/mode-color.safelist.ts

@@ -9,34 +9,52 @@
  * Do not rename these strings without updating ModeColorService and THEME.md.
  *
  * SFN (export / green):
+ * text-export-strong bg-export-strong hover:bg-export-hover border-export-strong
  * text-export bg-export bg-export-subtle bg-export-light border-export
  * hover:bg-export-light hover:bg-export-subtle dark:bg-export/15 dark:hover:bg-export/15
- * dark:bg-[color-mix(in_srgb,#1cbd5d_15%,#212529)]
+ * dark:bg-[color-mix(in_srgb,#1cbd5d_15%,#212529)] dark:bg-export dark:text-export dark:border-export
  *
  * STN (import / orange):
+ * text-import-strong bg-import-strong hover:bg-import-hover border-import-strong
  * text-import bg-import bg-import-subtle bg-import-light border-import
  * hover:bg-import-light hover:bg-import-subtle dark:bg-import/15 dark:hover:bg-import/15
- * dark:bg-[color-mix(in_srgb,#f08829_15%,#212529)]
+ * dark:bg-[color-mix(in_srgb,#f08829_15%,#212529)] dark:bg-import dark:text-import dark:border-import
  */
 export const MODE_COLOR_SAFELIST = [
   'text-export',
+  'text-export-strong',
   'bg-export',
+  'bg-export-strong',
   'bg-export-subtle',
   'bg-export-light',
   'border-export',
+  'border-export-strong',
+  'hover:bg-export-hover',
   'hover:bg-export-light',
   'hover:bg-export-subtle',
   'dark:bg-export/15',
   'dark:hover:bg-export/15',
+  'dark:hover:bg-export-light',
   'dark:bg-[color-mix(in_srgb,#1cbd5d_15%,#212529)]',
+  'dark:bg-export',
+  'dark:text-export',
+  'dark:border-export',
   'text-import',
+  'text-import-strong',
   'bg-import',
+  'bg-import-strong',
   'bg-import-subtle',
   'bg-import-light',
   'border-import',
+  'border-import-strong',
+  'hover:bg-import-hover',
   'hover:bg-import-light',
   'hover:bg-import-subtle',
   'dark:bg-import/15',
   'dark:hover:bg-import/15',
+  'dark:hover:bg-import-light',
   'dark:bg-[color-mix(in_srgb,#f08829_15%,#212529)]',
+  'dark:bg-import',
+  'dark:text-import',
+  'dark:border-import',
 ] as const;

package/libs/africanies-theme/src/lib/mode-color.service.spec.ts

@@ -0,0 +1,55 @@
+import { signal } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+
+import { ShippingModeService } from '@africanies/africanies-core';
+import type { ShippingMode } from '@africanies/africanies-models';
+
+import { ModeColorService } from './mode-color.service';
+
+describe('ModeColorService', () => {
+  let mode: ReturnType<typeof signal<ShippingMode>>;
+  let service: ModeColorService;
+
+  beforeEach(() => {
+    mode = signal<ShippingMode>('sfn');
+    TestBed.configureTestingModule({
+      providers: [
+        ModeColorService,
+        {
+          provide: ShippingModeService,
+          useValue: {
+            mode: mode.asReadonly(),
+          },
+        },
+      ],
+    });
+    service = TestBed.inject(ModeColorService);
+  });
+
+  it('uses accessible export-strong fills and text in SFN light mode', () => {
+    const classes = service.classes();
+    expect(classes.text).toContain('text-export-strong');
+    expect(classes.primary).toContain('bg-export-strong');
+    expect(classes.ghostPrimary).toContain('text-export-strong');
+    expect(classes.activeFill).toContain('bg-export-strong');
+    expect(classes.stroked).toContain('text-export-strong');
+    expect(classes.stroked).toContain('border-export-strong');
+  });
+
+  it('keeps bright export accents for dark-mode companions in SFN', () => {
+    const classes = service.classes();
+    expect(classes.primary).toContain('dark:bg-export');
+    expect(classes.ghostPrimary).toContain('dark:text-export');
+  });
+
+  it('uses accessible import-strong fills and text in STN light mode', () => {
+    mode.set('stn');
+    const classes = service.classes();
+    expect(classes.text).toContain('text-import-strong');
+    expect(classes.primary).toContain('bg-import-strong');
+    expect(classes.ghostPrimary).toContain('text-import-strong');
+    expect(classes.activeFill).toContain('bg-import-strong');
+    expect(classes.stroked).toContain('text-import-strong');
+    expect(classes.primary).not.toContain('bg-export-strong');
+  });
+});

package/libs/africanies-theme/src/lib/mode-color.service.ts

@@ -9,7 +9,7 @@ import { ShippingModeService } from '@africanies/africanies-core';
  * and accent text. Semantic colors (danger / warning) stay mode-independent.
  */
 export interface ModeColorClasses {
-  /** Text color utility, e.g. `text-export`. */
+  /** Accessible accent text — `text-export-strong` in light, `text-export` in dark. */
   text: string;
   /** Solid background utility, e.g. `bg-export`. */
   bg: string;
@@ -42,6 +42,14 @@ export interface ModeColorClasses {
    * Soft hover highlight for menus and lists.
    */
   softHover: string;
+  /**
+   * Active nav leaf / collapsed rail — solid mode fill + white text.
+   */
+  activeFill: string;
+  /**
+   * Stroked secondary CTA — white fill, mode border + text (portal `.btn-stroked`).
+   */
+  stroked: string;
 }
 
 /**
@@ -72,33 +80,41 @@ export class ModeColorService {
     // Literal strings required for Tailwind content detection — do not interpolate.
     if (this.shippingMode.mode() === 'sfn') {
       return {
-        text: 'text-export',
+        text: 'text-export-strong dark:text-export',
         bg: 'bg-export',
         bgSubtle: 'bg-export-subtle',
         border: 'border-export',
         primary:
-          'bg-export text-white border-transparent hover:bg-export-light',
+          'bg-export-strong text-white border-transparent hover:bg-export-hover dark:bg-export dark:hover:bg-export-light',
         ghostPrimary:
-          'bg-transparent text-export border-transparent hover:bg-export-subtle dark:hover:bg-export/15',
+          'bg-transparent text-export-strong border-transparent hover:bg-export-subtle dark:text-export dark:hover:bg-export/15',
         soft: 'bg-export-subtle dark:bg-export/15',
         softSolid:
           'bg-export-subtle dark:bg-[color-mix(in_srgb,#1cbd5d_15%,#212529)]',
         softHover: 'hover:bg-export-subtle dark:hover:bg-export/15',
+        activeFill:
+          'bg-export-strong text-white border-transparent hover:bg-export-hover dark:bg-export dark:text-white dark:hover:bg-export-light',
+        stroked:
+          'bg-surface text-export-strong border-export-strong hover:bg-export-subtle dark:bg-ink-950 dark:text-export dark:border-export dark:hover:bg-export/15',
       };
     }
     return {
-      text: 'text-import',
+      text: 'text-import-strong dark:text-import',
       bg: 'bg-import',
       bgSubtle: 'bg-import-subtle',
       border: 'border-import',
       primary:
-        'bg-import text-white border-transparent hover:bg-import-light',
+        'bg-import-strong text-white border-transparent hover:bg-import-hover dark:bg-import dark:hover:bg-import-light',
       ghostPrimary:
-        'bg-transparent text-import border-transparent hover:bg-import-subtle dark:hover:bg-import/15',
+        'bg-transparent text-import-strong border-transparent hover:bg-import-subtle dark:text-import dark:hover:bg-import/15',
       soft: 'bg-import-subtle dark:bg-import/15',
       softSolid:
         'bg-import-subtle dark:bg-[color-mix(in_srgb,#f08829_15%,#212529)]',
       softHover: 'hover:bg-import-subtle dark:hover:bg-import/15',
+      activeFill:
+        'bg-import-strong text-white border-transparent hover:bg-import-hover dark:bg-import dark:text-white dark:hover:bg-import-light',
+      stroked:
+        'bg-surface text-import-strong border-import-strong hover:bg-import-subtle dark:bg-ink-950 dark:text-import dark:border-import dark:hover:bg-import/15',
     };
   });
 }