refactor: restructure navigation into 5 grouped hubs, off the 22-item flat strip
Implements the researched IA fix: mobile nav UX consensus caps primary destinations at 4-5 (uxpin.com, fintech/banking 2026 UX research), and this app had grown to 22 tabs in one horizontally-scrolling row — exactly the anti-pattern that research flags for choice paralysis and slower task completion. New structure — 5 bottom-nav hubs, grouped by what the user is actually trying to do, not build order: - Home: Coverage (unchanged, still the landing screen) - Estate: Assets, Faraid, Insurance, Wassiyah, Hibah, Family Waqf, Nominate, Claims (H2) - Giving: Zakat, Sadaqah, Khairat - Family: Tree, Trigger, Mutawalli, Manage (was 'Family', renamed to avoid colliding with the hub's own label), Neighbourhood - Daily: Prayer Times, Qibla, Quran, Locate Each hub reveals its own sub-nav one tap in, instead of every tab competing for space in a single row. Settings moved out of the tab strip entirely into a header gear icon, matching the banking-app pattern of keeping settings out of primary thumb-reach real estate. The bottom nav is now fixed (thumb-zone), sub-nav keeps the old sticky-top position. Cross-component navigation (nav.js requestedTab, used by the Family Tree's 'give sadaqah in memory' link) now resolves a tab label to its owning (hub, sub-tab) pair instead of a flat index — verified live. This touches every E2E suite: a single click on a tab's old selector no longer reaches it (hub, then sub-tab). Added a shared gotoTab(page, label) helper to e2e-auth-helper.cjs encapsulating the two-step navigation, and migrated all ~22 affected test files off direct nav-button selectors — mechanical substitution followed by manual fixes for local clickTab wrappers, template-literal selectors, and active-state assertions that needed to target the new .hub-tab/.subnav structure specifically. Full regression after migration: every suite passes (one isolated Family Tree flake confirmed clean on rerun, unrelated to navigation).
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
// effects on Wassiyah/will document/Zakat currency, and the professional
|
||||
// review request workflow against the live backend.
|
||||
const { chromium } = require('playwright');
|
||||
const { signInFreshFamily } = require('./e2e-auth-helper.cjs');
|
||||
const { signInFreshFamily, gotoTab } = require('./e2e-auth-helper.cjs');
|
||||
const BASE = 'https://moslem04.falahos.my/';
|
||||
const results = [];
|
||||
const consoleErrors = [];
|
||||
@@ -17,7 +17,7 @@ async function main() {
|
||||
await signInFreshFamily(page, BASE, 'e2e-jurisdiction');
|
||||
|
||||
// ── Settings: jurisdiction selector, owner can change ──
|
||||
await page.locator('nav button[aria-label="Settings"]').click();
|
||||
await gotoTab(page, 'Settings');
|
||||
await page.waitForTimeout(600);
|
||||
const jurisdictionSelectVisible = await page.locator('.jurisdiction-setting select').isVisible().catch(() => false);
|
||||
record('Settings: jurisdiction selector visible for owner', jurisdictionSelectVisible);
|
||||
@@ -28,7 +28,7 @@ async function main() {
|
||||
record('Settings: changing jurisdiction shows a saved confirmation', savedBadge);
|
||||
|
||||
// ── Zakat: currency defaults follow the family jurisdiction (SGD) ──
|
||||
await page.locator('nav button[aria-label="Zakat"]').click();
|
||||
await gotoTab(page, 'Zakat');
|
||||
await page.waitForTimeout(800);
|
||||
const sgdLabelVisible = await page.locator('.field:has-text("Cash")').textContent();
|
||||
record('Zakat: currency label reflects Singapore jurisdiction (SGD)', sgdLabelVisible.includes('SGD'), sgdLabelVisible);
|
||||
@@ -37,7 +37,7 @@ async function main() {
|
||||
|
||||
// Log an asset first so the one-third cap isn't zero (a fresh family with
|
||||
// no assets has cap=0, which would make any bequest below "exceed" it).
|
||||
await page.locator('nav button[aria-label="Assets"]').click();
|
||||
await gotoTab(page, 'Assets');
|
||||
await page.waitForTimeout(500);
|
||||
await page.locator('.form-card .field:has-text("Description") input').fill('Savings');
|
||||
await page.locator('.form-card .field:has-text("Estimated value") input').fill('30000');
|
||||
@@ -45,7 +45,7 @@ async function main() {
|
||||
await page.waitForTimeout(1000);
|
||||
|
||||
// ── Wassiyah: jurisdiction dropdown includes Singapore, defaults from family setting ──
|
||||
await page.locator('nav button[aria-label="Wassiyah"]').click();
|
||||
await gotoTab(page, 'Wassiyah');
|
||||
await page.waitForTimeout(800);
|
||||
const wassiyahJurisdiction = await page.locator('.field:has-text("Jurisdiction") select').inputValue();
|
||||
record('Wassiyah: jurisdiction defaults to the family setting (SG)', wassiyahJurisdiction === 'SG', wassiyahJurisdiction);
|
||||
@@ -86,7 +86,7 @@ async function main() {
|
||||
record('Wassiyah: marking reviewed records the reviewer name', reviewedVisible);
|
||||
|
||||
// Review status surfaces on the Mutawalli dashboard (owner-only family — owner sees own row)
|
||||
await page.locator('nav button[aria-label="Mutawalli"]').click();
|
||||
await gotoTab(page, 'Mutawalli');
|
||||
await page.waitForTimeout(800);
|
||||
const mutawalliReviewBadge = await page.locator('.review-badge.review-reviewed').isVisible().catch(() => false);
|
||||
const mutawalliGated = (await page.locator('.module').innerText()).includes('Only the mutawalli');
|
||||
@@ -95,7 +95,7 @@ async function main() {
|
||||
// ── Isolation: a different family (same account) is unaffected by this jurisdiction change ──
|
||||
const isolationPage = await browser.newPage({ viewport: { width: 390, height: 844 } });
|
||||
await signInFreshFamily(isolationPage, BASE, 'e2e-jurisdiction-isolation');
|
||||
await isolationPage.locator('nav button[aria-label="Settings"]').click();
|
||||
await gotoTab(isolationPage, 'Settings');
|
||||
await isolationPage.waitForTimeout(600);
|
||||
const isolatedJurisdiction = await isolationPage.locator('.jurisdiction-setting select').inputValue();
|
||||
record('Isolation: a different family defaults to MY, unaffected by the SG change above', isolatedJurisdiction === 'MY', isolatedJurisdiction);
|
||||
|
||||
Reference in New Issue
Block a user