Locker module UI: dashboard, class master, locker list, waiting list, allotment form

angular.json

@@ -31,8 +31,6 @@
               "@angular/localize/init"
             ],
             "assets": [
-              "src/favicon.ico",
-              "src/apple-touch-icon.png",
               "src/assets/images/cbsnexora-favicon.svg",
               "src/robots.txt",
               "src/manifest.json",
@@ -41,11 +39,6 @@
                 "glob": "**/*",
                 "input": "node_modules/tinymce",
                 "output": "assets/tinymce"
-              },
-              {
-                "glob": "lottie.min.js",
-                "input": "node_modules/lottie-web/build/player",
-                "output": "assets/js"
               }
             ],
             "styles": [

package.json

@@ -15,7 +15,7 @@
     "ng": "ng",
     "build": "node version.js && npm run env -s && ng build --configuration production --output-hashing=none",
     "build:prod": "node version.js && node --max-old-space-size=16384 ./node_modules/@angular/cli/bin/ng build --configuration production --output-hashing=none --base-href=/web-app/",
-    "start": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=4096\" ng serve --proxy-config proxy.localhost.conf.js",
+    "start": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --proxy-config proxy.localhost.conf.js",
     "start:share": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --host 0.0.0.0 --proxy-config proxy.localhost.conf.js",
     "start:demo": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --proxy-config proxy.conf.js",
     "serve:dev": "npm run env -s && cross-env NODE_OPTIONS=\"--max_old_space_size=16384\" ng serve --source-map --proxy-config proxy.localhost.conf.js",
@@ -71,7 +71,6 @@
     "jspdf-autotable": "^5.0.2",
     "lightgallery": "^2.9.0",
     "lodash": "4.17.23",
-    "lottie-web": "^5.13.0",
     "moment": "^2.29.4",
     "ngx-image-cropper": "^9.1.6",
     "ngx-mat-select-search": "^8.0.2",

src/app/account-transfers/view-account-transfer/view-account-transfer.component.html

@@ -7,6 +7,16 @@
 -->
 
 <div class="container">
+  <div class="container m-b-20 align-end gap-2px">
+    @if (!viewAccountTransferData.reversed) {
+      <span>
+        <button mat-raised-button color="warn" *mifosxHasPermission="'ADJUST_ACCOUNTTRANSFER'">
+          <fa-icon icon="undo" class="m-r-10"></fa-icon>{{ 'labels.buttons.Undo' | translate }}
+        </button>
+      </span>
+    }
+  </div>
+
   <mat-card>
     <mat-card-content>
       <div class="transfer-container">

src/app/accounting/search-journal-entry/search-journal-entry.component.html

@@ -279,7 +279,7 @@
     <div class="gl-fgroup">
       <label class="gl-flabel"><fa-icon icon="calendar-alt"></fa-icon> From Date</label>
       <mat-form-field appearance="outline" class="gl-ffield">
-        <input matInput [matDatepicker]="dpFrom" [min]="minDate" [formControl]="transactionDateFrom" />
+        <input matInput [matDatepicker]="dpFrom" [min]="minDate" [max]="maxDate" [formControl]="transactionDateFrom" />
         <mat-datepicker-toggle matSuffix [for]="dpFrom"></mat-datepicker-toggle>
         <mat-datepicker #dpFrom></mat-datepicker>
       </mat-form-field>
@@ -288,7 +288,7 @@
     <div class="gl-fgroup">
       <label class="gl-flabel"><fa-icon icon="calendar-alt"></fa-icon> To Date</label>
       <mat-form-field appearance="outline" class="gl-ffield">
-        <input matInput [matDatepicker]="dpTo" [min]="minDate" [formControl]="transactionDateTo" />
+        <input matInput [matDatepicker]="dpTo" [min]="minDate" [max]="maxDate" [formControl]="transactionDateTo" />
         <mat-datepicker-toggle matSuffix [for]="dpTo"></mat-datepicker-toggle>
         <mat-datepicker #dpTo></mat-datepicker>
       </mat-form-field>
@@ -353,7 +353,13 @@
       <div class="gl-fgroup">
         <label class="gl-flabel"><fa-icon icon="calendar-check"></fa-icon> Submitted From</label>
         <mat-form-field appearance="outline" class="gl-ffield">
-          <input matInput [matDatepicker]="dpSubFrom" [min]="minDate" [formControl]="submittedOnDateFrom" />
+          <input
+            matInput
+            [matDatepicker]="dpSubFrom"
+            [min]="minDate"
+            [max]="maxDate"
+            [formControl]="submittedOnDateFrom"
+          />
           <mat-datepicker-toggle matSuffix [for]="dpSubFrom"></mat-datepicker-toggle>
           <mat-datepicker #dpSubFrom></mat-datepicker>
         </mat-form-field>
@@ -362,7 +368,7 @@
       <div class="gl-fgroup">
         <label class="gl-flabel"><fa-icon icon="calendar-check"></fa-icon> Submitted To</label>
         <mat-form-field appearance="outline" class="gl-ffield">
-          <input matInput [matDatepicker]="dpSubTo" [min]="minDate" [formControl]="submittedOnDateTo" />
+          <input matInput [matDatepicker]="dpSubTo" [min]="minDate" [max]="maxDate" [formControl]="submittedOnDateTo" />
           <mat-datepicker-toggle matSuffix [for]="dpSubTo"></mat-datepicker-toggle>
           <mat-datepicker #dpSubTo></mat-datepicker>
         </mat-form-field>
@@ -533,7 +539,7 @@
   </div>
 
   <div class="gl-table-shell">
-    <mat-table [dataSource]="dataSource" matSort matSortActive="id" matSortDirection="desc" class="gl-mat-table">
+    <mat-table [dataSource]="dataSource" matSort class="gl-mat-table">
       <!-- #ID -->
       <ng-container matColumnDef="id">
         <mat-header-cell *matHeaderCellDef mat-sort-header class="gl-th">#</mat-header-cell>

src/app/accounting/search-journal-entry/search-journal-entry.component.ts

@@ -90,7 +90,7 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
 
   // ── Misc ──────────────────────────────────────────────────────────────────
   minDate = new Date(2000, 0, 1);
-  maxDate: Date = null;
+  maxDate = new Date();
   /** Accounting features switched off for this installation — see disabled-features.ts. */
   disabledFeatures = DISABLED_ACCOUNTING_FEATURES;
 
@@ -208,7 +208,7 @@ export class SearchJournalEntryComponent implements OnInit, OnDestroy, AfterView
   }
 
   ngOnInit() {
-    this.maxDate = null;
+    this.maxDate = this.settingsService.businessDate;
     this.paginator.pageSize = 10;
     this.restoreState();
     this.setFilteredOffices();

src/app/accounts/accounts.service.ts

@@ -74,22 +74,6 @@ export class AccountsService {
     return this.http.get('/fixeddepositaccounts', { params: httpParams });
   }
 
-  /**
-   * FD Dashboard's data source: every ACTIVE FD, id/account/client/product identity, maturity date
-   * and deposit/maturity amounts only. Deliberately a separate, narrow endpoint rather than
-   * getFixedDepositAccounts() above -- that one's backend query joins in six more tables (audit
-   * who-did-what-when, currency, tax group) an unbounded dashboard fetch does not need, over columns
-   * that had no index until this feature added one (see backend migration 0571).
-   */
-  getFixedDepositMaturityDashboard(): Observable<any> {
-    return this.http.get('/fixeddepositaccounts/maturity-dashboard');
-  }
-
-  /** RD Dashboard: running RDs with their installment position, closures and penalty income for the month. */
-  getRecurringDepositDashboard(): Observable<any> {
-    return this.http.get('/recurringdepositaccounts/dashboard');
-  }
-
   getRecurringDepositAccounts(params: AccountListParams = {}): Observable<any> {
     let httpParams = new HttpParams()
       .set('paged', 'true')

src/app/app.module.ts

@@ -37,6 +37,7 @@ import { GroupsModule } from './groups/groups.module';
 import { CentersModule } from './centers/centers.module';
 import { AccountingModule } from './accounting/accounting.module';
 import { ChequeBookModule } from './chequebook/chequebook.module';
+import { LockerModule } from './locker/locker.module';
 import { CtsClearingModule } from './ctsclearing/ctsclearing.module';
 import { NachClearingModule } from './nachclearing/nachclearing.module';
 import { SystemModule } from './system/system.module';
@@ -63,8 +64,6 @@ import { CfcfrmsModule } from './cfcfrms/cfcfrms.module';
 import { BankCalendarModule } from './bank-calendar/bank-calendar.module';
 import { DeafModule } from './deaf/deaf.module';
 import { SavingsDailyInterestModule } from './savings-daily-interest/savings-daily-interest.module';
-import { FdDashboardModule } from './fd-dashboard/fd-dashboard.module';
-import { RdDashboardModule } from './rd-dashboard/rd-dashboard.module';
 import { DicgcModule } from './dicgc/dicgc.module';
 import { FiuModule } from './fiu/fiu.module';
 import { GlReportsModule } from './gl-reports/gl-reports.module';
@@ -97,7 +96,6 @@ import { TokenInterceptor as ZitadelTokenInterceptor } from './zitadel/token.int
 import { AuthService } from './zitadel/auth.service';
 import { environment } from '../environments/environment';
 import { CallbackComponent } from './zitadel/callback/callback.component';
-import { LoadingScreenComponent } from './shared/loading-screen/loading-screen.component';
 import { OAuthModule } from 'angular-oauth2-oidc';
 
 export class CustomMissingTranslationHandler implements MissingTranslationHandler {
@@ -157,6 +155,7 @@ export function HttpLoaderFactory(http: HttpClient) {
     CentersModule,
     AccountingModule,
     ChequeBookModule,
+    LockerModule,
     CtsClearingModule,
     NachClearingModule,
     SystemModule,
@@ -179,8 +178,6 @@ export function HttpLoaderFactory(http: HttpClient) {
     BankCalendarModule,
     DeafModule,
     SavingsDailyInterestModule,
-    FdDashboardModule,
-    RdDashboardModule,
     DicgcModule,
     FiuModule,
     GlReportsModule,
@@ -198,7 +195,6 @@ export function HttpLoaderFactory(http: HttpClient) {
     AppRoutingModule,
     NotFoundComponent,
     CallbackComponent,
-    LoadingScreenComponent,
     OAuthModule.forRoot()
   ],
   providers: [

src/app/bank-calendar/bank-calendar.component.html

@@ -44,11 +44,8 @@
     <div class="cal-stat sat2nd4th">
       <fa-icon icon="calendar-times" class="cal-stat__icon"></fa-icon>
       <div class="cal-stat__info">
-        <div class="cal-stat__value">{{ overallStats.sat2nd4th + overallStats.weeklyOff }}</div>
-        <div class="cal-stat__label">
-          {{ saturdayIsWorkingDay ? '2nd & 4th Sat' : 'Saturdays'
-          }}{{ overallStats.weeklyOff > 0 ? ' / Weekly Off' : '' }}
-        </div>
+        <div class="cal-stat__value">{{ overallStats.sat2nd4th }}</div>
+        <div class="cal-stat__label">2nd &amp; 4th Sat</div>
       </div>
     </div>
     <div class="cal-stat holidays">
@@ -72,11 +69,7 @@
     <div class="cal-legend__items">
       <div class="cal-legend__item"><span class="cal-legend__dot working"></span> Working Day</div>
       <div class="cal-legend__item"><span class="cal-legend__dot sunday"></span> Sunday</div>
-      <div class="cal-legend__item">
-        <span class="cal-legend__dot sat2nd4th"></span>
-        {{ saturdayIsWorkingDay ? '2nd / 4th Saturday' : 'Saturday'
-        }}{{ overallStats.weeklyOff > 0 ? ' / Weekly Off' : '' }}
-      </div>
+      <div class="cal-legend__item"><span class="cal-legend__dot sat2nd4th"></span> 2nd / 4th Saturday</div>
       <div class="cal-legend__item"><span class="cal-legend__dot holiday"></span> Holiday</div>
       <div class="cal-legend__item"><span class="cal-legend__dot today"></span> Today</div>
     </div>
@@ -326,9 +319,7 @@
               [class.cal-grid__day--other]="!day.isCurrentMonth"
               [class.cal-grid__day--today]="day.isToday"
               [class.cal-grid__day--sunday]="day.isSunday && day.isCurrentMonth"
-              [class.cal-grid__day--sat2nd4th]="
-                (day.is2ndSaturday || day.is4thSaturday || day.isWeeklyOff) && day.isCurrentMonth
-              "
+              [class.cal-grid__day--sat2nd4th]="(day.is2ndSaturday || day.is4thSaturday) && day.isCurrentMonth"
               [class.cal-grid__day--holiday]="day.isHoliday && day.isCurrentMonth"
               [class.cal-grid__day--working]="day.isWorking && day.isCurrentMonth"
               [matTooltip]="
@@ -337,11 +328,9 @@
                   ? '2nd Saturday Off'
                   : day.is4thSaturday
                     ? '4th Saturday Off'
-                    : day.isWeeklyOff && day.isCurrentMonth
-                      ? weekDays[day.dayOfWeek] + ' Off (Working Days)'
-                      : day.isSunday && day.isCurrentMonth
-                        ? 'Sunday'
-                        : '')
+                    : day.isSunday && day.isCurrentMonth
+                      ? 'Sunday'
+                      : '')
               "
             >
               {{ day.isCurrentMonth ? day.date : '' }}
@@ -354,15 +343,10 @@
           @if (month.holidays > 0) {
             <span class="summary-tag holiday">{{ month.holidays }} Holiday{{ month.holidays > 1 ? 's' : '' }}</span>
           }
-          @if (month.sundays > 0) {
-            <span class="summary-tag sun">{{ month.sundays }} Sun</span>
-          }
+          <span class="summary-tag sun">{{ month.sundays }} Sun</span>
           @if (month.secondFourthSat > 0) {
             <span class="summary-tag sat">{{ month.secondFourthSat }} Sat Off</span>
           }
-          @if (month.weeklyOff > 0) {
-            <span class="summary-tag sat">{{ month.weeklyOff }} Weekly Off</span>
-          }
         </div>
       </div>
     }

src/app/bank-calendar/bank-calendar.component.ts

@@ -63,8 +63,6 @@ interface CalendarDay {
   isSunday: boolean;
   is2ndSaturday: boolean;
   is4thSaturday: boolean;
-  /** Off every week because Admin > Working Days leaves this weekday out (Sunday aside). */
-  isWeeklyOff: boolean;
   holidayName?: string;
   dayOfWeek: number; // 0=Sun, 6=Sat
 }
@@ -78,23 +76,9 @@ interface MonthData {
   nonWorkingDays: number;
   holidays: number;
   sundays: number;
-  /** Saturdays off: the 2nd and 4th when Saturday is a working day, every one when it is not. */
   secondFourthSat: number;
-  /** Other weekdays off every week because Working Days leaves them out. */
-  weeklyOff: number;
 }
 
-/** Weekday codes in Date#getDay() order, as used by the /workingdays recurrence (BYDAY=MO,TU,...). */
-const DAY_CODES = [
-  'SU',
-  'MO',
-  'TU',
-  'WE',
-  'TH',
-  'FR',
-  'SA'
-];
-
 @Component({
   selector: 'mifosx-bank-calendar',
   templateUrl: './bank-calendar.component.html',
@@ -134,7 +118,7 @@ export class BankCalendarComponent implements OnInit {
   ];
   workingDaysConfig: string[] = [];
   holidays: any[] = [];
-  overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, weeklyOff: 0, totalDays: 0 };
+  overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, totalDays: 0 };
 
   // ───── Holiday list (office-wise) ─────
   offices: OfficeLite[] = [];
@@ -218,8 +202,7 @@ export class BankCalendarComponent implements OnInit {
   }
 
   private loadWorkingDays() {
-    // Default Indian banking working days: Mon-Sat (Sun off, 2nd & 4th Sat off), used until
-    // Admin > Working Days answers, or if it cannot be read.
+    // Default Indian banking working days: Mon-Sat (Sun off, 2nd & 4th Sat off)
     this.workingDaysConfig = [
       'MO',
       'TU',
@@ -232,19 +215,6 @@ export class BankCalendarComponent implements OnInit {
     this.buildCalendar();
     this.rebuildHolidayRows();
 
-    // The calendar has to agree with Admin > Working Days: a weekday unticked there is off every
-    // week here too.
-    this.organizationService.getWorkingDays().subscribe({
-      next: (data: any) => {
-        const configured = this.parseWorkingDays(data?.recurrence);
-        if (configured.length > 0) {
-          this.workingDaysConfig = configured;
-          this.buildCalendar();
-        }
-      },
-      error: () => {}
-    });
-
     // Pull offices then fan-out a per-office holiday fetch so each office's
     // calendar entries are surfaced in the list panel (calendar grid still
     // unions everything for the year-at-a-glance view).
@@ -303,23 +273,6 @@ export class BankCalendarComponent implements OnInit {
     });
   }
 
-  /** Weekday codes out of a recurrence such as "FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR". */
-  private parseWorkingDays(recurrence: string | undefined): string[] {
-    const byDay = /BYDAY=([^;]*)/.exec(recurrence || '');
-    if (!byDay) {
-      return [];
-    }
-    return byDay[1]
-      .split(',')
-      .map((d) => d.trim().toUpperCase())
-      .filter((d) => DAY_CODES.includes(d));
-  }
-
-  /** True when Admin > Working Days counts Saturday as a working day (so only the 2nd and 4th are off). */
-  get saturdayIsWorkingDay(): boolean {
-    return this.workingDaysConfig.includes('SA');
-  }
-
   /** Flatten the holidays array into a presentable list with office labels. */
   private rebuildHolidayRows(): void {
     this.holidayRows = this.holidays.map((h: any) => {
@@ -558,15 +511,7 @@ export class BankCalendarComponent implements OnInit {
 
   buildCalendar() {
     this.months = [];
-    this.overallStats = {
-      working: 0,
-      nonWorking: 0,
-      holidays: 0,
-      sundays: 0,
-      sat2nd4th: 0,
-      weeklyOff: 0,
-      totalDays: 0
-    };
+    this.overallStats = { working: 0, nonWorking: 0, holidays: 0, sundays: 0, sat2nd4th: 0, totalDays: 0 };
 
     for (let m = 0; m < 12; m++) {
       const monthData = this.buildMonth(m, this.currentYear);
@@ -576,7 +521,6 @@ export class BankCalendarComponent implements OnInit {
       this.overallStats.holidays += monthData.holidays;
       this.overallStats.sundays += monthData.sundays;
       this.overallStats.sat2nd4th += monthData.secondFourthSat;
-      this.overallStats.weeklyOff += monthData.weeklyOff;
     }
     this.overallStats.totalDays = this.overallStats.working + this.overallStats.nonWorking;
   }
@@ -608,7 +552,6 @@ export class BankCalendarComponent implements OnInit {
     let holidayCount = 0;
     let sundayCount = 0;
     let sat2nd4thCount = 0;
-    let weeklyOffCount = 0;
 
     // Previous month padding
     const prevMonthDays = new Date(year, month, 0).getDate();
@@ -624,7 +567,6 @@ export class BankCalendarComponent implements OnInit {
         isSunday: false,
         is2ndSaturday: false,
         is4thSaturday: false,
-        isWeeklyOff: false,
         dayOfWeek: (startDayOfWeek - i - 1 + 7) % 7
       });
     }
@@ -634,29 +576,24 @@ export class BankCalendarComponent implements OnInit {
     for (let d = 1; d <= daysInMonth; d++) {
       const date = new Date(year, month, d);
       const dow = date.getDay();
+      const isSunday = dow === 0;
       const isSaturday = dow === 6;
-      const isWorkingWeekday = this.workingDaysConfig.includes(DAY_CODES[dow]);
-      const isSunday = dow === 0 && !isWorkingWeekday;
 
       if (isSaturday) saturdayCount++;
 
-      // RBI: when Saturday is a working day the 2nd and 4th are still off. When Working Days leaves
-      // Saturday out, every Saturday is a weekly off instead.
-      const is2ndSat = isSaturday && isWorkingWeekday && saturdayCount === 2;
-      const is4thSat = isSaturday && isWorkingWeekday && saturdayCount === 4;
-      const isWeeklyOff = dow !== 0 && !isWorkingWeekday;
+      const is2ndSat = isSaturday && saturdayCount === 2;
+      const is4thSat = isSaturday && saturdayCount === 4;
       const isToday = date.toDateString() === today.toDateString();
 
       // Check if holiday
       const holiday = this.getHolidayForDate(year, month, d);
       const isHoliday = !!holiday;
 
-      // Non-working: Sunday, 2nd Sat, 4th Sat, a weekly off from Working Days, or holiday
-      const isNonWorking = isSunday || is2ndSat || is4thSat || isWeeklyOff || isHoliday;
+      // Non-working: Sunday, 2nd Sat, 4th Sat, or holiday
+      const isNonWorking = isSunday || is2ndSat || is4thSat || isHoliday;
 
       if (isSunday) sundayCount++;
-      if (is2ndSat || is4thSat || (isSaturday && isWeeklyOff)) sat2nd4thCount++;
-      if (isWeeklyOff && !isSaturday) weeklyOffCount++;
+      if (is2ndSat || is4thSat) sat2nd4thCount++;
       if (isHoliday) holidayCount++;
 
       if (isNonWorking) {
@@ -676,7 +613,6 @@ export class BankCalendarComponent implements OnInit {
         isSunday,
         is2ndSaturday: is2ndSat,
         is4thSaturday: is4thSat,
-        isWeeklyOff,
         holidayName: holiday?.name,
         dayOfWeek: dow
       });
@@ -696,7 +632,6 @@ export class BankCalendarComponent implements OnInit {
         isSunday: false,
         is2ndSaturday: false,
         is4thSaturday: false,
-        isWeeklyOff: false,
         dayOfWeek: days.length % 7
       });
     }
@@ -710,8 +645,7 @@ export class BankCalendarComponent implements OnInit {
       nonWorkingDays: nonWorkingCount,
       holidays: holidayCount,
       sundays: sundayCount,
-      secondFourthSat: sat2nd4thCount,
-      weeklyOff: weeklyOffCount
+      secondFourthSat: sat2nd4thCount
     };
   }
 

src/app/board-resolution/bor-report.component.html

@@ -17,12 +17,7 @@
         </p>
       </div>
     </div>
-    <button
-      class="bor-btn bor-btn--xls"
-      type="button"
-      [disabled]="exporting || !filtered.length"
-      (click)="exportExcel()"
-    >
+    <button class="bor-btn bor-btn--xls" type="button" [disabled]="exporting || !filtered.length" (click)="exportExcel()">
       <fa-icon icon="file-excel"></fa-icon>
       {{ exporting ? 'Exporting…' : 'Export' }}
     </button>
@@ -137,9 +132,7 @@
               <td class="num">{{ r.approvedShares | number }}</td>
               <td class="num strong">{{ r.shareValue | number: '1.2-2' }}</td>
               <td class="num">{{ r.trancheCount }}</td>
-              <td>
-                <span [class]="statusClass(r.statusEnum)">{{ statusText(r.statusEnum) }}</span>
-              </td>
+              <td><span [class]="statusClass(r.statusEnum)">{{ statusText(r.statusEnum) }}</span></td>
               <td class="mono">{{ r.activatedDate || '—' }}</td>
             </tr>
           } @empty {

src/app/cashier/account-register/account-register.component.ts

@@ -12,7 +12,6 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface RegisterRow {
   accountId: number;
@@ -84,7 +83,7 @@ export class AccountRegisterComponent implements OnInit {
 
   /** Local date — toISOString() would shift the day in any timezone behind UTC. */
   private today(): string {
-    const d = businessToday();
+    const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 

src/app/cashier/branch-cash-position/branch-cash-position.component.html

@@ -1,114 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="pg">
-  <header class="pg-head">
-    <div>
-      <div class="pg-eyebrow">BRANCH OPERATIONS · BRANCH CASH POSITION</div>
-      <h1 class="pg-title">Branch Cash Position</h1>
-      <p class="pg-sub">
-        The notes and coins the branch holds, denomination by denomination: the vault plus every cashier's drawer. Cash
-        moving between the vault and a cashier nets out; deposits, withdrawals and exchanges change it.
-      </p>
-    </div>
-  </header>
-
-  <div class="pg-toolbar pg-toolbar--mat">
-    <mat-form-field appearance="outline" subscriptSizing="dynamic">
-      <mat-label>As of Date</mat-label>
-      <input matInput type="date" [value]="asOfDate" (change)="onDateChange($any($event.target).value)" />
-    </mat-form-field>
-    <button type="button" class="pg-btn pg-btn--primary" (click)="load()" [disabled]="loading">
-      <mat-icon>refresh</mat-icon> Refresh
-    </button>
-  </div>
-
-  @if (errorMsg) {
-    <div class="pg-empty bcp-error">{{ errorMsg }}</div>
-  }
-  @if (loading) {
-    <div class="pg-empty">Loading…</div>
-  }
-
-  @if (position; as p) {
-    <div class="bcp-totals">
-      <div class="bcp-total">
-        <span>Branch</span><strong>{{ p.officeName }}</strong>
-      </div>
-      <div class="bcp-total">
-        <span>Vault</span><strong>₹{{ p.vaultAmount | number: '1.2-2' }}</strong>
-      </div>
-      <div class="bcp-total">
-        <span>Cashiers' drawers</span><strong>₹{{ p.cashiersAmount | number: '1.2-2' }}</strong>
-      </div>
-      <div class="bcp-total bcp-total--main">
-        <span>Bank total</span><strong>₹{{ p.totalAmount | number: '1.2-2' }}</strong>
-      </div>
-    </div>
-
-    @if (!p.vaultHasBreakdown) {
-      <div class="pg-empty bcp-note">
-        No vault denomination breakdown was recorded on or before {{ p.asOfDate }}, so the vault column reads 0. Open
-        the business day with a note/coin count to start tracking it.
-      </div>
-    }
-
-    <ng-template #table let-rows let-label="label" let-coin="coin">
-      @if (rows.length > 0) {
-        <div class="pos-section-label" [class.pos-section-label--coin]="coin">{{ label }}</div>
-        <table class="pg-table">
-          <thead>
-            <tr>
-              <th>Denomination</th>
-              <th class="num">Vault</th>
-              <th class="num">Cashiers</th>
-              <th class="num">Bank total (count)</th>
-              <th class="num">Bank total (₹)</th>
-              <th class="num">Exchange today</th>
-            </tr>
-          </thead>
-          <tbody>
-            @for (d of rows; track d.denominationId) {
-              <tr>
-                <td>
-                  <span class="pg-chip" [class.pg-chip--coin]="coin">₹{{ d.denominationValue }}</span>
-                </td>
-                <td class="num">{{ d.vaultCount }}</td>
-                <td class="num">{{ d.cashierCount }}</td>
-                <td class="num bcp-strong">{{ d.totalCount }}</td>
-                <td class="num">₹{{ d.totalAmount | number: '1.2-2' }}</td>
-                <td
-                  class="num bcp-move"
-                  [class.bcp-move--in]="d.exchangeNet > 0"
-                  [class.bcp-move--out]="d.exchangeNet < 0"
-                >
-                  {{ movement(d.exchangeNet) }}
-                </td>
-              </tr>
-            }
-          </tbody>
-        </table>
-      }
-    </ng-template>
-
-    <div class="pg-card bcp-card">
-      <ng-container
-        *ngTemplateOutlet="table; context: { $implicit: notes(), label: 'Notes', coin: false }"
-      ></ng-container>
-      <ng-container
-        *ngTemplateOutlet="table; context: { $implicit: coins(), label: 'Coins', coin: true }"
-      ></ng-container>
-    </div>
-
-    <p class="bcp-foot">
-      <strong>Exchange today</strong> is the notes taken in less the notes given out by cash exchanges on
-      {{ p.asOfDate }}. It is already part of the Cashiers column; it is shown beside the total so a change in the mix
-      can be seen.
-    </p>
-  }
-</div>

src/app/cashier/branch-cash-position/branch-cash-position.component.scss

@@ -1,82 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-.bcp-error {
-  color: #dc2626;
-}
-
-.bcp-note {
-  margin-bottom: 12px;
-  text-align: left;
-}
-
-.bcp-totals {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 12px;
-  margin-bottom: 14px;
-}
-
-.bcp-total {
-  flex: 1 1 180px;
-  padding: 12px 14px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
-
-  span {
-    display: block;
-    font-size: 11px;
-    font-weight: 600;
-    letter-spacing: 0.04em;
-    text-transform: uppercase;
-    color: #64748b;
-  }
-
-  strong {
-    font-size: 18px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &--main {
-    background: #e6f4ee;
-    border-color: #1f7a4d;
-
-    strong {
-      color: #0f4f3c;
-    }
-  }
-}
-
-.bcp-card {
-  margin-bottom: 14px;
-}
-
-.bcp-strong {
-  font-weight: 700;
-}
-
-.bcp-move {
-  font-weight: 700;
-  color: #94a3b8;
-
-  &--in {
-    color: #16a34a;
-  }
-
-  &--out {
-    color: #dc2626;
-  }
-}
-
-.bcp-foot {
-  margin: 0;
-  font-size: 12px;
-  color: #64748b;
-}

src/app/cashier/branch-cash-position/branch-cash-position.component.ts

@@ -1,112 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-import { Component, OnInit, inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { MatIconModule } from '@angular/material/icon';
-import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
-import { of } from 'rxjs';
-import { catchError } from 'rxjs/operators';
-import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
-
-interface BranchDenomRow {
-  denominationId: number;
-  denominationValue: number;
-  kind: string;
-  vaultCount: number;
-  cashierCount: number;
-  totalCount: number;
-  totalAmount: number;
-  /** Notes taken in less notes given out by exchanges on the day. */
-  exchangeNet: number;
-}
-
-interface BranchPosition {
-  officeId: number;
-  officeName: string;
-  asOfDate: string;
-  vaultHasBreakdown: boolean;
-  vaultAmount: number;
-  cashiersAmount: number;
-  totalAmount: number;
-  denominations: BranchDenomRow[];
-}
-
-/**
- * What the branch holds, denomination by denomination: the vault plus every cashier's drawer. An exchange
- * (a customer hands in 10 x ₹500 and leaves with 50 x ₹100) leaves the vault alone and changes a drawer, so
- * it only shows up in this total -- +10 on ₹500, -50 on ₹100.
- */
-@Component({
-  selector: 'mifosx-branch-cash-position',
-  templateUrl: './branch-cash-position.component.html',
-  styleUrls: [
-    '../cashier-shared.scss',
-    '../cashier-position/cashier-position.component.scss',
-    './branch-cash-position.component.scss'
-  ],
-  standalone: true,
-  imports: [
-    CommonModule,
-    MatIconModule,
-    MatFormFieldModule,
-    MatInputModule
-  ]
-})
-export class BranchCashPositionComponent implements OnInit {
-  private service = inject(CashierService);
-
-  asOfDate = '';
-  loading = false;
-  errorMsg = '';
-  position: BranchPosition | null = null;
-
-  ngOnInit(): void {
-    const d = businessToday();
-    this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
-    this.load();
-  }
-
-  load(): void {
-    this.loading = true;
-    this.errorMsg = '';
-    this.position = null;
-    this.service
-      .branchCashPosition(this.asOfDate)
-      .pipe(catchError(() => of(null)))
-      .subscribe((data: BranchPosition | null) => {
-        this.loading = false;
-        if (!data) {
-          this.errorMsg = 'Could not load the branch cash position.';
-          return;
-        }
-        this.position = data;
-      });
-  }
-
-  onDateChange(value: string): void {
-    this.asOfDate = value;
-    this.load();
-  }
-
-  notes(): BranchDenomRow[] {
-    return (this.position?.denominations || []).filter((d) => d.kind !== 'coin');
-  }
-
-  coins(): BranchDenomRow[] {
-    return (this.position?.denominations || []).filter((d) => d.kind === 'coin');
-  }
-
-  /** "+10", "-50", or a dash when the day's exchanges did not touch the denomination. */
-  movement(net: number): string {
-    if (!net) return '—';
-    return net > 0 ? `+${net}` : `${net}`;
-  }
-}

src/app/cashier/branch-day/branch-day.component.html

@@ -107,26 +107,11 @@
         </span>
       </div>
       @if (canOperate) {
-        <button
-          type="button"
-          class="pg-btn pg-btn--primary"
-          (click)="startClose(openDay)"
-          [disabled]="interestPending.length > 0"
-        >
+        <button type="button" class="pg-btn pg-btn--primary" (click)="startClose(openDay)">
           <mat-icon>lock</mat-icon> Close Day
         </button>
       }
     </div>
-    @if (interestPending.length > 0) {
-      <div class="bd-interest-alert">
-        <mat-icon>warning</mat-icon>
-        <span>
-          Savings interest posting report is not approved for <strong>{{ interestPending.join(', ') }}</strong
-          >. Approve it in <a routerLink="/reports/interest-posting">Reports → Interest Posting Reports</a> before
-          closing the day.
-        </span>
-      </div>
-    }
   } @else if (loaded && canOperate) {
     <div class="bd-current bd-current--shut">
       <div class="bd-current__main">
@@ -352,68 +337,6 @@
         </div>
       }
 
-      <!-- Interest waiting to be posted as this branch closes. Posting runs as part of the close, so
-           anything unapproved stops it: the branch sees here what it has to approve and where, rather
-           than finding out from a refusal after filling in the whole count. -->
-      @if (preview?.fdInterestDue?.length) {
-        <div class="bd-calc bd-calc--fd">
-          <div class="bd-calc__head">
-            <mat-icon>savings</mat-icon>
-            <strong>Fixed deposit interest due today</strong>
-          </div>
-          @for (d of preview.fdInterestDue; track d.productId) {
-            <div class="bd-calc__row">
-              <span>
-                {{ d.productName }} · {{ d.fdType }} · {{ d.accountCount }} deposit(s)
-                @if (d.reportStatus === 'APPROVED' || d.reportStatus === 'POSTED') {
-                  <span class="bd-fd-ok">{{ d.reportStatus }}</span>
-                } @else {
-                  <span class="bd-fd-pending">{{ d.reportStatus === 'NONE' ? 'NO REPORT' : d.reportStatus }}</span>
-                }
-              </span>
-              <span class="bd-calc__amt">₹{{ d.totalInterest | number: '1.2-2' }}</span>
-            </div>
-          }
-        </div>
-      }
-      @if (preview?.fdInterestPending?.length) {
-        <div class="bd-warn">
-          <mat-icon>warning</mat-icon>
-          <div>
-            <strong>The day cannot be closed yet.</strong> Fixed deposit interest is not approved for:
-            {{ preview.fdInterestPending.join(', ') }}. Approve it under Reports → FD Interest Posting Reports, then
-            close the day. The user who generated a report cannot approve it.
-          </div>
-        </div>
-      }
-      <!-- Investment interest vouchers that are due but not posted. A reminder only: unlike the interest
-           above it never stops the close (Jitendra Sir); the voucher can still be posted afterwards. -->
-      @if (preview?.investmentInterestPending?.length) {
-        <div class="bd-warn">
-          <mat-icon>notifications_active</mat-icon>
-          <div>
-            <strong>Reminder: investment interest vouchers are pending.</strong>
-            @for (t of preview.investmentInterestPending; track t.purchaseId) {
-              <div>
-                {{ t.lineType === 'COUPON' ? 'Coupon' : 'Provision' }} · {{ t.scriptDesc }} · deal {{ t.dealNo }} ·
-                {{ t.intDate }} · ₹{{ (t.lineType === 'COUPON' ? t.grossInterest : t.amount) | number: '1.2-2' }}
-              </div>
-            }
-            Post them under Investment → Govt Security / Bond → 03 Interest Entry. You can still close the day.
-          </div>
-        </div>
-      }
-      @if (preview?.savingsInterestPending?.length) {
-        <div class="bd-warn">
-          <mat-icon>warning</mat-icon>
-          <div>
-            <strong>The day cannot be closed yet.</strong> Savings interest is not approved for:
-            {{ preview.savingsInterestPending.join(', ') }}. Approve it under Reports → Interest Posting Reports, then
-            close the day.
-          </div>
-        </div>
-      }
-
       <!-- What every cash point under this branch is actually holding right now, fetched
            automatically — so closing the day doesn't mean separately checking Vault Position and
            every cashier's own Cashier Position screen by hand. -->

src/app/cashier/branch-day/branch-day.component.scss

@@ -195,75 +195,6 @@
     font-size: 11px;
     color: #94a3b8;
   }
-
-  /* Names the block, for the interest panels that sit beside the cash arithmetic. */
-  &__head {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    margin-bottom: 6px;
-    padding-bottom: 6px;
-    border-bottom: 1px solid #e2e8f0;
-    font-size: 13px;
-    color: #0d1b2a;
-
-    mat-icon {
-      font-size: 18px;
-      width: 18px;
-      height: 18px;
-      color: #1d4ed8;
-    }
-  }
-}
-
-/* Interest is money leaving as the day closes, not cash counted in the drawer. */
-.bd-calc--fd {
-  border-left: 3px solid #1d4ed8;
-}
-
-.bd-fd-ok,
-.bd-fd-pending {
-  display: inline-block;
-  margin-left: 6px;
-  padding: 1px 7px;
-  border-radius: 999px;
-  font-size: 10px;
-  font-weight: 700;
-  letter-spacing: 0.02em;
-}
-
-.bd-fd-ok {
-  background: #dcfce7;
-  color: #15803d;
-}
-
-.bd-fd-pending {
-  background: #fef3c7;
-  color: #b45309;
-}
-
-/* Why the close will be refused, said before the count is filled in rather than after. */
-.bd-warn {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
-  max-width: 640px;
-  margin-bottom: 14px;
-  padding: 10px 14px;
-  background: #fffbeb;
-  border: 1px solid #fcd34d;
-  border-radius: 8px;
-  font-size: 12px;
-  line-height: 1.5;
-  color: #78350f;
-
-  mat-icon {
-    flex-shrink: 0;
-    font-size: 20px;
-    width: 20px;
-    height: 20px;
-    color: #b45309;
-  }
 }
 
 .bd-hint {
@@ -441,30 +372,3 @@
     color: #d97706;
   }
 }
-
-// Shown under the open day while a savings interest posting report due today is unapproved.
-.bd-interest-alert {
-  display: flex;
-  align-items: flex-start;
-  gap: 8px;
-  margin: 8px 0 12px;
-  padding: 10px 14px;
-  border: 1px solid #f59e0b;
-  border-radius: 8px;
-  background: #fef3c7;
-  color: #92400e;
-  font-size: 13px;
-
-  mat-icon {
-    flex-shrink: 0;
-    font-size: 20px;
-    width: 20px;
-    height: 20px;
-  }
-
-  a {
-    color: inherit;
-    font-weight: 600;
-    text-decoration: underline;
-  }
-}

src/app/cashier/branch-day/branch-day.component.ts

@@ -189,23 +189,6 @@ export class BranchDayComponent implements OnInit {
     return this.totalOf(this.closeCounts);
   }
 
-  /**
-   * Savings products whose interest posting report is due today and not yet approved. The close is
-   * refused by the backend while any is pending; this only says so before the user tries.
-   */
-  interestPending: string[] = [];
-
-  private checkInterestReports(): void {
-    if (!this.openDay?.businessDate) {
-      this.interestPending = [];
-      return;
-    }
-    this.service
-      .interestDayCloseCheck(this.openDay.businessDate, this.openDay.officeId)
-      .pipe(catchError(() => of(null)))
-      .subscribe((res) => (this.interestPending = res?.pendingProducts ?? []));
-  }
-
   load(): void {
     this.loading = true;
     this.errorMsg = '';
@@ -227,7 +210,6 @@ export class BranchDayComponent implements OnInit {
         this.canOperate = !!res?.canOperate;
         this.openDate = this.today;
         this.checkFirstOpenCashMigration();
-        this.checkInterestReports();
       });
 
     this.service

src/app/cashier/cash-clearing-transfer-summary/cash-clearing-transfer-summary.component.ts

@@ -11,7 +11,6 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
 import { ExportSheetSpec, exportWorkbook } from '../cashier-export';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface SummaryRow {
   code: string;
@@ -1317,7 +1316,7 @@ export class CashClearingTransferSummaryComponent {
   private dateTag = '2607';
 
   constructor() {
-    const d = businessToday();
+    const d = new Date();
     this.asOnDate = `${String(d.getDate()).padStart(2, '0')}-${String(d.getMonth() + 1).padStart(2, '0')}-${d.getFullYear()}`;
     this.dateTag = `${String(d.getFullYear()).slice(-2)}${String(d.getMonth() + 1).padStart(2, '0')}`;
 

src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.html

@@ -22,255 +22,50 @@
     </div>
   </header>
 
-  <!-- ── Cashier: whose drawer takes the customer's notes and gives the change ── -->
-  @if (cashier) {
-    <section class="cx-cashier">
-      <div class="cx-avatar cx-avatar--sm">{{ cashierInitials }}</div>
-      <div class="cx-cashier__id">
-        <div class="cx-cashier__label">Cashier at the counter</div>
-        <div class="cx-cashier__name">{{ cashier.name || '—' }}</div>
-        <div class="cx-cashier__flow">
-          <span><mat-icon>south</mat-icon> Receives from customer</span>
-          <span><mat-icon>north</mat-icon> Gives to customer</span>
-        </div>
-      </div>
-      <div class="cx-cashier__stats">
-        <div>
-          <span>Counter</span><strong>{{ cashier.tellerName || '—' }}</strong>
-        </div>
-        <div>
-          <span>Branch</span><strong>{{ cashier.officeName || '—' }}</strong>
-        </div>
-        <div>
-          <span>Allocated today</span
-          ><strong>{{
-            cashier.allocatedAmount === null ? '—' : '₹' + (cashier.allocatedAmount | number: '1.2-2')
-          }}</strong>
-        </div>
-        <div>
-          <span>Cash in hand</span><strong>₹{{ cashier.totalAmount | number: '1.2-2' }}</strong>
-        </div>
-      </div>
-    </section>
-  } @else if (noCashier) {
-    <section class="cx-cashier cx-cashier--none">
-      <mat-icon>person_off</mat-icon>
-      <div>
-        <div class="cx-cashier__name">Your login is not linked to a cashier</div>
-        <div class="cx-cashier__label">
-          A cash exchange moves notes in and out of a cashier's drawer, so it can only be recorded by a cashier. Log in
-          as a cashier to continue.
-        </div>
-      </div>
-    </section>
-  }
-
-  <!-- ── Customer: an existing client (details from their record) or a walk-in identified at the counter ── -->
-  <section class="cx-cust">
-    <header class="cx-cust__head">
-      <div class="cx-cust__title">
-        <span class="cx-cust__title-icon"><mat-icon>groups</mat-icon></span>
-        <div>
-          <div class="cx-cust__title-text">Customer</div>
-          <div class="cx-cust__title-sub">Who is exchanging cash at the counter</div>
-        </div>
-      </div>
-      <div class="cx-cust__modes" role="tablist" aria-label="Customer type">
-        <button
-          type="button"
-          role="tab"
-          class="cx-cust__mode"
-          [class.cx-cust__mode--active]="customerMode === 'existing'"
-          [attr.aria-selected]="customerMode === 'existing'"
-          (click)="setCustomerMode('existing')"
-        >
-          <mat-icon>badge</mat-icon> Existing Customer
-        </button>
-        <button
-          type="button"
-          role="tab"
-          class="cx-cust__mode"
-          [class.cx-cust__mode--active]="customerMode === 'walkin'"
-          [attr.aria-selected]="customerMode === 'walkin'"
-          (click)="setCustomerMode('walkin')"
-        >
-          <mat-icon>person_outline</mat-icon> Walk-in Customer
-        </button>
-      </div>
-    </header>
-
-    <div class="cx-cust__body">
-      <!-- Who -->
-      <div class="cx-cust__who">
-        @if (customerMode === 'existing') {
-          @if (loadingCustomer) {
-            <div class="cx-cust__empty">
-              <mat-icon class="cx-cust__empty-icon cx-spin">autorenew</mat-icon>
-              <div class="cx-cust__empty-title">Loading customer details…</div>
-            </div>
-          } @else if (!selectedCustomer) {
-            <div class="cx-cust__empty">
-              <mat-icon class="cx-cust__empty-icon">person_search</mat-icon>
-              <div class="cx-cust__empty-title">No customer selected</div>
-              <div class="cx-cust__empty-sub">Search by name, account no., PAN or Aadhaar</div>
-              <button type="button" class="cx-btn cx-btn--primary" (click)="openCustomerSearch()">
-                <mat-icon>search</mat-icon> Search Customer
-              </button>
-            </div>
-          } @else {
-            <div class="cx-cust__card">
-              <div class="cx-cust__card-top">
-                <div class="cx-avatar">{{ customerInitials }}</div>
-                <div class="cx-cust__card-id">
-                  <div class="cx-cust__name">{{ selectedCustomer.displayName }}</div>
-                  <div class="cx-cust__badges">
-                    <span
-                      class="cx-kyc"
-                      [class.cx-kyc--ok]="selectedCustomer.kycStatus === 'Verified'"
-                      [class.cx-kyc--warn]="selectedCustomer.kycStatus !== 'Verified'"
-                    >
-                      <mat-icon>{{
-                        selectedCustomer.kycStatus === 'Verified' ? 'verified_user' : 'gpp_maybe'
-                      }}</mat-icon>
-                      KYC: {{ selectedCustomer.kycStatus }}
-                    </span>
-                    @if (selectedCustomer.accountType) {
-                      <span class="cx-chip-tag">{{ selectedCustomer.accountType }}</span>
-                    }
-                  </div>
-                </div>
-                <div class="cx-cust__card-actions">
-                  <button type="button" class="cx-link-btn" (click)="openCustomerSearch()">
-                    <mat-icon>swap_horiz</mat-icon> Change
-                  </button>
-                  <button type="button" class="cx-link-btn cx-link-btn--danger" (click)="clearCustomer()">
-                    <mat-icon>close</mat-icon> Remove
-                  </button>
-                </div>
-              </div>
-              <div class="cx-cust__grid">
-                <div>
-                  <span>CIF No.</span><strong>{{ selectedCustomer.cifNumber || '—' }}</strong>
-                </div>
-                <div>
-                  <span>Client ID</span><strong>{{ selectedCustomer.clientId }}</strong>
-                </div>
-                <div>
-                  <span>Mobile</span><strong>{{ selectedCustomer.mobileNo || '—' }}</strong>
-                </div>
-                <div>
-                  <span>Branch</span><strong>{{ selectedCustomer.officeName || '—' }}</strong>
-                </div>
-                <div>
-                  <span>Account</span><strong>{{ selectedCustomer.accountNo || 'No account' }}</strong>
-                </div>
-                <div>
-                  <span>PAN on record</span>
-                  <strong>
-                    {{ selectedCustomer.kycPan || 'Not on record' }}
-                    @if (selectedCustomer.kycPan) {
-                      <span
-                        class="cx-kyc cx-kyc--sm"
-                        [class.cx-kyc--ok]="selectedCustomer.panVerified"
-                        [class.cx-kyc--warn]="!selectedCustomer.panVerified"
-                        >{{ selectedCustomer.panVerified ? 'Verified' : 'Not verified' }}</span
-                      >
-                    }
-                  </strong>
-                </div>
-              </div>
-            </div>
-          }
-        } @else {
-          <div class="cx-cust__walkin">
-            <label class="cx-field">
-              <span>Customer Name{{ needsPan ? ' *' : '' }}</span>
-              <input
-                type="text"
-                [value]="walkInName"
-                (input)="walkInName = $any($event.target).value"
-                placeholder="Full name as on ID"
-                maxlength="150"
-                autocomplete="off"
-              />
-            </label>
-            <label class="cx-field">
-              <span>Mobile</span>
-              <input
-                type="tel"
-                inputmode="numeric"
-                [value]="walkInMobile"
-                (input)="walkInMobile = $any($event.target).value"
-                placeholder="10-digit mobile number"
-                maxlength="15"
-                autocomplete="off"
-              />
-            </label>
-          </div>
-        }
-      </div>
-
-      <!-- PAN -->
-      <div
-        class="cx-pan"
-        [class.cx-pan--required]="panMissing"
-        [class.cx-pan--invalid]="panFormatInvalid"
-        [class.cx-pan--valid]="panValue && !panFormatInvalid"
-      >
-        <div class="cx-pan__head">
-          <mat-icon>credit_card</mat-icon>
-          <span class="cx-pan__label">PAN Card</span>
-          <span class="cx-pan__tag" [class.cx-pan__tag--on]="needsPan">{{ needsPan ? 'Mandatory' : 'Optional' }}</span>
-        </div>
-        <div class="cx-pan__input">
-          <input
-            type="text"
-            [value]="panNumber"
-            (input)="panNumber = $any($event.target).value.toUpperCase()"
-            placeholder="ABCDE1234F"
-            maxlength="10"
-            autocomplete="off"
-            spellcheck="false"
-            aria-label="PAN number"
-          />
-          @if (panValue && !panFormatInvalid) {
-            <mat-icon class="cx-pan__state cx-pan__state--ok">check_circle</mat-icon>
-          } @else if (panFormatInvalid) {
-            <mat-icon class="cx-pan__state cx-pan__state--bad">error</mat-icon>
-          }
-        </div>
-        <div class="cx-pan__hint">
-          @if (panFormatInvalid) {
-            PAN is 5 letters, 4 digits, 1 letter (e.g. ABCDE1234F).
-          } @else if (panFromKyc) {
-            <mat-icon>link</mat-icon> Fetched from the customer's KYC record.
-          } @else if (panMissing) {
-            Required: this exchange is above ₹50,000 (Income Tax Rule 114B / RBI).
-          } @else {
-            Mandatory for exchanges above ₹50,000.
-          }
-        </div>
-      </div>
+  <!-- ── Customer Info Bar ── -->
+  <div class="cx-customer-bar">
+    <div
+      class="cx-customer-toggle"
+      [class.cx-customer-toggle--active]="isAccountHolder"
+      (click)="toggleAccountHolder()"
+    >
+      <mat-icon>{{ isAccountHolder ? 'check_box' : 'check_box_outline_blank' }}</mat-icon>
+      <span>Account Holder</span>
     </div>
-  </section>
+
+    @if (isAccountHolder) {
+      <label class="cx-field cx-field--inline">
+        <span>Account No.</span>
+        <input
+          type="text"
+          [value]="accountNo"
+          (input)="accountNo = $any($event.target).value"
+          placeholder="e.g. 000101234567"
+        />
+      </label>
+    } @else {
+      <span class="cx-walk-in"><mat-icon>person_outline</mat-icon> Walk-in Customer</span>
+    }
+
+    @if (needsIdProof) {
+      <div class="cx-pan-required">
+        <mat-icon>warning</mat-icon>
+        <span>Amount ≥ ₹50,000 — Customer PAN / Aadhaar required (RBI)</span>
+      </div>
+      <label class="cx-field cx-field--inline cx-field--pan">
+        <span>PAN / Aadhaar *</span>
+        <input
+          type="text"
+          [value]="customerIdProof"
+          (input)="customerIdProof = $any($event.target).value"
+          placeholder="ABCDE1234F"
+          maxlength="20"
+        />
+      </label>
+    }
+  </div>
 
   <div class="cx-cols">
-    <!-- The cashier's count of a denomination and what this exchange does to it, updated as counts are typed. -->
-    <ng-template #drawerCell let-d="d">
-      @if (availableFor(d) === null) {
-        —
-      } @else {
-        In drawer <strong>{{ availableFor(d) }}</strong>
-        @if (netFor(d) !== 0) {
-          <span class="cx-after">
-            <mat-icon>{{ netFor(d) > 0 ? 'trending_up' : 'trending_down' }}</mat-icon>
-            <strong>{{ drawerAfter(d) }}</strong>
-            <small>({{ netFor(d) > 0 ? '+' : '' }}{{ netFor(d) }})</small>
-          </span>
-        }
-      }
-    </ng-template>
-
     <!-- RECEIVED -->
     <section class="cx-col cx-col--received">
       <header class="cx-col-head">
@@ -283,7 +78,7 @@
           <div class="cx-subhead">Bank Notes</div>
         }
         @for (d of notes; track d.id) {
-          <div class="cx-row cx-row--stock">
+          <div class="cx-row">
             <span class="cx-chip">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('r', d, -1)" [disabled]="countFor('r', d) === 0">−</button>
@@ -295,9 +90,6 @@
               />
               <button type="button" (click)="bump('r', d, 1)">+</button>
             </div>
-            <span class="cx-avail" [class.cx-avail--up]="netFor(d) > 0" [class.cx-avail--down]="netFor(d) < 0">
-              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
-            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('r', d) === 0"
               >₹{{ subtotal('r', d) | number: '1.2-2' }}</span
             >
@@ -307,7 +99,7 @@
           <div class="cx-subhead">Coins</div>
         }
         @for (d of coins; track d.id) {
-          <div class="cx-row cx-row--stock">
+          <div class="cx-row">
             <span class="cx-chip cx-chip--coin">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('r', d, -1)" [disabled]="countFor('r', d) === 0">−</button>
@@ -319,9 +111,6 @@
               />
               <button type="button" (click)="bump('r', d, 1)">+</button>
             </div>
-            <span class="cx-avail" [class.cx-avail--up]="netFor(d) > 0" [class.cx-avail--down]="netFor(d) < 0">
-              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
-            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('r', d) === 0"
               >₹{{ subtotal('r', d) | number: '1.2-2' }}</span
             >
@@ -342,7 +131,7 @@
           <div class="cx-subhead">Bank Notes</div>
         }
         @for (d of notes; track d.id) {
-          <div class="cx-row cx-row--stock" [class.cx-row--over]="exceedsAvailable(d)">
+          <div class="cx-row">
             <span class="cx-chip">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('g', d, -1)" [disabled]="countFor('g', d) === 0">−</button>
@@ -352,16 +141,8 @@
                 [value]="countFor('g', d)"
                 (input)="onChange('g', d, $any($event.target).value)"
               />
-              <button type="button" (click)="bump('g', d, 1)" [disabled]="!canGiveMore(d)">+</button>
+              <button type="button" (click)="bump('g', d, 1)">+</button>
             </div>
-            <span
-              class="cx-avail"
-              [class.cx-avail--up]="netFor(d) > 0"
-              [class.cx-avail--down]="netFor(d) < 0"
-              [class.cx-avail--over]="exceedsAvailable(d)"
-            >
-              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
-            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('g', d) === 0"
               >₹{{ subtotal('g', d) | number: '1.2-2' }}</span
             >
@@ -371,7 +152,7 @@
           <div class="cx-subhead">Coins</div>
         }
         @for (d of coins; track d.id) {
-          <div class="cx-row cx-row--stock" [class.cx-row--over]="exceedsAvailable(d)">
+          <div class="cx-row">
             <span class="cx-chip cx-chip--coin">{{ d.label }}</span>
             <div class="cx-step">
               <button type="button" (click)="bump('g', d, -1)" [disabled]="countFor('g', d) === 0">−</button>
@@ -381,16 +162,8 @@
                 [value]="countFor('g', d)"
                 (input)="onChange('g', d, $any($event.target).value)"
               />
-              <button type="button" (click)="bump('g', d, 1)" [disabled]="!canGiveMore(d)">+</button>
+              <button type="button" (click)="bump('g', d, 1)">+</button>
             </div>
-            <span
-              class="cx-avail"
-              [class.cx-avail--up]="netFor(d) > 0"
-              [class.cx-avail--down]="netFor(d) < 0"
-              [class.cx-avail--over]="exceedsAvailable(d)"
-            >
-              <ng-container *ngTemplateOutlet="drawerCell; context: { d: d }"></ng-container>
-            </span>
             <span class="cx-amt" [class.cx-amt--zero]="countFor('g', d) === 0"
               >₹{{ subtotal('g', d) | number: '1.2-2' }}</span
             >
@@ -400,30 +173,6 @@
     </section>
   </div>
 
-  <!-- What this exchange does to the cashier's drawer, denomination by denomination. -->
-  @if (impactRows.length) {
-    <div class="cx-impact">
-      <div class="cx-impact__title"><mat-icon>inventory_2</mat-icon> Drawer after this exchange</div>
-      <div class="cx-impact__chips">
-        @for (r of impactRows; track r.id) {
-          <span
-            class="cx-impact__chip"
-            [class.cx-impact__chip--up]="r.net > 0"
-            [class.cx-impact__chip--down]="r.net < 0"
-          >
-            <b>{{ r.label }}</b>
-            {{ r.before }} → {{ r.after }}
-            <em>({{ r.net > 0 ? '+' : '' }}{{ r.net }})</em>
-          </span>
-        }
-      </div>
-      <div class="cx-impact__note">
-        The branch's total for each denomination moves by the same amount; the vault is not touched (Branch Ops → Branch
-        Cash Position).
-      </div>
-    </div>
-  }
-
   <div class="cx-summary">
     <div class="cx-sum">
       <span>Received</span><strong>₹{{ receivedTotal | number: '1.2-2' }}</strong>
@@ -464,15 +213,9 @@
       </div>
     </div>
   }
-  @if (panMissing) {
+  @if (needsIdProof && !customerIdProof.trim()) {
     <div class="cx-warn cx-warn--pan">
-      <mat-icon>badge</mat-icon> Enter the customer's PAN to proceed (amount above ₹50,000).
-    </div>
-  }
-  @if (!customerIdentified && !loadingCustomer) {
-    <div class="cx-warn cx-warn--pan">
-      <mat-icon>person_search</mat-icon>
-      {{ customerMode === 'existing' ? 'Search and select the customer.' : "Enter the walk-in customer's name." }}
+      <mat-icon>badge</mat-icon> Enter customer PAN / Aadhaar to proceed (amount ≥ ₹50,000).
     </div>
   }
 

src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.scss

@@ -73,584 +73,99 @@
   }
 }
 
-/* ── Customer: existing client or walk-in, plus PAN ── */
-.cx-cust {
-  background: #fff;
+/* ── Customer info bar ── */
+.cx-customer-bar {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 10px 14px;
+  background: #f8fafc;
   border: 1px solid #e2e8f0;
-  border-radius: 14px;
-  box-shadow: 0 1px 2px rgb(15 23 42 / 4%);
-  overflow: hidden;
+  border-radius: 10px;
+  flex-wrap: wrap;
+}
 
-  &__head {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    flex-wrap: wrap;
-    gap: 12px;
-    padding: 12px 16px;
-    background: linear-gradient(180deg, #f8fafc, #f1f5f9);
-    border-bottom: 1px solid #e2e8f0;
-  }
+.cx-customer-toggle {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 13px;
+  font-weight: 600;
+  color: #475569;
+  cursor: pointer;
+  user-select: none;
 
-  &__title {
-    display: flex;
-    align-items: center;
-    gap: 10px;
-  }
-
-  &__title-icon {
-    display: grid;
-    place-items: center;
-    width: 36px;
-    height: 36px;
-    border-radius: 10px;
-    background: #e6f4ee;
-    color: #0f4f3c;
-
-    mat-icon {
-      font-size: 20px;
-      width: 20px;
-      height: 20px;
-    }
-  }
-
-  &__title-text {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__title-sub {
-    font-size: 12px;
-    color: #64748b;
-  }
-
-  &__modes {
-    display: inline-flex;
-    padding: 3px;
-    background: #e2e8f0;
-    border-radius: 10px;
-  }
-
-  &__mode {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    height: 32px;
-    padding: 0 14px;
-    border: 0;
-    border-radius: 8px;
-    background: transparent;
-    font-size: 13px;
-    font-weight: 600;
-    color: #475569;
-    cursor: pointer;
-    transition:
-      background 0.15s ease,
-      color 0.15s ease;
-
-    mat-icon {
-      font-size: 18px;
-      width: 18px;
-      height: 18px;
-    }
-
-    &:hover {
-      color: #0f172a;
-    }
-
-    &--active,
-    &--active:hover {
-      background: #fff;
-      color: #0f4f3c;
-      box-shadow: 0 1px 3px rgb(15 23 42 / 15%);
-    }
-  }
-
-  &__body {
-    display: grid;
-    grid-template-columns: minmax(0, 1.7fr) minmax(260px, 1fr);
-    gap: 16px;
-    padding: 16px;
-  }
-
-  &__who {
-    min-width: 0;
-  }
-
-  /* Nothing picked yet, or loading */
-  &__empty {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    justify-content: center;
-    gap: 4px;
-    min-height: 150px;
-    padding: 20px;
-    text-align: center;
-    background: #f8fafc;
-    border: 1.5px dashed #cbd5e1;
-    border-radius: 12px;
-  }
-
-  &__empty-icon {
-    font-size: 36px;
-    width: 36px;
-    height: 36px;
+  mat-icon {
+    font-size: 20px;
+    height: 20px;
+    width: 20px;
     color: #94a3b8;
   }
 
-  &__empty-title {
-    font-size: 14px;
-    font-weight: 600;
-    color: #334155;
-  }
+  &--active {
+    color: #1e40af;
 
-  &__empty-sub {
-    margin-bottom: 8px;
-    font-size: 12px;
-    color: #64748b;
-  }
-
-  /* A picked client */
-  &__card {
-    padding: 14px;
-    background: #fff;
-    border: 1px solid #e2e8f0;
-    border-radius: 12px;
-  }
-
-  &__card-top {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 12px;
-  }
-
-  &__card-id {
-    flex: 1 1 180px;
-    min-width: 0;
-  }
-
-  &__name {
-    font-size: 16px;
-    font-weight: 700;
-    color: #0f172a;
-    overflow-wrap: anywhere;
-  }
-
-  &__badges {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-    gap: 6px;
-    margin-top: 4px;
-  }
-
-  &__card-actions {
-    display: flex;
-    gap: 4px;
-  }
-
-  &__grid {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(150px, 1fr));
-    gap: 12px 16px;
-    margin-top: 12px;
-    padding-top: 12px;
-    border-top: 1px dashed #e2e8f0;
-
-    span {
-      display: block;
-      margin-bottom: 2px;
-      font-size: 11px;
-      color: #64748b;
+    mat-icon {
+      color: #1e40af;
     }
-
-    strong {
-      font-size: 13px;
-      font-weight: 600;
-      color: #0f172a;
-    }
-  }
-
-  /* A walk-in, identified at the counter */
-  &__walkin {
-    display: grid;
-    grid-template-columns: 1fr 1fr;
-    gap: 12px;
-
-    .cx-field {
-      font-size: 12px;
-    }
-
-    .cx-field input {
-      width: 100%;
-      height: 40px;
-      box-sizing: border-box;
-    }
-  }
-
-  .cx-field input:focus {
-    outline: none;
-    border-color: #1f7a4d;
-    box-shadow: 0 0 0 3px rgb(31 122 77 / 15%);
   }
 }
 
-.cx-avatar {
-  display: grid;
-  place-items: center;
-  flex: 0 0 auto;
-  width: 44px;
-  height: 44px;
-  border-radius: 50%;
-  background: linear-gradient(135deg, #1f7a4d, #0f4f3c);
-  font-size: 15px;
-  font-weight: 700;
-  letter-spacing: 0.02em;
-  color: #fff;
-
-  &--sm {
-    width: 40px;
-    height: 40px;
-    font-size: 14px;
-  }
-}
-
-/* The cashier at the counter, or why there is none */
-.cx-cashier {
+.cx-walk-in {
   display: flex;
   align-items: center;
-  flex-wrap: wrap;
-  gap: 14px 20px;
-  padding: 12px 16px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-left: 4px solid #1f7a4d;
-  border-radius: 14px;
-  box-shadow: 0 1px 2px rgb(15 23 42 / 4%);
-
-  &__id {
-    flex: 1 1 220px;
-    min-width: 0;
-  }
-
-  &__label {
-    font-size: 11px;
-    font-weight: 600;
-    letter-spacing: 0.04em;
-    text-transform: uppercase;
-    color: #64748b;
-  }
-
-  &__name {
-    font-size: 16px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__flow {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 4px 14px;
-    margin-top: 2px;
-    font-size: 12px;
-    color: #475569;
-
-    span {
-      display: inline-flex;
-      align-items: center;
-      gap: 2px;
-    }
-
-    mat-icon {
-      font-size: 14px;
-      width: 14px;
-      height: 14px;
-      color: #94a3b8;
-    }
-  }
-
-  &__stats {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 10px 28px;
-
-    span {
-      display: block;
-      font-size: 11px;
-      color: #64748b;
-    }
-
-    strong {
-      font-size: 14px;
-      font-weight: 600;
-      color: #0f172a;
-    }
-  }
-
-  &--none {
-    background: #fffbeb;
-    border-color: #fcd34d;
-    border-left-color: #d97706;
-
-    mat-icon {
-      color: #d97706;
-    }
-
-    .cx-cashier__label {
-      font-weight: 500;
-      letter-spacing: 0;
-      text-transform: none;
-      color: #92400e;
-    }
-  }
-}
-
-.cx-kyc {
-  display: inline-flex;
-  align-items: center;
   gap: 4px;
-  padding: 2px 8px;
-  border-radius: 999px;
-  font-size: 11px;
-  font-weight: 600;
+  font-size: 12px;
+  color: #64748b;
 
   mat-icon {
-    font-size: 14px;
-    width: 14px;
-    height: 14px;
-  }
-
-  &--ok {
-    background: #dcfce7;
-    color: #166534;
-  }
-
-  &--warn {
-    background: #fef3c7;
-    color: #92400e;
-  }
-
-  &--sm {
-    margin-left: 6px;
-    padding: 1px 6px;
-    font-size: 10px;
+    font-size: 16px;
+    height: 16px;
+    width: 16px;
   }
 }
 
-.cx-chip-tag {
-  padding: 2px 8px;
-  border-radius: 6px;
-  background: #eef2ff;
-  font-size: 11px;
-  font-weight: 600;
-  color: #3730a3;
-}
-
-.cx-link-btn {
-  display: inline-flex;
+.cx-pan-required {
+  display: flex;
   align-items: center;
-  gap: 4px;
-  height: 30px;
-  padding: 0 10px;
-  border: 0;
-  border-radius: 8px;
-  background: transparent;
+  gap: 6px;
+  padding: 4px 10px;
+  background: #fffbeb;
+  border: 1px solid #fcd34d;
+  border-radius: 6px;
   font-size: 12px;
   font-weight: 600;
-  color: #1e40af;
-  cursor: pointer;
+  color: #92400e;
 
   mat-icon {
     font-size: 16px;
-    width: 16px;
     height: 16px;
-  }
-
-  &:hover {
-    background: #eff6ff;
-  }
-
-  &--danger {
-    color: #b91c1c;
-
-    &:hover {
-      background: #fef2f2;
-    }
+    width: 16px;
+    color: #d97706;
   }
 }
 
-/* PAN: neutral until needed, amber when required and missing, red when malformed, green when valid */
-.cx-pan {
-  display: flex;
-  flex-direction: column;
-  align-self: start;
+.cx-field--inline {
+  flex-direction: row;
+  align-items: center;
   gap: 8px;
-  padding: 14px;
-  background: #f8fafc;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
 
-  &__head {
-    display: flex;
-    align-items: center;
-    gap: 8px;
-
-    mat-icon {
-      font-size: 20px;
-      width: 20px;
-      height: 20px;
-      color: #475569;
-    }
+  span {
+    white-space: nowrap;
   }
 
-  &__label {
-    font-size: 13px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__tag {
-    margin-left: auto;
-    padding: 2px 8px;
-    border-radius: 999px;
-    background: #e2e8f0;
-    font-size: 11px;
-    font-weight: 600;
-    color: #475569;
-
-    &--on {
-      background: #fef3c7;
-      color: #92400e;
-    }
-  }
-
-  &__input {
-    position: relative;
-
-    input {
-      width: 100%;
-      height: 44px;
-      box-sizing: border-box;
-      padding: 0 40px 0 12px;
-      background: #fff;
-      border: 1.5px solid #cbd5e1;
-      border-radius: 10px;
-      font-family: ui-monospace, sfmono-regular, menlo, consolas, monospace;
-      font-size: 18px;
-      font-weight: 600;
-      letter-spacing: 0.18em;
-      text-transform: uppercase;
-      color: #0f172a;
-
-      &::placeholder {
-        font-weight: 500;
-        color: #cbd5e1;
-      }
-
-      &:focus {
-        outline: none;
-        border-color: #1f7a4d;
-        box-shadow: 0 0 0 3px rgb(31 122 77 / 15%);
-      }
-    }
-  }
-
-  &__state {
-    position: absolute;
-    top: 50%;
-    right: 10px;
-    transform: translateY(-50%);
-    font-size: 22px;
-    width: 22px;
-    height: 22px;
-
-    &--ok {
-      color: #16a34a;
-    }
-
-    &--bad {
-      color: #dc2626;
-    }
-  }
-
-  &__hint {
-    display: flex;
-    align-items: center;
-    gap: 4px;
-    font-size: 12px;
-    color: #64748b;
-
-    mat-icon {
-      font-size: 14px;
-      width: 14px;
-      height: 14px;
-    }
-  }
-
-  &--required {
-    background: #fffbeb;
-    border-color: #fcd34d;
-
-    .cx-pan__input input {
-      border-color: #f59e0b;
-    }
-
-    .cx-pan__hint {
-      font-weight: 600;
-      color: #92400e;
-    }
-  }
-
-  &--invalid {
-    background: #fef2f2;
-    border-color: #fecaca;
-
-    .cx-pan__input input {
-      border-color: #ef4444;
-    }
-
-    .cx-pan__hint {
-      font-weight: 600;
-      color: #b91c1c;
-    }
-  }
-
-  &--valid {
-    background: #f0fdf4;
-    border-color: #bbf7d0;
-
-    .cx-pan__input input {
-      border-color: #22c55e;
-    }
-
-    .cx-pan__hint {
-      color: #166534;
-    }
+  input {
+    width: 180px;
   }
 }
 
-.cx-spin {
-  animation: cx-spin 1s linear infinite;
-}
+.cx-field--pan input {
+  width: 160px;
+  border-color: #fcd34d;
 
-@keyframes cx-spin {
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@media (width <= 900px) {
-  .cx-cust__body {
-    grid-template-columns: 1fr;
-  }
-}
-
-@media (width <= 600px) {
-  .cx-cust__walkin {
-    grid-template-columns: 1fr;
+  &:focus {
+    outline: none;
+    border-color: #d97706;
   }
 }
 
@@ -830,129 +345,6 @@
   border-bottom: 1px dotted #eef2f7;
 }
 
-/* Both sides: the cashier's count of each denomination sits between the counter and the amount. */
-.cx-row--stock {
-  grid-template-columns: 64px 120px 1fr 96px;
-}
-
-.cx-row--over {
-  background: #fef2f2;
-}
-
-.cx-avail {
-  padding-left: 6px;
-  font-size: 12px;
-  color: #64748b;
-
-  strong {
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  /* the count after this exchange: green when it goes up, red when it goes down */
-  .cx-after {
-    display: inline-flex;
-    align-items: center;
-    gap: 3px;
-    margin-left: 6px;
-    font-weight: 600;
-
-    mat-icon {
-      font-size: 16px;
-      width: 16px;
-      height: 16px;
-    }
-
-    small {
-      font-size: 11px;
-    }
-  }
-
-  &--up .cx-after,
-  &--up .cx-after strong {
-    color: #15803d;
-  }
-
-  &--down .cx-after,
-  &--down .cx-after strong {
-    color: #b45309;
-  }
-
-  &--over,
-  &--over strong,
-  &--over .cx-after,
-  &--over .cx-after strong {
-    color: #b91c1c;
-  }
-}
-
-/* The drawer after the whole exchange, one chip per denomination it changes */
-.cx-impact {
-  padding: 12px 14px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
-
-  &__title {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    margin-bottom: 8px;
-    font-size: 13px;
-    font-weight: 700;
-    color: #0f172a;
-
-    mat-icon {
-      font-size: 18px;
-      width: 18px;
-      height: 18px;
-      color: #475569;
-    }
-  }
-
-  &__chips {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 8px;
-  }
-
-  &__chip {
-    display: inline-flex;
-    align-items: center;
-    gap: 6px;
-    padding: 5px 10px;
-    border-radius: 8px;
-    background: #f1f5f9;
-    font-size: 12px;
-    color: #334155;
-
-    b {
-      font-weight: 700;
-    }
-
-    em {
-      font-style: normal;
-      font-weight: 700;
-    }
-
-    &--up {
-      background: #dcfce7;
-      color: #166534;
-    }
-
-    &--down {
-      background: #fef3c7;
-      color: #92400e;
-    }
-  }
-
-  &__note {
-    margin-top: 8px;
-    font-size: 11px;
-    color: #64748b;
-  }
-}
-
 .cx-chip {
   display: inline-flex;
   align-items: center;

src/app/cashier/cash-exchange-entry/cash-exchange-entry.component.ts

@@ -11,16 +11,7 @@ import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
-import { MatDialog, MatDialogModule } from '@angular/material/dialog';
-import { forkJoin, of } from 'rxjs';
-import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { ClientsService } from 'app/clients/clients.service';
-import {
-  CustomerSearchDialogComponent,
-  CustomerSearchResult
-} from 'app/shared/customer-search-dialog/customer-search-dialog.component';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -29,47 +20,6 @@ interface Denom {
   label: string;
 }
 
-/** An existing client picked through Customer Search, with what the counter needs to identify them. */
-interface SelectedCustomer {
-  clientId: number;
-  displayName: string;
-  cifNumber: string | null;
-  mobileNo: string | null;
-  officeName: string | null;
-  accountNo: string | null;
-  accountType: string | null;
-  /** PAN on the client's KYC record, if any. */
-  kycPan: string | null;
-  panVerified: boolean;
-  kycStatus: string;
-}
-
-/** The cashier at the counter: the one who takes the customer's notes and hands over the change. */
-interface CashierInfo {
-  cashierId: number;
-  name: string;
-  tellerName: string | null;
-  officeName: string | null;
-  /** Cash the vault allocated to them for the day, once known. */
-  allocatedAmount: number | null;
-  /** Cash they hold now. */
-  totalAmount: number;
-}
-
-/** Same rule as ClientKycApiConstants.PAN_REGEX on the server: 5 letters, 4 digits, 1 letter. */
-const PAN_PATTERN = /^[A-Z]{5}[0-9]{4}[A-Z]$/;
-
-/** Income Tax Rule 114B / RBI: a cash exchange above this needs the customer's PAN. */
-const PAN_MANDATORY_ABOVE = 50000;
-
-const KYC_STATUS: Record<number, string> = {
-  100: 'Pending',
-  200: 'In Progress',
-  300: 'Verified',
-  400: 'Rejected',
-  500: 'Expired'
-};
-
 /** Cashier cash-exchange entry: customer gives some denominations and takes equal-value change (net 0). */
 @Component({
   selector: 'mifosx-cash-exchange-entry',
@@ -80,14 +30,11 @@ const KYC_STATUS: Record<number, string> = {
     CommonModule,
     FormsModule,
     MatIconModule,
-    MatSnackBarModule,
-    MatDialogModule
+    MatSnackBarModule
   ]
 })
 export class CashExchangeEntryComponent implements OnInit {
   private service = inject(CashierService);
-  private clientsService = inject(ClientsService);
-  private dialog = inject(MatDialog);
   private snackBar = inject(MatSnackBar);
 
   notes: Denom[] = [];
@@ -99,17 +46,11 @@ export class CashExchangeEntryComponent implements OnInit {
   saving = false;
 
   // ── Customer info ──
-  /** An existing client found through Customer Search, or a walk-in identified at the counter. */
-  customerMode: 'existing' | 'walkin' = 'walkin';
-  selectedCustomer: SelectedCustomer | null = null;
-  loadingCustomer = false;
-  walkInName = '';
-  walkInMobile = '';
-  panNumber = '';
+  isAccountHolder = false;
+  accountNo = '';
+  customerIdProof = '';
 
-  // ── Cashier at the counter, and their position (for the denomination overdraft check) ──
-  /** The cashier linked to the logged-in user; null when the login is not a cashier's. */
-  cashier: CashierInfo | null = null;
+  // ── Cashier position (for denomination overdraft check) ──
   private availableMap = new Map<number, number>();
   positionLoaded = false;
 
@@ -122,7 +63,7 @@ export class CashExchangeEntryComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.exchangeDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {
@@ -146,19 +87,7 @@ export class CashExchangeEntryComponent implements OnInit {
         ((res?.denominations || []) as any[]).forEach((d: any) => {
           if (d.denominationId) this.availableMap.set(Number(d.denominationId), Number(d.count ?? 0));
         });
-        const cashierId = res?.cashierId ? Number(res.cashierId) : null;
-        this.cashier = cashierId
-          ? {
-              cashierId,
-              name: res.cashierName || '',
-              tellerName: null,
-              officeName: null,
-              allocatedAmount: null,
-              totalAmount: Number(res.totalAmount ?? 0)
-            }
-          : null;
         this.positionLoaded = true;
-        if (cashierId) this.loadCashierDetails(cashierId);
       },
       error: () => {
         this.positionLoaded = true;
@@ -166,31 +95,6 @@ export class CashExchangeEntryComponent implements OnInit {
     });
   }
 
-  /** The counter, branch and today's allocation; the card still shows name and cash in hand without them. */
-  private loadCashierDetails(cashierId: number): void {
-    this.service
-      .getInterCashierCashierSummary(cashierId, this.exchangeDate)
-      .pipe(catchError(() => of(null)))
-      .subscribe((r: any) => {
-        if (!r || this.cashier?.cashierId !== cashierId) return;
-        this.cashier = {
-          ...this.cashier,
-          tellerName: r.tellerName || null,
-          officeName: r.officeName || null,
-          allocatedAmount: Number(r.allocatedAmount ?? 0)
-        };
-      });
-  }
-
-  /** Up to two letters for the cashier's avatar. */
-  get cashierInitials(): string {
-    const words = (this.cashier?.name || '').trim().split(/\s+/).filter(Boolean);
-    if (words.length === 0) return '?';
-    const first = words[0].charAt(0);
-    const last = words.length > 1 ? words[words.length - 1].charAt(0) : '';
-    return (first + last).toUpperCase();
-  }
-
   countFor(side: 'r' | 'g', d: Denom): number {
     return (side === 'r' ? this.receivedCounts : this.givenCounts)[d.id] || 0;
   }
@@ -224,102 +128,14 @@ export class CashExchangeEntryComponent implements OnInit {
     return this.receivedTotal > 0 && this.receivedTotal === this.givenTotal;
   }
 
-  /** Above ₹50,000 the customer's PAN is mandatory (Income Tax Rule 114B, followed under RBI guidelines). */
-  get needsPan(): boolean {
-    return this.receivedTotal > PAN_MANDATORY_ABOVE;
-  }
-
-  /** Up to two letters for the avatar: first and last word of the customer's name. */
-  get customerInitials(): string {
-    const words = (this.selectedCustomer?.displayName || '').trim().split(/\s+/).filter(Boolean);
-    if (words.length === 0) return '?';
-    const first = words[0].charAt(0);
-    const last = words.length > 1 ? words[words.length - 1].charAt(0) : '';
-    return (first + last).toUpperCase();
-  }
-
-  get panValue(): string {
-    return this.panNumber.trim().toUpperCase();
-  }
-
-  /** A PAN that is entered must be well-formed, required or not. */
-  get panFormatInvalid(): boolean {
-    return !!this.panValue && !PAN_PATTERN.test(this.panValue);
-  }
-
-  get panMissing(): boolean {
-    return this.needsPan && !this.panValue;
-  }
-
-  /** The PAN comes from the client's KYC record, so the cashier confirms it rather than types it. */
-  get panFromKyc(): boolean {
-    return !!this.selectedCustomer?.kycPan && this.panValue === this.selectedCustomer.kycPan.toUpperCase();
-  }
-
-  /** Who the customer is has to be known: a picked client, or a walk-in's name once PAN is required. */
-  get customerIdentified(): boolean {
-    if (this.customerMode === 'existing') return !!this.selectedCustomer;
-    return !this.needsPan || this.walkInName.trim().length > 0;
-  }
-
-  /** A login with no cashier behind it has no drawer to take notes into or give change from. */
-  get noCashier(): boolean {
-    return this.positionLoaded && !this.cashier;
-  }
-
-  /** How many of the denomination the cashier holds, or null while that is not known (loading, or no cashier). */
-  availableFor(d: Denom): number | null {
-    if (!this.positionLoaded || !this.cashier) return null;
-    return this.availableMap.get(d.id) ?? 0;
-  }
-
-  /** The cashier is giving more of this denomination than they hold. */
-  exceedsAvailable(d: Denom): boolean {
-    const available = this.availableFor(d);
-    return available !== null && this.countFor('g', d) > available;
-  }
-
-  /** The + on the given side stops at what the cashier holds; a larger typed number is still caught and shown. */
-  canGiveMore(d: Denom): boolean {
-    const available = this.availableFor(d);
-    return available === null || this.countFor('g', d) < available;
-  }
-
-  /** What this exchange does to the cashier's count of the denomination: notes taken in less notes given out. */
-  netFor(d: Denom): number {
-    return this.countFor('r', d) - this.countFor('g', d);
-  }
-
-  /** The cashier's count of the denomination once this exchange is recorded, or null while it is not known. */
-  drawerAfter(d: Denom): number | null {
-    const available = this.availableFor(d);
-    return available === null ? null : available + this.netFor(d);
-  }
-
-  /**
-   * The denominations this exchange changes, with the drawer's count before and after, so the effect shows
-   * while the counts are being typed. The branch's total for each denomination moves by the same amount, as
-   * the customer's notes go into the drawer and the change comes out of it; the vault is not involved.
-   */
-  get impactRows(): Array<{ id: number; label: string; kind: string; net: number; before: number; after: number }> {
-    if (!this.positionLoaded || !this.cashier) return [];
-    return this.denoms
-      .filter((d) => this.netFor(d) !== 0)
-      .map((d) => ({
-        id: d.id,
-        label: d.label,
-        kind: d.kind,
-        net: this.netFor(d),
-        before: this.availableFor(d) ?? 0,
-        after: this.drawerAfter(d) ?? 0
-      }));
+  /** Above ₹50,000 PAN/ID is mandatory per RBI guideline */
+  get needsIdProof(): boolean {
+    return this.receivedTotal >= 50000;
   }
 
   /** Denominations where cashier is giving more than currently available. */
   get givenOverdraftItems(): Array<{ label: string; available: number; requested: number }> {
-    // Without a cashier every denomination would read as "0 available"; the missing cashier is the
-    // thing to tell the user, not a stock shortage.
-    if (!this.positionLoaded || !this.cashier) return [];
+    if (!this.positionLoaded) return [];
     return this.denoms
       .map((d) => ({ label: d.label, available: this.availableMap.get(d.id) ?? 0, requested: this.countFor('g', d) }))
       .filter((item) => item.requested > 0 && item.requested > item.available);
@@ -330,77 +146,21 @@ export class CashExchangeEntryComponent implements OnInit {
   }
 
   get valid(): boolean {
-    return (
-      this.matches &&
-      !!this.cashier &&
-      !this.hasGivenOverdraft &&
-      !this.panFormatInvalid &&
-      !this.panMissing &&
-      this.customerIdentified &&
-      !this.loadingCustomer
-    );
+    return this.matches && (!this.needsIdProof || this.customerIdProof.trim().length > 0) && !this.hasGivenOverdraft;
   }
 
-  setCustomerMode(mode: 'existing' | 'walkin'): void {
-    if (this.customerMode === mode) return;
-    this.customerMode = mode;
-    this.selectedCustomer = null;
-    this.walkInName = '';
-    this.walkInMobile = '';
-    this.panNumber = '';
-  }
-
-  /** Pick an existing client through Customer Search, then load their details and KYC (PAN). */
-  openCustomerSearch(): void {
-    this.dialog
-      // An existing customer without an account is still a known customer, so the account is not required.
-      .open(CustomerSearchDialogComponent, { width: '960px', maxWidth: '95vw', data: { requireAccount: false } })
-      .afterClosed()
-      .subscribe((result: CustomerSearchResult | undefined) => {
-        if (!result?.clientId) return;
-        this.loadCustomer(result);
-      });
-  }
-
-  private loadCustomer(result: CustomerSearchResult): void {
-    this.loadingCustomer = true;
-    const id = String(result.clientId);
-    forkJoin({
-      client: this.clientsService.getClientData(id, true).pipe(catchError(() => of(null))),
-      kyc: this.clientsService.getClientKyc(id, true).pipe(catchError(() => of(null)))
-    }).subscribe(({ client, kyc }: { client: any; kyc: any }) => {
-      const kycPan: string | null = kyc?.panNumber || result.panNumber || null;
-      this.selectedCustomer = {
-        clientId: result.clientId,
-        displayName: client?.displayName || result.displayName,
-        cifNumber: client?.cifNumber || null,
-        mobileNo: client?.mobileNo || result.mobileNo || null,
-        officeName: client?.officeName || result.officeName || null,
-        accountNo: result.accountNo || null,
-        accountType: result.accountType || null,
-        kycPan,
-        panVerified: !!kyc?.panVerified,
-        kycStatus: KYC_STATUS[Number(kyc?.kycStatus?.id ?? kyc?.kycStatus)] || 'Not on record'
-      };
-      this.panNumber = kycPan ? kycPan.toUpperCase() : '';
-      this.loadingCustomer = false;
-    });
-  }
-
-  clearCustomer(): void {
-    this.selectedCustomer = null;
-    this.panNumber = '';
+  toggleAccountHolder(): void {
+    this.isAccountHolder = !this.isAccountHolder;
+    if (!this.isAccountHolder) this.accountNo = '';
   }
 
   clear(): void {
     this.receivedCounts = {};
     this.givenCounts = {};
     this.note = '';
-    this.customerMode = 'walkin';
-    this.selectedCustomer = null;
-    this.walkInName = '';
-    this.walkInMobile = '';
-    this.panNumber = '';
+    this.accountNo = '';
+    this.customerIdProof = '';
+    this.isAccountHolder = false;
   }
 
   submit(): void {
@@ -410,17 +170,11 @@ export class CashExchangeEntryComponent implements OnInit {
       this.denoms
         .filter((d) => this.countFor(side, d) > 0)
         .map((d) => ({ denominationId: d.id, denominationValue: d.value, count: this.countFor(side, d) }));
-    const customer = this.customerMode === 'existing' ? this.selectedCustomer : null;
-    const pan = this.panValue || null;
     const payload: any = {
       exchangeDate: this.exchangeDate,
       note: this.note || null,
-      clientId: customer?.clientId ?? null,
-      accountNo: customer?.accountNo ?? null,
-      customerName: customer ? customer.displayName : this.walkInName.trim() || null,
-      customerMobile: customer ? customer.mobileNo : this.walkInMobile.trim() || null,
-      panNumber: pan,
-      customerIdProof: pan,
+      customerIdProof: this.customerIdProof.trim() || null,
+      accountNo: this.isAccountHolder && this.accountNo.trim() ? this.accountNo.trim() : null,
       received: build('r'),
       given: build('g')
     };

src/app/cashier/cash-history/cash-history.component.html

@@ -11,11 +11,25 @@
     <div>
       <div class="pg-eyebrow">CASHIER · HISTORY</div>
       <h1 class="pg-title">Cash Movement History</h1>
-      <p class="pg-sub">All transfers, settlements, inter-cashier movements and cash exchanges.</p>
+      <p class="pg-sub">All transfers, settlements, and inter-cashier movements. Reverse any active transaction.</p>
     </div>
     <button type="button" class="pg-btn pg-btn--ghost" (click)="load()"><mat-icon>refresh</mat-icon> Refresh</button>
   </header>
 
+  <!-- Reversal confirm panel -->
+  @if (reversingId !== null) {
+    <div class="reverse-panel">
+      <mat-icon class="reverse-icon">warning</mat-icon>
+      <span
+        >Reverse <strong>#{{ reversingId }}</strong
+        >? This cannot be undone.</span
+      >
+      <input class="reverse-reason" type="text" [(ngModel)]="reverseReason" placeholder="Reason (optional)" />
+      <button type="button" class="pg-btn pg-btn--danger" (click)="confirmReverse()">Confirm Reversal</button>
+      <button type="button" class="pg-btn pg-btn--ghost" (click)="cancelReverse()">Cancel</button>
+    </div>
+  }
+
   @if (loading) {
     <div class="pg-empty">Loading…</div>
   }
@@ -120,6 +134,11 @@
                   >
                     <mat-icon>visibility</mat-icon>
                   </button>
+                  @if (!r.isReversed) {
+                    <button type="button" class="pg-btn pg-btn--ghost btn-sm" title="Reverse" (click)="startReverse(r)">
+                      <mat-icon>undo</mat-icon>
+                    </button>
+                  }
                 </div>
               </td>
             </tr>
@@ -168,12 +187,6 @@
           <span class="detail-meta__label">Date</span>
           <span class="detail-meta__val">{{ detail.row.date }}</span>
         </div>
-        @if (detail.row.type === 'exchange') {
-          <div class="detail-meta__item">
-            <span class="detail-meta__label">Customer PAN</span>
-            <span class="detail-meta__val">{{ detail.row.panNumber || '—' }}</span>
-          </div>
-        }
         <div class="detail-meta__item">
           <span class="detail-meta__label">Total Amount</span>
           <span class="detail-meta__val detail-meta__val--amount">₹{{ detail.row.amount | number: '1.2-2' }}</span>

src/app/cashier/cash-history/cash-history.component.scss

@@ -47,6 +47,38 @@
   }
 }
 
+.reverse-panel {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 12px 16px;
+  background: #fffbeb;
+  border: 1px solid #fcd34d;
+  border-radius: 10px;
+  flex-wrap: wrap;
+  font-size: 13px;
+  color: #92400e;
+
+  .reverse-icon {
+    color: #f59e0b;
+    font-size: 20px;
+    height: 20px;
+    width: 20px;
+  }
+
+  .reverse-reason {
+    flex: 1 1 200px;
+    height: 34px;
+    padding: 0 10px;
+    border: 1px solid #fcd34d;
+    border-radius: 7px;
+    font-size: 13px;
+    font-family: inherit;
+    background: #fff;
+    color: #1a1a1a;
+  }
+}
+
 /* ── Action buttons cell ── */
 .action-btns {
   display: flex;

src/app/cashier/cash-history/cash-history.component.ts

@@ -8,7 +8,9 @@
 
 import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
+import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatTabsModule } from '@angular/material/tabs';
 import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
 import { forkJoin, of } from 'rxjs';
@@ -29,8 +31,6 @@ interface TxnRow {
   reversedBy: number | null;
   reversedAt: string | null;
   reverseReason: string | null;
-  /** Customer PAN recorded on a cash exchange. */
-  panNumber?: string | null;
   type: 'transfer' | 'settlement' | 'inter' | 'exchange';
 }
 
@@ -52,10 +52,7 @@ interface DetailView {
   loading: boolean;
 }
 
-/**
- * Unified history of all cash movements with a detail view. Read-only: cash movements cannot be reversed
- * from here (an earlier reversal still shows as Reversed, with who, when and why).
- */
+/** Unified history of all cash movements with reversal and detail view support. */
 @Component({
   selector: 'mifosx-cash-history',
   templateUrl: './cash-history.component.html',
@@ -66,13 +63,16 @@ interface DetailView {
   standalone: true,
   imports: [
     CommonModule,
+    FormsModule,
     MatIconModule,
+    MatSnackBarModule,
     MatTabsModule,
     MatPaginatorModule
   ]
 })
 export class CashHistoryComponent implements OnInit {
   private service = inject(CashierService);
+  private snackBar = inject(MatSnackBar);
 
   transfers: TxnRow[] = [];
   settlements: TxnRow[] = [];
@@ -99,6 +99,10 @@ export class CashHistoryComponent implements OnInit {
 
   private denomKindMap = new Map<number, 'note' | 'coin'>();
 
+  reversingId: number | null = null;
+  reversingType: string | null = null;
+  reverseReason = '';
+
   detail: DetailView | null = null;
 
   ngOnInit(): void {
@@ -208,8 +212,7 @@ export class CashHistoryComponent implements OnInit {
       this.exchanges = (exchangeItems as any[]).map((e) => ({
         id: e.id,
         date: e.exchangeDate,
-        fromParty: this.exchangeParty(e),
-        panNumber: e.panNumber ?? null,
+        fromParty: e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer',
         toParty: e.performedByUsername || '—',
         amount: e.exchangeAmount,
         note: e.note,
@@ -307,8 +310,7 @@ export class CashHistoryComponent implements OnInit {
         this.exchanges = (res.pageItems ?? []).map((e: any) => ({
           id: e.id,
           date: e.exchangeDate,
-          fromParty: this.exchangeParty(e),
-          panNumber: e.panNumber ?? null,
+          fromParty: e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer',
           toParty: e.performedByUsername || '—',
           amount: e.exchangeAmount,
           note: e.note,
@@ -390,12 +392,39 @@ export class CashHistoryComponent implements OnInit {
     this.detail = null;
   }
 
-  /** Who the exchange was with: the customer's name (and account, if one), else the account, else a walk-in. */
-  private exchangeParty(e: any): string {
-    if (e.customerName) {
-      return e.accountNo ? `${e.customerName} (A/C ${e.accountNo})` : e.customerName;
-    }
-    return e.accountNo ? `Account ${e.accountNo}` : 'Walk-in Customer';
+  startReverse(row: TxnRow): void {
+    this.reversingId = row.id;
+    this.reversingType = row.type;
+    this.reverseReason = '';
+  }
+
+  cancelReverse(): void {
+    this.reversingId = null;
+    this.reversingType = null;
+    this.reverseReason = '';
+  }
+
+  confirmReverse(): void {
+    if (!this.reversingId || !this.reversingType) return;
+    const id = this.reversingId;
+    const type = this.reversingType;
+    const reason = this.reverseReason;
+    this.cancelReverse();
+
+    let obs$;
+    if (type === 'transfer') obs$ = this.service.reverseCashTransfer(id, reason);
+    else if (type === 'settlement') obs$ = this.service.reverseCashSettlement(id, reason);
+    else if (type === 'exchange') obs$ = this.service.reverseCashExchange(id, reason);
+    else obs$ = this.service.reverseInterCashierTransfer(id, reason);
+
+    obs$.pipe(catchError(() => of(null))).subscribe((res: any) => {
+      if (res?.reversed) {
+        this.snackBar.open('Transaction reversed successfully', 'Close', { duration: 3000 });
+        this.load();
+      } else {
+        this.snackBar.open('Reversal failed', 'Close', { duration: 3000 });
+      }
+    });
   }
 
   typeLabel(type: string): string {

src/app/cashier/cash-settlement/cash-settlement.component.ts

@@ -18,7 +18,6 @@ import { MatInputModule } from '@angular/material/input';
 import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 type PageState = 'loading' | 'no-cashier' | 'needs-reconciliation' | 'already-settled' | 'form';
 
@@ -91,7 +90,7 @@ export class CashSettlementComponent implements OnInit {
   saving = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.settlementDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service
       .getTellers()

src/app/cashier/cash-transfer/cash-transfer.component.ts

@@ -17,7 +17,6 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -83,7 +82,7 @@ export class CashTransferComponent implements OnInit {
   loadingVault = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {

src/app/cashier/cashier-position/cashier-position.component.ts

@@ -17,7 +17,6 @@ import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
 import { AuthenticationService } from '../../core/authentication/authentication.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -72,7 +71,7 @@ export class CashierPositionComponent implements OnInit {
   isCashierMode = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     this.isCashierMode = this.authService.isCashierUser();

src/app/cashier/cashier-routing.module.ts

@@ -23,7 +23,6 @@ import { DayBookComponent } from './day-book/day-book.component';
 import { VoucherReportComponent } from './voucher-report/voucher-report.component';
 import { BranchDayComponent } from './branch-day/branch-day.component';
 import { VaultPositionComponent } from './vault-position/vault-position.component';
-import { BranchCashPositionComponent } from './branch-cash-position/branch-cash-position.component';
 import { AccountRegisterComponent } from './account-register/account-register.component';
 import { ClosingCashReportComponent } from './closing-cash-report/closing-cash-report.component';
 import { ExcessTransactionReportComponent } from './excess-transaction-report/excess-transaction-report.component';
@@ -226,13 +225,6 @@ const routes: Routes = [
           component: VaultPositionComponent,
           data: { title: 'Vault Position', breadcrumb: 'Vault Position' }
         },
-        {
-          // What the whole branch holds per denomination: the vault plus every cashier's drawer, so an
-          // exchange (which leaves the vault alone) is visible in the bank's total.
-          path: 'branch-position',
-          component: BranchCashPositionComponent,
-          data: { title: 'Branch Cash Position', breadcrumb: 'Branch Cash Position' }
-        },
         {
           // The same day book the clerk and cashier read, reached from where a principal officer
           // signing the day off actually looks. It carries the Officer Verification Sheet — each

src/app/cashier/cashier.service.ts

@@ -32,6 +32,9 @@ export class CashierService {
   getCashExchange(id: number): Observable<any> {
     return this.http.get(`/cashexchange/${id}`);
   }
+  reverseCashExchange(id: number, reason: string): Observable<any> {
+    return this.http.post(`/cashexchange/${id}/reverse`, { reason });
+  }
 
   // ── Tellers / Cashiers ──
   getTellers(officeId?: number): Observable<any[]> {
@@ -57,6 +60,9 @@ export class CashierService {
   getCashTransferById(id: number): Observable<any> {
     return this.http.get(`/cashtransfer/${id}`);
   }
+  reverseCashTransfer(id: number, reason: string): Observable<any> {
+    return this.http.post(`/cashtransfer/${id}/reverse`, { reason });
+  }
 
   // ── Cash Settlement ──
   createCashSettlement(data: any): Observable<any> {
@@ -69,6 +75,9 @@ export class CashierService {
   getCashSettlementById(id: number): Observable<any> {
     return this.http.get(`/cashsettlement/${id}`);
   }
+  reverseCashSettlement(id: number, reason: string): Observable<any> {
+    return this.http.post(`/cashsettlement/${id}/reverse`, { reason });
+  }
 
   // ── Inter-cashier Transfer ──
   createInterCashierTransfer(data: any): Observable<any> {
@@ -81,10 +90,8 @@ export class CashierService {
   getInterCashierById(id: number): Observable<any> {
     return this.http.get(`/cashintercashier/${id}`);
   }
-  /** One cashier's details, today's vault allocation and denomination-wise cash, for either side of a transfer. */
-  getInterCashierCashierSummary(cashierId: number, date: string): Observable<any> {
-    const params = new HttpParams().set('cashierId', cashierId).set('date', date);
-    return this.http.get<any>('/cashintercashier/cashier-summary', { params });
+  reverseInterCashierTransfer(id: number, reason: string): Observable<any> {
+    return this.http.post(`/cashintercashier/${id}/reverse`, { reason });
   }
 
   // ── Reconciliation ──
@@ -198,23 +205,6 @@ export class CashierService {
     return this.http.get('/branchday', { params });
   }
 
-  /**
-   * The savings products whose interest posting report is due for the date and not yet approved —
-   * the backend refuses to close any branch's day while one is pending.
-   */
-  interestDayCloseCheck(
-    date?: string,
-    officeId?: number
-  ): Observable<{ businessDate: string; canClose: boolean; pendingProducts: string[] }> {
-    let params = new HttpParams();
-    if (date) params = params.set('date', date);
-    if (officeId) params = params.set('officeId', String(officeId));
-    return this.http.get<{ businessDate: string; canClose: boolean; pendingProducts: string[] }>(
-      '/savingsinterestpostingreports/day-close-check',
-      { params }
-    );
-  }
-
   /** Days opened and never closed — today's own open day excluded. */
   branchDayMissed(officeId?: number): Observable<any> {
     let params = new HttpParams();
@@ -311,16 +301,6 @@ export class CashierService {
     if (asOfDate) params = params.set('asOfDate', asOfDate);
     return this.http.get('/cashreports/vault-position', { params });
   }
-  /**
-   * Denomination-wise cash the whole branch holds: its vault(s) plus every cashier's drawer, with the day's
-   * exchange movement beside it. Not for a cashier -- the server refuses it.
-   */
-  branchCashPosition(asOfDate?: string, officeId?: number): Observable<any> {
-    let params = new HttpParams();
-    if (asOfDate) params = params.set('asOfDate', asOfDate);
-    if (officeId) params = params.set('officeId', String(officeId));
-    return this.http.get('/cashreports/branch-position', { params });
-  }
   excessTransactionReport(threshold: number, fromDate?: string, toDate?: string): Observable<any[]> {
     let params = new HttpParams().set('threshold', String(threshold));
     if (fromDate) params = params.set('fromDate', fromDate);

src/app/cashier/clerk-share-withdrawal.service.ts

@@ -51,12 +51,6 @@ export class ClerkShareWithdrawalService {
     return this.http.post(`/clerk/share-withdrawal-requests/${id}/validate`, {});
   }
 
-  /** Runs the exact same checklist approve() will run, against a draft that hasn't been submitted
-   *  yet — so the clerk sees it in the confirm dialog, before committing to the request. */
-  previewValidate(data: any): Observable<any> {
-    return this.http.post('/clerk/share-withdrawal-requests/preview-validate', data);
-  }
-
   approve(id: number): Observable<any> {
     return this.http.post(`/clerk/share-withdrawal-requests/${id}/approve`, {});
   }

src/app/cashier/closing-cash-report/closing-cash-report.component.ts

@@ -12,7 +12,6 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatPaginatorModule, PageEvent } from '@angular/material/paginator';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 /** Day-wise denomination-wise closing cash collected from deposits. */
 @Component({
@@ -205,7 +204,7 @@ export class ClosingCashReportComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.date = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.load();
     this.service.getTellers().subscribe({ next: (t: any[]) => (this.tellers = t || []), error: () => {} });

src/app/cashier/day-book/day-book.component.ts

@@ -13,7 +13,6 @@ import { MatIconModule } from '@angular/material/icon';
 import { Router } from '@angular/router';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 /**
  * Which part of the day's work a row came from. Set by the server, one per source register.
@@ -96,7 +95,7 @@ export class DayBookComponent implements OnInit {
 
   /** Local date as yyyy-MM-dd — toISOString() would shift the day in any timezone behind UTC. */
   private today(): string {
-    const d = businessToday();
+    const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 

src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.html

@@ -11,29 +11,41 @@
     <div>
       <div class="pg-eyebrow">CASHIER · INTER-CASHIER TRANSFER</div>
       <h1 class="pg-title">Inter-Cashier Transfer</h1>
-      <p class="pg-sub">Hand over denomination-wise cash from your drawer to another cashier at your counter.</p>
+      <p class="pg-sub">Move denomination-wise cash between two cashiers within the same teller.</p>
     </div>
     <button type="button" class="pg-btn pg-btn--ghost" (click)="clear()"><mat-icon>undo</mat-icon> Clear</button>
   </header>
 
-  @if (ownCashierMissing) {
-    <div class="ict-alert">
-      <mat-icon>person_off</mat-icon>
-      Your login is not linked to a cashier. An inter-cashier transfer is made by the cashier handing the cash over, so
-      log in as that cashier.
-    </div>
-  }
-
   <div class="pg-toolbar pg-toolbar--mat">
-    <mat-form-field appearance="outline" subscriptSizing="dynamic">
-      <mat-label>Teller</mat-label>
-      <input matInput type="text" [value]="tellerName || '—'" readonly />
-    </mat-form-field>
+    @if (tellers.length === 1) {
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <mat-label>Teller</mat-label>
+        <input matInput type="text" [value]="tellers[0].name" readonly />
+      </mat-form-field>
+    } @else {
+      <mat-form-field appearance="outline" subscriptSizing="dynamic">
+        <mat-label>Teller</mat-label>
+        <mat-select [value]="selectedTellerId" (selectionChange)="onTellerSelect($event.value)">
+          @for (t of tellers; track t.id) {
+            <mat-option [value]="t.id">{{ t.name }}</mat-option>
+          }
+          @if (tellers.length === 0) {
+            <mat-option [value]="null" disabled>No tellers configured</mat-option>
+          }
+        </mat-select>
+      </mat-form-field>
+    }
 
-    <!-- The sender is always the cashier who is logged in; nothing to pick. -->
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
-      <mat-label>From (You)</mat-label>
-      <input matInput type="text" [value]="fromParty || '—'" readonly />
+      <mat-label>From (Cashier)</mat-label>
+      <mat-select [value]="fromCashierId" (selectionChange)="onFromSelect($event.value)" [disabled]="!selectedTellerId">
+        @for (c of availableFrom; track c.id) {
+          <mat-option [value]="c.id">{{ c.label }}</mat-option>
+        }
+        @if (selectedTellerId && allCashiers.length === 0 && !loadingCashiers) {
+          <mat-option [value]="null" disabled>No cashiers</mat-option>
+        }
+      </mat-select>
     </mat-form-field>
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
@@ -42,7 +54,7 @@
         @for (c of availableTo; track c.id) {
           <mat-option [value]="c.id">{{ c.label }}</mat-option>
         }
-        @if (fromCashierId && !loadingCashiers && availableTo.length === 0) {
+        @if (fromCashierId && availableTo.length === 0) {
           <mat-option [value]="null" disabled>No other cashiers</mat-option>
         }
       </mat-select>
@@ -50,7 +62,7 @@
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic">
       <mat-label>Date</mat-label>
-      <input matInput type="date" [value]="transferDate" (change)="onDateChange($any($event.target).value)" />
+      <input matInput type="date" [value]="transferDate" (change)="transferDate = $any($event.target).value" />
     </mat-form-field>
 
     <mat-form-field appearance="outline" subscriptSizing="dynamic" class="pg-note-field">
@@ -59,102 +71,26 @@
     </mat-form-field>
   </div>
 
-  <!-- Both sides of the transfer: who they are, whether the vault has allocated them cash today,
-       and what they hold now. -->
-  @if (fromCashierId || toCashierId) {
-    <div class="ict-parties">
-      <ng-container
-        *ngTemplateOutlet="
-          partyCard;
-          context: { title: 'From (Sending Cashier)', s: fromSummary, loading: loadingFrom, picked: !!fromCashierId }
-        "
-      ></ng-container>
-      <mat-icon class="ict-parties__arrow">arrow_forward</mat-icon>
-      <ng-container
-        *ngTemplateOutlet="
-          partyCard;
-          context: { title: 'To (Receiving Cashier)', s: toSummary, loading: loadingTo, picked: !!toCashierId }
-        "
-      ></ng-container>
-    </div>
-  }
-
-  <ng-template #partyCard let-title="title" let-s="s" let-loading="loading" let-picked="picked">
-    <div class="ict-party" [class.ict-party--blocked]="s && !s.cashAllocated">
-      <div class="ict-party__title">{{ title }}</div>
-      @if (!picked) {
-        <div class="ict-party__empty">Select a cashier</div>
-      } @else if (loading) {
-        <div class="ict-party__empty">Loading…</div>
-      } @else if (!s) {
-        <div class="ict-party__empty">Could not load this cashier's details.</div>
-      } @else {
-        <div class="ict-party__name">{{ s.cashierName || '—' }}</div>
-        <div class="ict-party__meta">
-          <span><mat-icon>point_of_sale</mat-icon> {{ s.tellerName || '—' }}</span>
-          <span><mat-icon>account_balance</mat-icon> {{ s.officeName || '—' }}</span>
-        </div>
-        <div class="ict-party__figures">
-          <div>
-            <div class="ict-party__label">Allocated today</div>
-            <div class="ict-party__value">₹{{ s.allocatedAmount | number: '1.2-2' }}</div>
-          </div>
-          <div>
-            <div class="ict-party__label">Cash in hand</div>
-            <div class="ict-party__value">₹{{ s.totalAmount | number: '1.2-2' }}</div>
-          </div>
-        </div>
-        @if (!s.cashAllocated) {
-          <div class="ict-party__warn">
-            <mat-icon>block</mat-icon> No cash allocated from the vault for this date — inter-cashier transfer is not
-            allowed.
-          </div>
-        }
-      }
-    </div>
-  </ng-template>
-
-  @if (fromSummary && toSummary && !bothAllocated) {
-    <div class="ict-alert">
-      <mat-icon>block</mat-icon>
-      Both cashiers must first be allocated cash from the vault (Cash Transfer) for {{ transferDate }} before an
-      inter-cashier transfer.
-    </div>
-  }
-  @if (anyExceedsHeld) {
-    <div class="ict-alert">
-      <mat-icon>error_outline</mat-icon>
-      The sending cashier does not hold enough of the highlighted denominations.
-    </div>
-  }
-
   <div class="pg-card">
     <table class="pg-table">
       <thead>
         <tr>
           <th>Denomination</th>
-          <th class="num">From holds</th>
           <th style="text-align: center">Count</th>
           <th class="num">Amount</th>
-          <th class="num">To holds</th>
         </tr>
       </thead>
       <tbody>
         @if (notes.length) {
           <tr class="pg-section">
-            <td colspan="5">Bank Notes</td>
+            <td colspan="3">Bank Notes</td>
           </tr>
         }
         @for (d of notes; track d.id) {
-          <tr [class.ict-row--over]="exceedsHeld(d)">
+          <tr>
             <td>
               <span class="pg-chip">{{ d.label }}</span>
             </td>
-            <td class="num" [class.ict-held--over]="exceedsHeld(d)">
-              <ng-container
-                *ngTemplateOutlet="heldCell; context: { n: heldBy(fromSummary, d), delta: -countFor(d) }"
-              ></ng-container>
-            </td>
             <td style="display: flex; justify-content: center">
               <div class="pg-step">
                 <button type="button" (click)="bump(d, -1)" [disabled]="countFor(d) === 0">−</button>
@@ -163,28 +99,18 @@
               </div>
             </td>
             <td class="num">₹{{ subtotal(d) | number: '1.2-2' }}</td>
-            <td class="num">
-              <ng-container
-                *ngTemplateOutlet="heldCell; context: { n: heldBy(toSummary, d), delta: countFor(d) }"
-              ></ng-container>
-            </td>
           </tr>
         }
         @if (coins.length) {
           <tr class="pg-section">
-            <td colspan="5">Coins</td>
+            <td colspan="3">Coins</td>
           </tr>
         }
         @for (d of coins; track d.id) {
-          <tr [class.ict-row--over]="exceedsHeld(d)">
+          <tr>
             <td>
               <span class="pg-chip pg-chip--coin">{{ d.label }}</span>
             </td>
-            <td class="num" [class.ict-held--over]="exceedsHeld(d)">
-              <ng-container
-                *ngTemplateOutlet="heldCell; context: { n: heldBy(fromSummary, d), delta: -countFor(d) }"
-              ></ng-container>
-            </td>
             <td style="display: flex; justify-content: center">
               <div class="pg-step">
                 <button type="button" (click)="bump(d, -1)" [disabled]="countFor(d) === 0">−</button>
@@ -193,34 +119,17 @@
               </div>
             </td>
             <td class="num">₹{{ subtotal(d) | number: '1.2-2' }}</td>
-            <td class="num">
-              <ng-container
-                *ngTemplateOutlet="heldCell; context: { n: heldBy(toSummary, d), delta: countFor(d) }"
-              ></ng-container>
-            </td>
           </tr>
         }
         @if (denoms.length === 0) {
           <tr>
-            <td colspan="5" class="pg-empty">No active denominations. Add some in Cash Denomination.</td>
+            <td colspan="3" class="pg-empty">No active denominations. Add some in Cash Denomination.</td>
           </tr>
         }
       </tbody>
     </table>
   </div>
 
-  <!-- A held count, with what it becomes once this transfer is recorded. -->
-  <ng-template #heldCell let-n="n" let-delta="delta">
-    @if (n === null) {
-      —
-    } @else {
-      {{ n }}
-      @if (delta !== 0) {
-        <span class="ict-after">→ {{ n + delta }}</span>
-      }
-    }
-  </ng-template>
-
   <div class="pg-total-bar">
     Total to transfer: <strong>₹{{ total | number: '1.2-2' }}</strong>
     <button type="button" class="pg-btn pg-btn--primary" [disabled]="!valid || saving" (click)="submit()">

src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.scss

@@ -1,150 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-.ict-parties {
-  display: grid;
-  grid-template-columns: 1fr auto 1fr;
-  align-items: stretch;
-  gap: 12px;
-  margin-bottom: 12px;
-
-  &__arrow {
-    align-self: center;
-    color: #64748b;
-  }
-
-  @media (width <= 760px) {
-    grid-template-columns: 1fr;
-
-    &__arrow {
-      justify-self: center;
-      transform: rotate(90deg);
-    }
-  }
-}
-
-.ict-party {
-  padding: 12px 14px;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 10px;
-
-  &--blocked {
-    background: #fef2f2;
-    border-color: #fecaca;
-  }
-
-  &__title {
-    font-size: 11px;
-    font-weight: 700;
-    letter-spacing: 0.04em;
-    text-transform: uppercase;
-    color: #64748b;
-  }
-
-  &__empty {
-    margin-top: 8px;
-    font-size: 13px;
-    color: #94a3b8;
-  }
-
-  &__name {
-    margin-top: 4px;
-    font-size: 16px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__meta {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 14px;
-    margin-top: 4px;
-    font-size: 12px;
-    color: #475569;
-
-    span {
-      display: inline-flex;
-      align-items: center;
-      gap: 4px;
-    }
-
-    mat-icon {
-      font-size: 14px;
-      width: 14px;
-      height: 14px;
-    }
-  }
-
-  &__figures {
-    display: flex;
-    gap: 24px;
-    margin-top: 10px;
-  }
-
-  &__label {
-    font-size: 11px;
-    color: #64748b;
-  }
-
-  &__value {
-    font-size: 15px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &__warn {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    margin-top: 10px;
-    font-size: 12px;
-    font-weight: 600;
-    color: #991b1b;
-
-    mat-icon {
-      font-size: 16px;
-      width: 16px;
-      height: 16px;
-    }
-  }
-}
-
-.ict-alert {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  margin-bottom: 10px;
-  padding: 8px 14px;
-  background: #fef2f2;
-  border: 1px solid #fecaca;
-  border-radius: 8px;
-  font-size: 12px;
-  color: #991b1b;
-
-  mat-icon {
-    font-size: 16px;
-    width: 16px;
-    height: 16px;
-  }
-}
-
-.ict-row--over {
-  background: #fef2f2;
-}
-
-.ict-held--over {
-  color: #b91c1c;
-  font-weight: 700;
-}
-
-.ict-after {
-  margin-left: 4px;
-  font-size: 11px;
-  color: #64748b;
-}

src/app/cashier/inter-cashier-transfer/inter-cashier-transfer.component.ts

@@ -17,7 +17,6 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface Denom {
   id: number;
@@ -29,27 +28,12 @@ interface Cashier {
   id: number;
   label: string;
 }
-/** One side of the transfer, from GET /cashintercashier/cashier-summary. */
-interface CashierSummary {
-  cashierId: number;
-  cashierName: string;
-  tellerName: string;
-  officeName: string;
-  cashAllocated: boolean;
-  allocatedAmount: number;
-  totalAmount: number;
-  /** Count held per denomination id. */
-  held: Record<number, number>;
-}
 
 /** Move cash denomination-wise between two cashiers under the same teller. */
 @Component({
   selector: 'mifosx-inter-cashier-transfer',
   templateUrl: './inter-cashier-transfer.component.html',
-  styleUrls: [
-    '../cashier-shared.scss',
-    './inter-cashier-transfer.component.scss'
-  ],
+  styleUrls: ['../cashier-shared.scss'],
   standalone: true,
   imports: [
     CommonModule,
@@ -72,12 +56,7 @@ export class InterCashierTransferComponent implements OnInit {
   note = '';
   saving = false;
 
-  /**
-   * The sending cashier is always the one logged in: cash is handed over from their own drawer, so there is
-   * no one else to pick on that side. Only the receiving cashier is chosen.
-   */
-  ownCashierMissing = false;
-  tellerName = '';
+  tellers: { id: number; name: string }[] = [];
   allCashiers: Cashier[] = [];
   selectedTellerId: number | null = null;
   fromCashierId: number | null = null;
@@ -86,25 +65,21 @@ export class InterCashierTransferComponent implements OnInit {
   toParty = '';
   loadingCashiers = false;
 
-  /** Details and denomination-wise cash of each side, so both are seen before the transfer is recorded. */
-  fromSummary: CashierSummary | null = null;
-  toSummary: CashierSummary | null = null;
-  loadingFrom = false;
-  loadingTo = false;
-
   get denoms(): Denom[] {
     return [
       ...this.notes,
       ...this.coins
     ];
   }
-  /** Everyone under the same teller except the sender. */
+  get availableFrom(): Cashier[] {
+    return this.allCashiers;
+  }
   get availableTo(): Cashier[] {
     return this.allCashiers.filter((c) => c.id !== this.fromCashierId);
   }
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.transferDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.service.getActiveDenominations().subscribe({
       next: (list) => {
@@ -122,20 +97,25 @@ export class InterCashierTransferComponent implements OnInit {
         this.coins = [];
       }
     });
-    // The sender is the cashier behind this login; their counter then gives the receivers to pick from.
-    this.service.getCurrentCashierInfo().subscribe((info) => {
-      if (!info) {
-        this.ownCashierMissing = true;
-        return;
-      }
-      this.fromCashierId = info.cashierId;
-      this.fromParty = info.cashierName;
-      this.loadSummary('from');
-    });
+    this.service
+      .getTellers()
+      .pipe(catchError(() => of([] as any[])))
+      .subscribe((list) => {
+        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
+        if (this.tellers.length === 1) {
+          this.onTellerSelect(this.tellers[0].id);
+        }
+      });
   }
 
-  /** The other cashiers at this counter, one of whom receives the cash. */
-  private loadReceivers(tellerId: number): void {
+  onTellerSelect(tellerId: number): void {
+    this.selectedTellerId = tellerId;
+    this.fromCashierId = null;
+    this.toCashierId = null;
+    this.fromParty = '';
+    this.toParty = '';
+    this.allCashiers = [];
+    if (!tellerId) return;
     this.loadingCashiers = true;
     this.service
       .getCashiersForTeller(tellerId)
@@ -146,90 +126,20 @@ export class InterCashierTransferComponent implements OnInit {
       });
   }
 
+  onFromSelect(cashierId: number): void {
+    this.fromCashierId = cashierId;
+    const c = this.allCashiers.find((x) => x.id === cashierId);
+    this.fromParty = c ? c.label : '';
+    if (this.toCashierId === cashierId) {
+      this.toCashierId = null;
+      this.toParty = '';
+    }
+  }
+
   onToSelect(cashierId: number): void {
     this.toCashierId = cashierId;
     const c = this.allCashiers.find((x) => x.id === cashierId);
     this.toParty = c ? c.label : '';
-    this.loadSummary('to');
-  }
-
-  onDateChange(value: string): void {
-    this.transferDate = value;
-    this.loadSummary('from');
-    this.loadSummary('to');
-  }
-
-  /** Fetch one side's details, vault allocation and denomination-wise cash for the transfer date. */
-  private loadSummary(side: 'from' | 'to'): void {
-    const cashierId = side === 'from' ? this.fromCashierId : this.toCashierId;
-    if (side === 'from') {
-      this.fromSummary = null;
-    } else {
-      this.toSummary = null;
-    }
-    if (!cashierId || !this.transferDate) return;
-    this.setLoading(side, true);
-    this.service
-      .getInterCashierCashierSummary(cashierId, this.transferDate)
-      .pipe(catchError(() => of(null)))
-      .subscribe((r: any) => {
-        this.setLoading(side, false);
-        // A late answer for a cashier no longer selected on that side is dropped.
-        const current = side === 'from' ? this.fromCashierId : this.toCashierId;
-        if (!r || current !== cashierId) return;
-        // The sender's summary also tells which counter they are at, hence who they can hand cash to.
-        if (side === 'from' && r.tellerId && this.selectedTellerId !== Number(r.tellerId)) {
-          this.selectedTellerId = Number(r.tellerId);
-          this.tellerName = r.tellerName || '';
-          this.loadReceivers(this.selectedTellerId);
-        }
-        const held: Record<number, number> = {};
-        for (const d of r.denominations || []) {
-          held[d.denominationId] = (held[d.denominationId] || 0) + Number(d.count || 0);
-        }
-        const summary: CashierSummary = {
-          cashierId: r.cashierId,
-          cashierName: r.cashierName,
-          tellerName: r.tellerName,
-          officeName: r.officeName,
-          cashAllocated: !!r.cashAllocated,
-          allocatedAmount: Number(r.allocatedAmount || 0),
-          totalAmount: Number(r.totalAmount || 0),
-          held
-        };
-        if (side === 'from') {
-          this.fromSummary = summary;
-        } else {
-          this.toSummary = summary;
-        }
-      });
-  }
-
-  private setLoading(side: 'from' | 'to', loading: boolean): void {
-    if (side === 'from') {
-      this.loadingFrom = loading;
-    } else {
-      this.loadingTo = loading;
-    }
-  }
-
-  /** Count of the denomination the cashier holds, or null while their figures are not loaded. */
-  heldBy(summary: CashierSummary | null, d: Denom): number | null {
-    return summary ? summary.held[d.id] || 0 : null;
-  }
-
-  /** The sending cashier is asked to hand on more of this denomination than they hold. */
-  exceedsHeld(d: Denom): boolean {
-    return !!this.fromSummary && this.countFor(d) > (this.fromSummary.held[d.id] || 0);
-  }
-
-  get anyExceedsHeld(): boolean {
-    return this.denoms.some((d) => this.exceedsHeld(d));
-  }
-
-  /** Both sides must have been allocated cash from the vault for the day before they can transfer. */
-  get bothAllocated(): boolean {
-    return !!this.fromSummary?.cashAllocated && !!this.toSummary?.cashAllocated;
   }
 
   countFor(d: Denom): number {
@@ -249,14 +159,7 @@ export class InterCashierTransferComponent implements OnInit {
     return this.denoms.reduce((s, d) => s + this.subtotal(d), 0);
   }
   get valid(): boolean {
-    return (
-      this.total > 0 &&
-      !!this.selectedTellerId &&
-      !!this.fromCashierId &&
-      !!this.toCashierId &&
-      this.bothAllocated &&
-      !this.anyExceedsHeld
-    );
+    return this.total > 0 && !!this.selectedTellerId && !!this.fromCashierId && !!this.toCashierId;
   }
 
   clear(): void {
@@ -283,12 +186,10 @@ export class InterCashierTransferComponent implements OnInit {
         this.snackBar.open('Inter-cashier transfer recorded', 'Close', { duration: 3000 });
         this.clear();
         this.note = '';
-        // The sender stays the logged-in cashier; the receiver is picked afresh, and the sender's holdings
-        // are read again now that part of them has gone.
+        this.fromCashierId = null;
         this.toCashierId = null;
+        this.fromParty = '';
         this.toParty = '';
-        this.toSummary = null;
-        this.loadSummary('from');
         this.saving = false;
       },
       error: () => {

src/app/cashier/my-work/my-work.component.ts

@@ -14,7 +14,6 @@ import { MatDialog, MatDialogModule } from '@angular/material/dialog';
 import { catchError, finalize, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
 import { VoucherDetailDialogComponent } from './voucher-detail-dialog.component';
-import { businessToday } from 'app/core/utils/business-today';
 
 /** What the signed-in user's part in a voucher was. */
 export type MyRole = 'RAISED' | 'VERIFIED' | 'RAISED_AND_VERIFIED';
@@ -358,7 +357,7 @@ export class MyWorkComponent implements OnInit {
   }
 
   private todayIso(): string {
-    const d = businessToday();
+    const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 }

src/app/cashier/reconciliation/reconciliation.component.html

@@ -19,21 +19,34 @@
     <!-- ── Entry Tab ── -->
     <mat-tab label="New Reconciliation">
       <div class="pg-tab-body">
-        @if (ownCashierMissing) {
-          <div class="pg-empty">
-            Your login is not linked to a cashier, so there is no cash drawer to reconcile. Ask an administrator to link
-            your user to a cashier.
-          </div>
-        }
         <div class="pg-toolbar pg-toolbar--mat">
-          <!-- A reconciliation is the cashier's own count of their own drawer: nothing to pick. -->
+          @if (tellers.length === 1) {
+            <mat-form-field appearance="outline" subscriptSizing="dynamic">
+              <mat-label>Teller</mat-label>
+              <input matInput type="text" [value]="tellers[0].name" readonly />
+            </mat-form-field>
+          } @else {
+            <mat-form-field appearance="outline" subscriptSizing="dynamic">
+              <mat-label>Teller</mat-label>
+              <mat-select [value]="selectedTellerId" (selectionChange)="onTellerSelect($event.value)">
+                @for (t of tellers; track t.id) {
+                  <mat-option [value]="t.id">{{ t.name }}</mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+          }
+
           <mat-form-field appearance="outline" subscriptSizing="dynamic">
-            <mat-label>Teller</mat-label>
-            <input matInput type="text" [value]="ownTellerName || '—'" readonly />
-          </mat-form-field>
-          <mat-form-field appearance="outline" subscriptSizing="dynamic">
-            <mat-label>Cashier (You)</mat-label>
-            <input matInput type="text" [value]="cashierName || '—'" readonly />
+            <mat-label>Cashier</mat-label>
+            <mat-select
+              [value]="selectedCashierId"
+              (selectionChange)="onCashierSelect($event.value)"
+              [disabled]="!selectedTellerId"
+            >
+              @for (c of cashiers; track c.id) {
+                <mat-option [value]="c.id">{{ c.label }}</mat-option>
+              }
+            </mat-select>
           </mat-form-field>
 
           <mat-form-field appearance="outline" subscriptSizing="dynamic">

src/app/cashier/reconciliation/reconciliation.component.ts

@@ -12,12 +12,12 @@ import { FormsModule } from '@angular/forms';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
 import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatSelectModule } from '@angular/material/select';
 import { MatInputModule } from '@angular/material/input';
 import { MatTabsModule } from '@angular/material/tabs';
 import { forkJoin, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -57,6 +57,7 @@ interface ReconRecord {
     MatIconModule,
     MatSnackBarModule,
     MatFormFieldModule,
+    MatSelectModule,
     MatInputModule,
     MatTabsModule
   ]
@@ -65,14 +66,9 @@ export class ReconciliationComponent implements OnInit {
   private service = inject(CashierService);
   private snackBar = inject(MatSnackBar);
 
-  /**
-   * A reconciliation is the cashier's own count of their own drawer, so nobody else makes one and there is
-   * no cashier to pick: the screen is fixed to the logged-in cashier. The server refuses anything else.
-   */
-  ownCashierMissing = false;
-  ownTellerName = '';
-
   // ── Entry form ──
+  tellers: { id: number; name: string }[] = [];
+  cashiers: { id: number; label: string }[] = [];
   selectedTellerId: number | null = null;
   selectedCashierId: number | null = null;
   cashierName = '';
@@ -89,30 +85,44 @@ export class ReconciliationComponent implements OnInit {
   loadingHistory = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.reconDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
-    this.lockToOwnCashier();
+    this.service
+      .getTellers()
+      .pipe(catchError(() => of([] as any[])))
+      .subscribe((list) => {
+        this.tellers = (list || []).map((t: any) => ({ id: t.id, name: t.name }));
+        if (this.tellers.length === 1) {
+          this.onTellerSelect(this.tellers[0].id);
+        }
+      });
     this.loadHistory();
   }
 
-  /** Take the logged-in cashier as the one being reconciled, with their counter for the record. */
-  private lockToOwnCashier(): void {
-    this.service.getCurrentCashierInfo().subscribe((info) => {
-      if (!info) {
-        this.ownCashierMissing = true;
-        return;
-      }
-      this.selectedCashierId = info.cashierId;
-      this.cashierName = info.cashierName;
-      this.service
-        .getInterCashierCashierSummary(info.cashierId, this.reconDate)
-        .pipe(catchError(() => of(null)))
-        .subscribe((r: any) => {
-          this.selectedTellerId = r?.tellerId ?? null;
-          this.ownTellerName = r?.tellerName || '';
-        });
-      this.fetchExpected();
-    });
+  onTellerSelect(tellerId: number): void {
+    this.selectedTellerId = tellerId;
+    this.selectedCashierId = null;
+    this.cashierName = '';
+    this.cashiers = [];
+    this.rows = [];
+    if (!tellerId) return;
+    this.service
+      .getCashiersForTeller(tellerId)
+      .pipe(catchError(() => of({ cashiers: [] })))
+      .subscribe((r: any) => {
+        this.cashiers = (r?.cashiers || []).map((c: any) => ({ id: c.id, label: c.staffName }));
+        if (this.cashiers.length === 1) {
+          this.onCashierSelect(this.cashiers[0].id);
+        }
+      });
+  }
+
+  onCashierSelect(cashierId: number): void {
+    this.selectedCashierId = cashierId;
+    const c = this.cashiers.find((x) => x.id === cashierId);
+    this.cashierName = c ? c.label : '';
+    this.rows = [];
+    this.fetchExpected();
   }
 
   fetchExpected(): void {

src/app/cashier/transaction-entry/transaction-entry.component.ts

@@ -11,7 +11,7 @@ import { CommonModule } from '@angular/common';
 import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { catchError, debounceTime, distinctUntilChanged, map, timeout } from 'rxjs/operators';
+import { catchError, debounceTime, distinctUntilChanged, map } from 'rxjs/operators';
 import { forkJoin, of, Subject } from 'rxjs';
 import { MatDialog, MatDialogModule, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { MatIconModule } from '@angular/material/icon';
@@ -33,7 +33,6 @@ import {
 import { SponsorDDService } from '../../sponsor-dd/sponsor-dd.service';
 import { OrganizationService } from '../../organization/organization.service';
 import { CashierIssueDdDialogComponent } from './cashier-issue-dd-dialog.component';
-import { businessToday, businessTodayIso } from 'app/core/utils/business-today';
 
 interface TxnRow {
   typ: string;
@@ -622,7 +621,7 @@ export class AccountStatementDialogComponent implements OnInit {
 
   @ViewChild('statementContent') statementContent!: ElementRef;
 
-  today = businessTodayIso();
+  today = new Date().toISOString().slice(0, 10);
   fromDate = '';
   toDate = this.today;
 
@@ -1871,7 +1870,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   saving = false;
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.today = `${String(d.getDate()).padStart(2, '0')}/${String(d.getMonth() + 1).padStart(2, '0')}/${d.getFullYear()}`;
     this.addRow();
     this.loadDenominations();
@@ -2104,7 +2103,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   }
 
   private loadOpeningPosition(): void {
-    const d = businessToday();
+    const d = new Date();
     const asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     this.cashierService
       .getCashierPositionForMe(asOfDate)
@@ -2838,7 +2837,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
     fundingAccountId: number,
     fundingClientId: number | null
   ): void {
-    const d = businessToday();
+    const d = new Date();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
     const isGl = row.acTyp === 'GL';
@@ -2970,7 +2969,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const d = businessToday();
+    const d = new Date();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     const isCurrent = row.acTyp === 'CA' || row.acTyp === 'CB';
 
@@ -3069,7 +3068,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const d = businessToday();
+    const d = new Date();
     const issuedDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     const payload = {
@@ -3392,7 +3391,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = businessToday();
+    const today = new Date();
     const requestedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
 
     // Full snapshot of the CR (settlement) row exactly as the clerk filled it in — saved verbatim
@@ -3426,7 +3425,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       meetingDate: shareRow.meetingDate,
       description: shareRow.description || null,
       settlementPaymentTypeId: savingsRow.paymentTypeId,
-      settlementMode: 'SAVINGS',
       settlementRowSnapshot
     };
 
@@ -3457,60 +3455,11 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         ? 'Pending Manager approval — redemption, settlement and account closure all post together on approval.'
         : 'Pending Manager approval — redemption and settlement both post together on approval.'
     ];
-    this.showShareWithdrawalConfirm(payload, confirmLines, () =>
+    this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', confirmLines, 'Submit for Approval', () =>
       this.doSubmitShareRedemptionTransfer(payload, shareRow, shares, linkedAcNo)
     );
   }
 
-  /**
-   * Shows the confirm dialog with the same checklist the Manager will see when approving this
-   * request — fetched live from the backend (`previewValidate`) rather than re-implemented here,
-   * so it can never show the clerk something different from what the approver actually sees. A
-   * failing check is shown, not blocked: approve() enforces its own hard rules separately (e.g.
-   * Share Advance Collection applied), this list is advisory so problems surface to whoever can
-   * still fix them, before a manager's time is spent on a request that was always going to fail.
-   */
-  private showShareWithdrawalConfirm(
-    payload: Record<string, unknown>,
-    baseLines: string[],
-    onConfirm: () => void
-  ): void {
-    this.clerkShareWithdrawalService
-      .previewValidate(payload)
-      .pipe(
-        // A request that never resolves (slow network, server busy) must not leave the Submit
-        // button looking dead — the dialog still has to open, just without the checklist.
-        timeout(5000),
-        catchError(() => of({ __previewFailed: true }))
-      )
-      .subscribe((res: any) => {
-        const checks: { label: string; pass: boolean; detail: string }[] = res?.checks ?? [];
-        // A failed call (most likely the backend not yet carrying the /preview-validate endpoint)
-        // says so explicitly rather than just omitting the section — a silently empty checklist
-        // looks identical to "everything passed, nothing to show", which is the one reading this
-        // must never give.
-        const checkLines = res?.__previewFailed ? [
-              '',
-              '⚠ Validation checklist unavailable right now — the request can still be submitted.'
-            ] : checks.length ? [
-                '',
-                'Validation Checks (same as Manager approval):',
-                ...checks.map((c) => `${c.pass ? '✓' : '⚠'} ${c.label}: ${c.detail}`)
-              ] : [];
-        // baseLines ends with a blank line followed by the "Pending Manager approval…" footer
-        // sentence, which must stay last so the modal renders it as a footnote rather than a
-        // key/value row — so the checklist is spliced in just before that pair, not appended after.
-        const footerStart =
-          baseLines.length >= 2 && baseLines[baseLines.length - 2] === '' ? baseLines.length - 2 : baseLines.length;
-        const lines = [
-          ...baseLines.slice(0, footerStart),
-          ...checkLines,
-          ...baseLines.slice(footerStart)
-        ];
-        this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', lines, 'Submit for Approval', onConfirm);
-      });
-  }
-
   /**
    * Share redemption settled to a GL account the clerk picks on the CR row, instead of the
    * member's linked savings account — mirrors submitShareRedemptionTransfer() above, but the
@@ -3563,7 +3512,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = businessToday();
+    const today = new Date();
     const requestedDate = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
 
     // Full snapshot of the CR (settlement) row exactly as the clerk filled it in — saved verbatim
@@ -3622,7 +3571,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         ? 'Pending Manager approval — redemption, settlement and account closure all post together on approval.'
         : 'Pending Manager approval — redemption and settlement both post together on approval.'
     ];
-    this.showShareWithdrawalConfirm(payload, confirmLines, () =>
+    this.showConfirmAlert('info', 'Confirm Share Withdrawal Request', confirmLines, 'Submit for Approval', () =>
       this.doSubmitShareGlSettlementTransfer(payload, shareRow, shares, glRow.acNo)
     );
   }
@@ -4224,7 +4173,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   ): void {
     const accountUrl = `${cfg.detail}/${accountId}${cfg.detailParams ?? '?associations=all'}`;
     const todayStr = (() => {
-      const d = businessToday();
+      const d = new Date();
       return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
     })();
 
@@ -4600,7 +4549,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
   }
 
   get todayIso(): string {
-    const d = businessToday();
+    const d = new Date();
     return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
   }
 
@@ -5122,7 +5071,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       this.sameDayChequeClearing = 0;
       return;
     }
-    const today = businessToday();
+    const today = new Date();
     const sameDay = (d: any) => {
       if (!d) return false;
       const t = Array.isArray(d) && d.length >= 3 ? new Date(d[0], d[1] - 1, d[2]) : new Date(d);
@@ -5246,8 +5195,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
         this.showAlert('error', 'Invalid Account Type', [
           `Account type(s) not allowed in Bank Transfer: ${invalidAccounts.map((r) => r.acTyp + ' (' + r.acNo + ')').join(', ')}`,
           'Only Savings (SD) and Current (CA) accounts are permitted.',
-          'GL, FD and SHR accounts are not allowed — use Disbursement/Collection instead.',
-          'RD installments are paid through a cashier Receipt or Auto Debit.'
+          'GL, FD, RD, SHR accounts are not allowed — use Disbursement/Collection instead.'
         ]);
         return;
       }
@@ -5301,19 +5249,6 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       this.rows.length >= 2 &&
       this.rows.every((r) => r.typ === 'Disbursement' || r.typ === 'Fund Transfer')
     ) {
-      // A Recurring Deposit is never paid this way: these requests post straight into the account, so the
-      // installment schedule never hears of the money -- installments stay unpaid, Auto Debit collects them
-      // again and the maturity amount comes out wrong. RD installments come in through the cashier's
-      // Receipt or the RD's own Auto Debit.
-      const rdRows = this.rows.filter((r) => r.acTyp === 'RD');
-      if (rdRows.length > 0) {
-        this.showAlert('error', 'Recurring Deposit Not Allowed', [
-          `RD account(s) ${rdRows.map((r) => r.acNo).join(', ')} cannot be used in a Disbursement, Collection or Fund Transfer.`,
-          'Pay RD installments through a cashier Receipt, or by Auto Debit from the linked savings account.'
-        ]);
-        return;
-      }
-
       const drRows = this.rows.filter((r) => r.dbCr === 'Dr');
       const crRows = this.rows.filter((r) => r.dbCr === 'Cr');
 
@@ -5869,21 +5804,13 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    // Cashier deposit (savings/current/FD/RD/GL) → route through maker-checker (create PENDING request,
-    // no direct credit). FD and RD are their own account-type codes (see creditEntryAccountType()) and
-    // belong here just as much as a plain savings deposit -- a cashier crediting an FD/RD must not be
-    // able to move money in without a manager's approval either.
+    // Cashier deposit (savings/current/GL) → route through maker-checker (create PENDING request, no direct credit)
     // Use the dialog-confirmed amount — for cash that is the denomination total
     if (
       !this.isClerk &&
       !this.reviewMode &&
       isDeposit &&
-      (row.acTyp === 'SD' ||
-        row.acTyp === 'CA' ||
-        row.acTyp === 'CB' ||
-        row.acTyp === 'FD' ||
-        row.acTyp === 'RD' ||
-        row.acTyp === 'GL')
+      (row.acTyp === 'SD' || row.acTyp === 'CA' || row.acTyp === 'CB' || row.acTyp === 'GL')
     ) {
       this.submitCashierDepositRequest(row, this.confirmData?.amount ?? amount);
       return;
@@ -6024,7 +5951,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = businessToday();
+    const today = new Date();
     const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
 
     const payload: any = {
@@ -6106,12 +6033,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
           this.editRequest = req;
         }
 
-        // Same bug, same fix as the token-driven withdrawal-slip lookup above (see its comment): the
-        // request carries its own real account_type (SAVINGS, CURRENT, FIXED_DEPOSIT or
-        // RECURRING_DEPOSIT), and hardcoding 'SD' here searched every non-savings account on the
-        // wrong endpoint, so reviewing a Current-account withdrawal always failed with "Account not
-        // found".
-        const acTyp = TransactionEntryComponent.SEARCH_ACCOUNT_TYPE_TO_AC_TYP[req.account_type || ''] || 'SD';
+        const acTyp = 'SD';
         const row = this.rows[0];
         row.acNo = req.account_no ?? '';
         row.acTyp = acTyp;
@@ -6219,7 +6141,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
 
   /** Build the withdrawal-request payload from the current row + loaded account. */
   private buildWithdrawalPayload(row: TxnRow, amount: number): any {
-    const today = businessToday();
+    const today = new Date();
     const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
     const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
 
@@ -6324,7 +6246,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
 
   /** Build the deposit-request payload from the current row + loaded account. */
   private buildDepositPayload(row: TxnRow, amount: number): any {
-    const today = businessToday();
+    const today = new Date();
     const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
     const selectedPt = this.paymentTypes.find((p: any) => p.id === row.paymentTypeId);
     // Send denominations only for cash payments — stale counts on a cheque
@@ -6435,7 +6357,7 @@ export class TransactionEntryComponent implements OnInit, OnDestroy {
       return;
     }
 
-    const today = businessToday();
+    const today = new Date();
     const txnDate = `${String(today.getDate()).padStart(2, '0')}/${String(today.getMonth() + 1).padStart(2, '0')}/${today.getFullYear()}`;
     const txnDateIso = `${today.getFullYear()}-${String(today.getMonth() + 1).padStart(2, '0')}-${String(today.getDate()).padStart(2, '0')}`;
 

src/app/cashier/vault-position/vault-position.component.ts

@@ -16,7 +16,6 @@ import { MatInputModule } from '@angular/material/input';
 import { of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 interface DenomRow {
   denominationId: number;
@@ -68,7 +67,7 @@ export class VaultPositionComponent implements OnInit {
   errorMsg = '';
 
   ngOnInit(): void {
-    const d = businessToday();
+    const d = new Date();
     this.asOfDate = `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
 
     this.service

src/app/cashier/voucher-report/voucher-report.component.ts

@@ -13,7 +13,6 @@ import { ActivatedRoute } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
 import { catchError, of } from 'rxjs';
 import { CashierService } from '../cashier.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 /**
  * Which side of the register a screen shows.
@@ -228,7 +227,7 @@ export class VoucherReportComponent implements OnInit {
   }
 
   private todayIso(): string {
-    const now = businessToday();
+    const now = new Date();
     return `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
   }
 

src/app/clerk/share-withdrawal-request/share-withdrawal-request.component.html

@@ -129,31 +129,6 @@
           <span>* Date of Meeting</span>
           <input type="date" [(ngModel)]="meetingDate" [disabled]="isReview" />
         </label>
-        <label class="inv-form-field">
-          <span>* Settlement Destination</span>
-          @if (!isReview) {
-            <select [ngModel]="settlementMode" (ngModelChange)="onSettlementModeChange($event)">
-              <option value="SAVINGS">Member's Linked Savings Account</option>
-              <option value="GL">GL Account</option>
-            </select>
-          } @else {
-            <input
-              type="text"
-              [value]="reviewRequest?.settlement_mode === 'GL' ? 'GL Account' : 'Linked Savings Account'"
-              readonly
-            />
-          }
-        </label>
-        @if (!isReview && settlementMode === 'GL') {
-          <label class="inv-form-field">
-            <span>* Settlement GL Account</span>
-            <mifosx-gl-account-selector
-              [inputFormControl]="toGlAccountControl"
-              [glAccountList]="glAccountsData"
-              [required]="true"
-            ></mifosx-gl-account-selector>
-          </label>
-        }
         <label class="inv-form-field">
           <span>* Settlement Payment Type</span>
           @if (!isReview) {
@@ -411,25 +386,14 @@
               <td>Date of Meeting</td>
               <td>{{ meetingDate }}</td>
             </tr>
-            <tr>
-              <td>Settlement Destination</td>
-              <td>{{ settlementMode === 'GL' ? 'GL Account' : 'Linked Savings Account' }}</td>
-            </tr>
-            @if (settlementMode === 'GL') {
-              <tr>
-                <td>Settlement GL Account</td>
-                <td>{{ selectedSettlementGlName }}</td>
-              </tr>
-            } @else {
-              <tr>
-                <td>Linked Savings Account</td>
-                <td>{{ account?.savingsAccountNumber || 'None — settlement will not run automatically' }}</td>
-              </tr>
-            }
             <tr>
               <td>Settlement Payment Type</td>
               <td>{{ settlementPaymentTypeName }}</td>
             </tr>
+            <tr>
+              <td>Linked Savings Account</td>
+              <td>{{ account?.savingsAccountNumber || 'None — settlement will not run automatically' }}</td>
+            </tr>
           </tbody>
         </table>
 

src/app/clerk/share-withdrawal-request/share-withdrawal-request.component.ts

@@ -8,7 +8,7 @@
 
 import { Component, EventEmitter, Input, OnInit, Output, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule, UntypedFormControl } from '@angular/forms';
+import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterModule } from '@angular/router';
 import { MatIconModule } from '@angular/material/icon';
 import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
@@ -19,9 +19,6 @@ import { SharesService } from '../../shares/shares.service';
 import { ClerkShareWithdrawalService } from '../../cashier/clerk-share-withdrawal.service';
 import { CashierService } from '../../cashier/cashier.service';
 import { SearchSelectComponent, SearchSelectOption } from '../../shared/search-select/search-select.component';
-import { GlAccountSelectorComponent } from '../../shared/accounting/gl-account-selector/gl-account-selector.component';
-import { AccountingService } from '../../accounting/accounting.service';
-import { GLAccount } from '../../shared/models/general.model';
 
 export type ShareWdMode = 'create' | 'review';
 
@@ -54,8 +51,7 @@ interface ActivityEntry {
     RouterModule,
     MatIconModule,
     MatSnackBarModule,
-    SearchSelectComponent,
-    GlAccountSelectorComponent
+    SearchSelectComponent
   ]
 })
 export class ShareWithdrawalRequestComponent implements OnInit {
@@ -64,7 +60,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
   private sharesService = inject(SharesService);
   private wdService = inject(ClerkShareWithdrawalService);
   private cashierService = inject(CashierService);
-  private accountingService = inject(AccountingService);
   private snackBar = inject(MatSnackBar);
 
   /** When embedded (e.g. opened as a popup from a list screen instead of routed to directly), mode
@@ -96,17 +91,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
   paymentTypes: any[] = [];
   settlementPaymentTypeId: number | null = null;
 
-  /** Where the redeemed value goes. 'SAVINGS' (the long-standing default) credits the member's
-   *  linked savings account. 'GL' lets the clerk pick any postable GL account directly — same
-   *  option the Cashier's Transaction Entry screen already offers on its CR row, now available
-   *  here too so both entry points behave the same way. Naming the product's own Share Sundry GL
-   *  here is still fine: the backend recognises it and books straight to Sundry with no further
-   *  settlement leg (see ClerkShareWithdrawalRequestApiResource#submit). */
-  settlementMode: 'SAVINGS' | 'GL' = 'SAVINGS';
-  settlementGlAccountId: number | null = null;
-  glAccountsData: GLAccount[] = [];
-  toGlAccountControl = new UntypedFormControl('');
-
   activityLog: ActivityEntry[] = [];
   reviewRequest: any = null;
   showRejectDialog = false;
@@ -148,17 +132,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
     return this.selectedSettlementPaymentType?.name || '—';
   }
 
-  /** The chosen GL account's display name, for the confirm dialog and the checklist. Falls back to
-   *  the raw id while the GL account list is still loading. */
-  get selectedSettlementGlName(): string {
-    if (!this.settlementGlAccountId) {
-      return '—';
-    }
-    return (
-      this.glAccountsData.find((g) => g.id === this.settlementGlAccountId)?.name || `GL #${this.settlementGlAccountId}`
-    );
-  }
-
   get isFormValid(): boolean {
     if (!this.account) return false;
     if (!this.requestedShares || this.requestedShares <= 0) return false;
@@ -168,7 +141,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
     if (!this.resolutionNumber.trim()) return false;
     if (!this.meetingDate) return false;
     if (!this.settlementPaymentTypeId) return false;
-    if (this.settlementMode === 'GL' && !this.settlementGlAccountId) return false;
     return true;
   }
 
@@ -188,18 +160,11 @@ export class ShareWithdrawalRequestComponent implements OnInit {
         pass: shares > 0 && shares <= held,
         detail: `${shares} of ${held} shares held`
       },
-      this.settlementMode === 'GL'
-        ? {
-            label: 'Settlement GL Account selected',
-            pass: !!this.settlementGlAccountId,
-            detail: this.settlementGlAccountId ? this.selectedSettlementGlName : 'Missing'
-          }
-        : {
-            label: 'Linked savings account confirmed',
-            pass: !!this.account?.savingsAccountNumber,
-            detail:
-              this.account?.savingsAccountNumber || 'No linked savings account — settlement cannot run automatically'
-          },
+      {
+        label: 'Linked savings account confirmed',
+        pass: !!this.account?.savingsAccountNumber,
+        detail: this.account?.savingsAccountNumber || 'No linked savings account — settlement cannot run automatically'
+      },
       {
         label: 'Settlement Payment Type selected (non-cash)',
         pass: this.settlementPaymentTypeName !== '—',
@@ -249,37 +214,11 @@ export class ShareWithdrawalRequestComponent implements OnInit {
       .pipe(catchError(() => of([])))
       .subscribe((types: any[]) => (this.paymentTypes = types ?? []));
 
-    this.toGlAccountControl.valueChanges.subscribe((id: any) => {
-      this.settlementGlAccountId = id ? Number(id) : null;
-    });
-
     if (this.requestId && this.mode === 'review') {
       this.loadReviewRequest(this.requestId);
     }
   }
 
-  /** Flips the settlement destination. Switching away from GL clears whatever was picked so a
-   *  stale GL id can never ride along on a SAVINGS submission. */
-  onSettlementModeChange(mode: 'SAVINGS' | 'GL'): void {
-    this.settlementMode = mode;
-    if (mode === 'GL') {
-      this.loadGlAccounts();
-    } else {
-      this.settlementGlAccountId = null;
-      this.toGlAccountControl.setValue('');
-    }
-  }
-
-  /** Fetched on first use rather than with the page, since most withdrawals settle to savings. */
-  private loadGlAccounts(): void {
-    if (this.glAccountsData.length) {
-      return;
-    }
-    this.accountingService.getGlAccounts().subscribe((accounts: GLAccount[]) => {
-      this.glAccountsData = accounts ?? [];
-    });
-  }
-
   onAccountSelected(accountId: string): void {
     this.selectedAccountId = accountId;
     if (!accountId) {
@@ -307,11 +246,6 @@ export class ShareWithdrawalRequestComponent implements OnInit {
         this.resolutionNumber = req.resolution_number ?? '';
         this.meetingDate = req.meeting_date ? String(req.meeting_date).split('T')[0].split(' ')[0] : this.meetingDate;
         this.description = req.description ?? '';
-        this.settlementMode = req.settlement_mode === 'GL' ? 'GL' : 'SAVINGS';
-        this.settlementGlAccountId = req.settlement_gl_account_id ? Number(req.settlement_gl_account_id) : null;
-        if (this.settlementMode === 'GL') {
-          this.loadGlAccounts();
-        }
 
         if (req.activity_log) {
           try {
@@ -355,9 +289,7 @@ export class ShareWithdrawalRequestComponent implements OnInit {
       resolutionNumber: this.resolutionNumber.trim(),
       meetingDate: this.meetingDate,
       description: this.description,
-      settlementPaymentTypeId: this.settlementPaymentTypeId,
-      settlementMode: this.settlementMode,
-      ...(this.settlementMode === 'GL' ? { settlementGlAccountId: this.settlementGlAccountId } : {})
+      settlementPaymentTypeId: this.settlementPaymentTypeId
     };
     this.wdService.submit(payload).subscribe({
       next: () => {

src/app/clients/client-stepper/client-general-step/client-general-step.component.ts

@@ -643,9 +643,8 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges
           this.createClientForm.get('degreeQualificationId')?.setValue('');
         }
       });
-    // Constitution options by code NAME, never by id: code ids differ per tenant (on abc_bank id 17 is the empty
-    // ClientClassification code and Constitution is id 24), so a hardcoded id left the dropdown empty.
-    this.clientService.getCodeValuesByName('Constitution').subscribe((options) => {
+    // Fetch all constitution options from code ID 17
+    this.clientService.getCodeValuesById(17).subscribe((options) => {
       if (options?.length) {
         this.constitutionOptions = options;
         // Sort master by value length descending so longer/more-specific keys match first

src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.html

@@ -1321,11 +1321,6 @@
           kycForm.get('kycDocumentNumber')?.hasError('pattern') && kycForm.get('kycDocumentNumber')?.touched
         ) {
           <mat-error>Only letters, numbers, hyphens and slashes allowed</mat-error>
-        } @else if (
-          kycForm.get('kycDocumentNumber')?.hasError('aadhaarLast4Mismatch') &&
-          kycForm.get('kycDocumentNumber')?.touched
-        ) {
-          <mat-error>Last 4 digits do not match the Aadhaar number entered above</mat-error>
         }
       </mat-form-field>
 

src/app/clients/client-stepper/client-kyc-step/client-kyc-step.component.ts

@@ -8,14 +8,7 @@
 
 import { Component, Input, OnInit, OnChanges, OnDestroy, SimpleChanges, inject } from '@angular/core';
 import { forkJoin, catchError, of } from 'rxjs';
-import {
-  UntypedFormBuilder,
-  UntypedFormGroup,
-  Validators,
-  FormsModule,
-  AbstractControl,
-  ValidationErrors
-} from '@angular/forms';
+import { UntypedFormBuilder, UntypedFormGroup, Validators, FormsModule } from '@angular/forms';
 import {
   MatDialog,
   MAT_DIALOG_DATA,
@@ -574,28 +567,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
   /** Existing signature document ID (for re-upload/delete) */
   existingSignatureDocId: string = '';
 
-  /**
-   * Cross-field check for the OVD "Document Number" field (kycDocumentNumber): when Aadhaar Card
-   * is the selected KYC document, its value must identify the same Aadhaar as the aadhaarNumber
-   * field captured earlier in this step - the last 4 digits are what's compared, since
-   * aadhaarNumber may hold either the raw 12-digit number or a masked value (masking only ever
-   * obscures the first 8 digits - see aadhaarMasked in the kycData getter below - so the last 4
-   * characters are always the real digits either way). Not applicable to any other document type,
-   * where kycDocumentNumber is unrelated to Aadhaar entirely.
-   */
-  private aadhaarLast4MatchValidator = (control: AbstractControl): ValidationErrors | null => {
-    if (this.selectedKycDoc?.code !== 'AADHAAR') {
-      return null;
-    }
-    const docNumber = (control.value || '').toString().trim();
-    const aadhaarValue = (control.parent?.get('aadhaarNumber')?.value || '').toString().trim();
-    if (docNumber.length < 4 || aadhaarValue.length < 4) {
-      // Required/pattern validators already flag an empty or too-short value on their own.
-      return null;
-    }
-    return docNumber.slice(-4) === aadhaarValue.slice(-4) ? null : { aadhaarLast4Mismatch: true };
-  };
-
   /** KYC Form */
   kycForm: UntypedFormGroup = this.formBuilder.group({
     hasPan: [true],
@@ -645,8 +616,7 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       [
         Validators.required,
         Validators.pattern(/^[A-Za-z0-9\-\/\s]+$/),
-        Validators.maxLength(30),
-        this.aadhaarLast4MatchValidator
+        Validators.maxLength(30)
       ]
     ],
     kycDocIssueDate: [''],
@@ -769,14 +739,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
       this.kycForm.get('ecgcSalFlag')?.disable();
       this.kycForm.get('dormantFlag')?.disable();
     }
-
-    // aadhaarLast4MatchValidator (on kycDocumentNumber) reads this control's value directly rather
-    // than through its own valueChanges, so a re-check has to be triggered explicitly whenever the
-    // Aadhaar field itself changes - otherwise fixing aadhaarNumber after kycDocumentNumber was
-    // already entered would leave a stale mismatch error in place.
-    this.kycForm.get('aadhaarNumber')?.valueChanges.subscribe(() => {
-      this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
-    });
   }
 
   /** Seed the document-type picker from defaults (entity RBI docs vs. individual OVDs,
@@ -1047,9 +1009,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
     // Reset uploads + merged preview when document type changes
     this.kycDocFiles = { front: null, back: null };
     this.kycDocMergedPreview = null;
-    // aadhaarLast4MatchValidator only applies while Aadhaar Card is selected - re-check so switching
-    // to/away from it immediately picks up (or clears) the mismatch error.
-    this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
   }
 
   isKycDocSelected(proof: ProofType): boolean {
@@ -1230,9 +1189,6 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
           // Sync chip-picker selection with the prefilled document name
           if (data.kycDocumentName) {
             this.selectedKycDoc = this.findKycDocProofByName(data.kycDocumentName);
-            // patchValue above ran kycDocumentNumber's validators before selectedKycDoc was known,
-            // so aadhaarLast4MatchValidator needs a fresh check now that it is.
-            this.kycForm.get('kycDocumentNumber')?.updateValueAndValidity({ onlySelf: true });
           }
           // Set verification statuses from existing data
           if (data.panVerified) {

src/app/clients/clients-routing.module.ts

@@ -61,7 +61,6 @@ import { KycTabComponent } from './clients-view/kyc-tab/kyc-tab.component';
 import { CkycTabComponent } from './clients-view/ckyc-tab/ckyc-tab.component';
 import { Form60TabComponent } from './clients-view/form60-tab/form60-tab.component';
 import { Form121TabComponent } from './clients-view/form121-tab/form121-tab.component';
-import { tdsConfigResolver } from '../letter-mgmt/certificates/form-15gh/tds-config.service';
 import { EntityClassificationTabComponent } from './clients-view/entity-classification-tab/entity-classification-tab.component';
 import { AuthorizedSignatoriesTabComponent } from './clients-view/authorized-signatories-tab/authorized-signatories-tab.component';
 import { familyAllowedGuard, nomineeAllowedGuard } from './utils/family-nominee.guard';
@@ -199,7 +198,6 @@ const routes: Routes = [
             {
               path: 'form121',
               component: Form121TabComponent,
-              resolve: { tdsConfig: tdsConfigResolver },
               data: { title: 'Form 121 / TDS', breadcrumb: 'Form 121 / TDS', routeParamBreadcrumb: false }
             },
             {

src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.html

@@ -202,14 +202,9 @@
                 <div>
                   <strong>Already available</strong>
                   <span class="ckyc-existing__source">from {{ existing.ADDRESS_PROOF.source }}</span>
-                  @if (existing.ADDRESS_PROOF.previewUnavailable) {
-                    <span class="ckyc-existing__warn">stored file unavailable</span>
-                  }
                 </div>
               </div>
-              @if (
-                (existing.ADDRESS_PROOF.previewUrl || existing.ADDRESS_PROOF.previewUrlBack) && isImage('ADDRESS_PROOF')
-              ) {
+              @if (existing.ADDRESS_PROOF.previewUrl || existing.ADDRESS_PROOF.previewUrlBack) {
                 <div class="ckyc-existing__thumbs">
                   @if (existing.ADDRESS_PROOF.previewUrl) {
                     <img
@@ -227,17 +222,6 @@
                   }
                 </div>
               }
-              @if (existing.ADDRESS_PROOF.previewUrl) {
-                <button
-                  mat-stroked-button
-                  type="button"
-                  class="ckyc-existing__view"
-                  (click)="openDocument('ADDRESS_PROOF')"
-                >
-                  <fa-icon icon="eye"></fa-icon>
-                  &nbsp;View document
-                </button>
-              }
               <div class="ckyc-existing__meta">
                 <fa-icon icon="file-alt"></fa-icon>
                 <span>{{ existing.ADDRESS_PROOF.name }}</span>
@@ -315,12 +299,9 @@
                 <div>
                   <strong>Already available</strong>
                   <span class="ckyc-existing__source">from {{ existing.PHOTO_PROOF.source }}</span>
-                  @if (existing.PHOTO_PROOF.previewUnavailable) {
-                    <span class="ckyc-existing__warn">stored file unavailable</span>
-                  }
                 </div>
               </div>
-              @if ((existing.PHOTO_PROOF.previewUrl || existing.PHOTO_PROOF.previewUrlBack) && isImage('PHOTO_PROOF')) {
+              @if (existing.PHOTO_PROOF.previewUrl || existing.PHOTO_PROOF.previewUrlBack) {
                 <div class="ckyc-existing__thumbs">
                   @if (existing.PHOTO_PROOF.previewUrl) {
                     <img
@@ -338,17 +319,6 @@
                   }
                 </div>
               }
-              @if (existing.PHOTO_PROOF.previewUrl) {
-                <button
-                  mat-stroked-button
-                  type="button"
-                  class="ckyc-existing__view"
-                  (click)="openDocument('PHOTO_PROOF')"
-                >
-                  <fa-icon icon="eye"></fa-icon>
-                  &nbsp;View document
-                </button>
-              }
               <div class="ckyc-existing__meta">
                 <fa-icon icon="id-card"></fa-icon>
                 <span>{{ existing.PHOTO_PROOF.name }}</span>
@@ -423,24 +393,10 @@
                 <div>
                   <strong>Already available</strong>
                   <span class="ckyc-existing__source">from {{ existing.CLIENT_IMAGE.source }}</span>
-                  @if (existing.CLIENT_IMAGE.previewUnavailable) {
-                    <span class="ckyc-existing__warn">stored file unavailable</span>
-                  }
                 </div>
               </div>
-              @if (existing.CLIENT_IMAGE.previewUrl && isImage('CLIENT_IMAGE')) {
-                <img [src]="existing.CLIENT_IMAGE.previewUrl" alt="Client photo" class="ckyc-existing__thumb" />
-              }
               @if (existing.CLIENT_IMAGE.previewUrl) {
-                <button
-                  mat-stroked-button
-                  type="button"
-                  class="ckyc-existing__view"
-                  (click)="openDocument('CLIENT_IMAGE')"
-                >
-                  <fa-icon icon="eye"></fa-icon>
-                  &nbsp;View document
-                </button>
+                <img [src]="existing.CLIENT_IMAGE.previewUrl" alt="Client photo" class="ckyc-existing__thumb" />
               }
               <button
                 mat-stroked-button
@@ -492,29 +448,15 @@
                 <div>
                   <strong>Already available</strong>
                   <span class="ckyc-existing__source">from {{ existing.CLIENT_SIGNATURE.source }}</span>
-                  @if (existing.CLIENT_SIGNATURE.previewUnavailable) {
-                    <span class="ckyc-existing__warn">stored file unavailable</span>
-                  }
                 </div>
               </div>
-              @if (existing.CLIENT_SIGNATURE.previewUrl && isImage('CLIENT_SIGNATURE')) {
+              @if (existing.CLIENT_SIGNATURE.previewUrl) {
                 <img
                   [src]="existing.CLIENT_SIGNATURE.previewUrl"
                   alt="Client signature"
                   class="ckyc-existing__thumb ckyc-existing__thumb--wide"
                 />
               }
-              @if (existing.CLIENT_SIGNATURE.previewUrl) {
-                <button
-                  mat-stroked-button
-                  type="button"
-                  class="ckyc-existing__view"
-                  (click)="openDocument('CLIENT_SIGNATURE')"
-                >
-                  <fa-icon icon="eye"></fa-icon>
-                  &nbsp;View document
-                </button>
-              }
               <div class="ckyc-existing__meta">
                 <fa-icon icon="file-signature"></fa-icon>
                 <span>{{ existing.CLIENT_SIGNATURE.name }}</span>

src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.scss

@@ -623,35 +623,6 @@
   }
 }
 
-/* Opens the uploaded artefact full size in a new tab. Sits directly under the thumbnail, and is
-   the only way to inspect a PDF - which cannot render as an inline <img>. */
-.ckyc-existing__view {
-  align-self: flex-start;
-  color: #1d6fd0;
-  border-color: #bcd8f5;
-  background: #fff;
-  font-size: 13px;
-  font-weight: 600;
-
-  &:hover {
-    background: #eef6ff;
-  }
-}
-
-/* Shown when a document row exists but its file could not be fetched from the content store,
-   so "Already available" is not silently misleading. */
-.ckyc-existing__warn {
-  display: inline-block;
-  margin-left: 8px;
-  padding: 1px 8px;
-  border-radius: 10px;
-  background: #fdecec;
-  border: 1px solid #f3c2c2;
-  color: #a12b2b;
-  font-size: 11px;
-  font-weight: 600;
-}
-
 .ckyc-existing {
   display: flex;
   flex-direction: column;

src/app/clients/clients-view/ckyc-tab/ckyc-tab.component.ts

@@ -36,41 +36,11 @@ interface ExistingArtefact {
    *  already writes/reads for address proof; now shared by the photo/identity proof too. */
   description?: string;
   fileCount?: number;
-  /** Set when the stored file could not be fetched - the row exists but its content is gone. */
-  previewUnavailable?: boolean;
-  /** Stored MIME type, so the card knows whether it can render an inline thumbnail. */
-  mimeType?: string;
 }
 
 type ProofKind = 'ADDRESS_PROOF' | 'PHOTO_PROOF';
 type CkycDocKind = ProofKind | 'CLIENT_IMAGE' | 'CLIENT_SIGNATURE';
 
-/**
- * Client-side upload guards, kept deliberately in step with the backend so a file that passes here
- * is not rejected server-side:
- *  - 5 MB matches `spring.servlet.multipart.max-file-size`
- *  - the extension list is the intersection of the backend `fineract.content.regex-whitelist`
- *    with what these cards can actually render.
- * The dialog's `accept=` is only a file-picker hint and is trivially bypassed, so the real check
- * runs here, on the file the dialog hands back, before anything is sent.
- */
-const MAX_UPLOAD_BYTES = 5 * 1024 * 1024;
-const IMAGE_EXTENSIONS = [
-  'png',
-  'jpeg',
-  'jpg'
-];
-const DOCUMENT_EXTENSIONS = [
-  ...IMAGE_EXTENSIONS,
-  'pdf'
-];
-
-/** Cards that render an inline <img>, so a PDF would not display in them. */
-const IMAGE_ONLY_KINDS: CkycDocKind[] = [
-  'CLIENT_IMAGE',
-  'CLIENT_SIGNATURE'
-];
-
 @Component({
   selector: 'mifosx-ckyc-tab',
   templateUrl: './ckyc-tab.component.html',
@@ -180,11 +150,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     this.route.parent.params.subscribe((params: any) => {
       this.clientId = params['clientId'];
-      // Angular reuses this component when only the clientId in the route changes, and
-      // loadExistingArtefacts() only ever *assigns* what it finds - it has no "not found" branch.
-      // Without clearing first, a client with no photo (or no signature, or no proof) keeps showing
-      // the previous client's card.
-      this.resetArtefactState();
       this.loadClientInfo();
       this.loadAccounts();
       this.loadCkycData();
@@ -192,46 +157,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
     });
   }
 
-  /**
-   * Returns every per-client card to its empty state, so nothing from the client just viewed can
-   * survive into the next one. Covers all four cards plus the details staged for an upload - a file
-   * or document number left over from another client must never be submitted against this one.
-   */
-  private resetArtefactState(): void {
-    this.revokePreviewUrls();
-    this.existing = {
-      ADDRESS_PROOF: { present: false },
-      PHOTO_PROOF: { present: false },
-      CLIENT_IMAGE: { present: false },
-      CLIENT_SIGNATURE: { present: false }
-    };
-    this.selectedProofType = { ADDRESS_PROOF: null, PHOTO_PROOF: null };
-    this.docFiles = {
-      ADDRESS_PROOF: { front: null, back: null },
-      PHOTO_PROOF: { front: null, back: null }
-    };
-    this.documentDetails = {
-      ADDRESS_PROOF: { documentKey: '', issueDate: null, expiryDate: null },
-      PHOTO_PROOF: { documentKey: '', issueDate: null, expiryDate: null }
-    };
-    this.clientImageFile = null;
-    this.clientSignatureFile = null;
-    this.uploadErrors = {
-      ADDRESS_PROOF: null,
-      PHOTO_PROOF: null,
-      CLIENT_IMAGE: null,
-      CLIENT_SIGNATURE: null
-    };
-  }
-
-  /** Frees the blob URLs held by the current cards before their references are dropped. */
-  private revokePreviewUrls(): void {
-    Object.values(this.existing).forEach((e) => {
-      if (e.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrl);
-      if (e.previewUrlBack?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrlBack);
-    });
-  }
-
   private loadClientInfo(): void {
     this.route.parent.data.subscribe((data: any) => {
       const cv = data?.clientViewData;
@@ -355,29 +280,19 @@ export class CkycTabComponent implements OnInit, OnDestroy {
             present: true,
             source: 'Client registration',
             name: signatureDoc.fileName || 'Client signature',
-            documentId: signatureDoc.id,
-            mimeType: signatureDoc.type
+            documentId: signatureDoc.id
           };
-          // Same endpoint getClientSignatureImage() uses, but opted out of the global error alert:
-          // a m_document row whose file is no longer in the content store returns 500, and the card
-          // below reports that itself. Without `silent` the interceptor pops an "Internal Server
-          // Error" modal on every page load, for a failure the user cannot act on.
+          // Fetch blob for preview
           this.clientsService
-            .downloadClientDocument(this.clientId, String(signatureDoc.id), true)
+            .getClientSignatureImage(this.clientId, signatureDoc.id)
             .pipe(takeUntil(this.destroy$))
             .subscribe({
               next: (blob: any) => {
-                if (blob && blob.size > 0) {
+                if (blob) {
                   this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
-                } else {
-                  // A 200 with an empty body still means there is nothing to show. Without this the
-                  // card would claim "Already available" with no thumbnail and no explanation.
-                  this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
                 }
               },
-              error: () => {
-                this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
-              }
+              error: () => undefined
             });
         }
 
@@ -449,7 +364,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
         const list = Array.isArray(docs) ? docs : [];
         if (!list.length) return;
         this.existing[kind].fileCount = list.length;
-        this.existing[kind].previewUnavailable = false;
 
         const byNewest = (a: any, b: any) => b.id - a.id;
         const label = (d: any) => (d?.name || d?.fileName || '').toString();
@@ -458,9 +372,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
           [...list].filter((d: any) => /front/i.test(label(d))).sort(byNewest)[0] ||
           [...list].filter((d: any) => d.id !== back?.id).sort(byNewest)[0];
 
-        // A proof can be scanned to PDF, which no <img> can render - remember what was stored so the
-        // card offers "View document" instead of a broken thumbnail.
-        if (front) this.existing[kind].mimeType = front.type;
         if (front) this.downloadIdentifierDocPreview(identifierId, front.id, kind, 'front');
         if (back && back.id !== front?.id) this.downloadIdentifierDocPreview(identifierId, back.id, kind, 'back');
       });
@@ -477,19 +388,12 @@ export class CkycTabComponent implements OnInit, OnDestroy {
       .pipe(takeUntil(this.destroy$))
       .subscribe({
         next: (blob: any) => {
-          if (!blob || blob.size === 0) {
-            this.existing[kind].previewUnavailable = true;
-            return;
-          }
+          if (!blob) return;
           const url = URL.createObjectURL(blob);
           if (slot === 'front') this.existing[kind].previewUrl = url;
           else this.existing[kind].previewUrlBack = url;
         },
-        // The row exists but its file is gone from the content store. Saying so on the card beats
-        // showing "Already available" next to a blank space.
-        error: () => {
-          this.existing[kind].previewUnavailable = true;
-        }
+        error: () => undefined
       });
   }
 
@@ -548,18 +452,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
 
     ref.afterClosed().subscribe((result: CkycUploadDialogResult | null) => {
       if (!result) return;
-
-      // The dialog's `accept=` filter is only a hint to the file picker and is trivially bypassed,
-      // so the size/type guard runs here on what actually came back. Catching it now turns a raw
-      // server rejection into a message on the card.
-      const rejection =
-        this.validationError(result.front, kind) ?? (result.back ? this.validationError(result.back, kind) : null);
-      if (rejection) {
-        this.uploadErrors[kind] = rejection;
-        return;
-      }
-      this.uploadErrors[kind] = null;
-
       if (isProofKind) {
         const proofKind = kind as ProofKind;
         this.selectedProofType[proofKind] = result.proofType || null;
@@ -578,66 +470,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
     });
   }
 
-  /** Extensions a given card can both store and render. */
-  private allowedExtensions(kind: CkycDocKind): string[] {
-    return IMAGE_ONLY_KINDS.includes(kind) ? IMAGE_EXTENSIONS : DOCUMENT_EXTENSIONS;
-  }
-
-  /**
-   * Rejects a file the backend would refuse (or the card could not render) before it is uploaded,
-   * so the user gets a clear message instead of a raw server error. Returns null when the file is
-   * acceptable.
-   */
-  private validationError(file: File | null | undefined, kind: CkycDocKind): string | null {
-    if (!file) {
-      return null;
-    }
-    const allowed = this.allowedExtensions(kind);
-    const extension = (file.name.split('.').pop() || '').toLowerCase();
-
-    if (!allowed.includes(extension)) {
-      return `Unsupported file type ".${extension}". Allowed: ${allowed.map((e) => e.toUpperCase()).join(', ')}.`;
-    }
-    if (file.size > MAX_UPLOAD_BYTES) {
-      const mb = (file.size / (1024 * 1024)).toFixed(1);
-      return `File is ${mb} MB. The maximum allowed size is 5 MB.`;
-    }
-    if (file.size === 0) {
-      return 'The selected file is empty.';
-    }
-    return null;
-  }
-
-  /**
-   * True when the stored file can be shown as an inline thumbnail. A PDF cannot, so its card falls
-   * back to the "View document" button alone rather than rendering a broken image.
-   */
-  isImage(kind: CkycDocKind): boolean {
-    const entry = this.existing[kind];
-    // The profile image arrives as a `data:image/...;base64,` URL, which declares its own type -
-    // it has neither a stored MIME type nor a file extension for the checks below to read.
-    if (entry?.previewUrl?.startsWith('data:')) {
-      return entry.previewUrl.startsWith('data:image/');
-    }
-    if (entry?.mimeType) {
-      return entry.mimeType.startsWith('image/');
-    }
-    // Older rows can have no stored MIME type - fall back to the file extension.
-    const extension = (entry?.name?.split('.').pop() || '').toLowerCase();
-    return IMAGE_EXTENSIONS.includes(extension);
-  }
-
-  /**
-   * Opens the uploaded document full size in a new tab. Uses the blob already fetched for the
-   * thumbnail, so it works for PDFs too and costs no extra request.
-   */
-  openDocument(kind: CkycDocKind): void {
-    const url = this.existing[kind]?.previewUrl;
-    if (url) {
-      window.open(url, '_blank', 'noopener');
-    }
-  }
-
   /** Reads back the "Issue date: yyyy-MM-dd, Expiry date: yyyy-MM-dd" convention this tab (and
    *  client-india-address-step, for address proof) writes into the identifier's description. */
   private parseDescriptionDates(description: string | undefined): { issueDate: Date | null; expiryDate: Date | null } {
@@ -701,10 +533,6 @@ export class CkycTabComponent implements OnInit, OnDestroy {
     request$.pipe(takeUntil(this.destroy$)).subscribe({
       next: () => {
         this.uploading[documentType] = false;
-        // The card is gated on `present`; without this a successful upload left it reading
-        // "Not uploaded yet". uploadProofDocument() sets the same flag for the proof cards.
-        this.existing[key].present = true;
-        this.existing[key].source = this.existing[key].source || 'CKYC upload';
         this.alertService.alert({ type: 'success', message: 'Document uploaded successfully.' });
         this.refreshPreview(documentType);
       },
@@ -825,22 +653,13 @@ export class CkycTabComponent implements OnInit, OnDestroy {
     if (this.existing[staleKey].previewUrlBack?.startsWith('blob:')) {
       URL.revokeObjectURL(this.existing[staleKey].previewUrlBack!);
     }
-    // The upload that triggered this refresh is what repairs a previously missing file, so the
-    // warning has to be cleared before the re-read - otherwise a fixed card keeps the old badge.
-    this.existing[staleKey].previewUrl = undefined;
-    this.existing[staleKey].previewUrlBack = undefined;
-    this.existing[staleKey].previewUnavailable = false;
     switch (documentType) {
       case 'CLIENT_IMAGE':
         this.clientsService
           .getClientProfileImage(this.clientId)
           .pipe(takeUntil(this.destroy$))
           .subscribe((photo: any) => {
-            if (photo) {
-              this.existing.CLIENT_IMAGE.previewUrl = photo;
-            } else {
-              this.existing.CLIENT_IMAGE.previewUnavailable = true;
-            }
+            if (photo) this.existing.CLIENT_IMAGE.previewUrl = photo;
           });
         break;
       case 'CLIENT_SIGNATURE':
@@ -853,21 +672,11 @@ export class CkycTabComponent implements OnInit, OnDestroy {
               ?.sort((a: any, b: any) => b.id - a.id)?.[0];
             if (!doc) return;
             this.existing.CLIENT_SIGNATURE.documentId = doc.id;
-            this.existing.CLIENT_SIGNATURE.mimeType = doc.type;
             this.clientsService
-              .downloadClientDocument(this.clientId, String(doc.id), true)
+              .getClientSignatureImage(this.clientId, doc.id)
               .pipe(takeUntil(this.destroy$))
-              .subscribe({
-                next: (blob: any) => {
-                  if (blob && blob.size > 0) {
-                    this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
-                  } else {
-                    this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
-                  }
-                },
-                error: () => {
-                  this.existing.CLIENT_SIGNATURE.previewUnavailable = true;
-                }
+              .subscribe((blob: any) => {
+                if (blob) this.existing.CLIENT_SIGNATURE.previewUrl = URL.createObjectURL(blob);
               });
           });
         break;
@@ -881,6 +690,10 @@ export class CkycTabComponent implements OnInit, OnDestroy {
   ngOnDestroy(): void {
     this.destroy$.next();
     this.destroy$.complete();
-    this.revokePreviewUrls();
+    // Release object URLs
+    Object.values(this.existing).forEach((e) => {
+      if (e.previewUrl?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrl);
+      if (e.previewUrlBack?.startsWith('blob:')) URL.revokeObjectURL(e.previewUrlBack);
+    });
   }
 }

src/app/clients/clients-view/form121-tab/form121-tab.component.html

@@ -55,10 +55,7 @@
       <div class="f121__note">
         <mat-icon>info_outline</mat-icon>
         <div>
-          @if (configMissing) {
-            TDS rates for FY {{ fy }} are not configured, so the tax cannot be computed. Set them up under Organization
-            › TDS Configuration.
-          } @else if (!dateOfBirth) {
+          @if (!dateOfBirth) {
             Date of birth is not on record, so the senior-citizen threshold cannot be determined. Add it on the Personal
             Data tab.
           } @else {
@@ -116,8 +113,8 @@
         <div class="f121__note f121__note--warn">
           <mat-icon>warning_amber</mat-icon>
           <div>
-            A declaration is on record for this year, but one or more deposits still carry a tax group. Those accounts
-            deduct on their own and ignore the declaration — remove the tax group from them.
+            A Form 121 declaration is on record for this year, but withholding is still switched on for one or more
+            deposits. Turn it off on those accounts, or tax will keep being deducted.
           </div>
         </div>
       }
@@ -192,90 +189,20 @@
               }
             </span>
           </div>
-          @if (declarationRecord; as d) {
+          @if (declarationOnRecord && declarationFy) {
             <div class="f121__kv-row">
               <span>Declared for</span>
-              <span>FY {{ d.fy }} · Form {{ d.formType }}</span>
+              <span>FY {{ declarationFy }}</span>
             </div>
-            <div class="f121__kv-row">
-              <span>Accepted on</span>
-              <span>
-                {{ d.acceptedOn | date: 'd MMM y' }} — no TDS on interest credited from this day to 31 March. Interest
-                credited before it is taxed as usual.
-              </span>
-            </div>
-            @if (d.uin) {
-              <div class="f121__kv-row">
-                <span>UIN</span>
-                <span class="f121__mono">{{ d.uin }}</span>
-              </div>
-            }
-            <div class="f121__kv-row">
-              <span></span>
-              <span>
-                <button type="button" class="f121__btn f121__btn--warn" (click)="revokeDeclaration()">
-                  Withdraw declaration
-                </button>
-              </span>
-            </div>
-          } @else if (fy && !configMissing) {
-            <div class="f121__kv-row">
-              <span></span>
-              <span>
-                @if (!showDeclarationForm) {
-                  <button type="button" class="f121__btn" (click)="openDeclarationForm()" [disabled]="!panWellFormed">
-                    Record {{ formLabel }} for FY {{ fy }}
-                  </button>
-                  @if (!panWellFormed) {
-                    <div class="muted">A valid PAN must be on the KYC first — a declaration without one is void.</div>
-                  }
-                }
-              </span>
-            </div>
-            @if (showDeclarationForm) {
-              <div class="f121__decl-form">
-                <label>
-                  <span>Accepted on *</span>
-                  <input type="date" [(ngModel)]="newDeclaration.acceptedOn" />
-                </label>
-                <label>
-                  <span>UIN</span>
-                  <input type="text" [(ngModel)]="newDeclaration.uin" placeholder="Allotted on acceptance" />
-                </label>
-                <label>
-                  <span>Estimated income for the year (₹)</span>
-                  <input type="number" min="0" [(ngModel)]="newDeclaration.estimatedIncome" />
-                </label>
-                @if (declarationError) {
-                  <div class="f121__note f121__note--warn">
-                    <mat-icon>error_outline</mat-icon>
-                    <div>{{ declarationError }}</div>
-                  </div>
-                }
-                <div class="f121__decl-actions">
-                  <button type="button" class="f121__btn" (click)="showDeclarationForm = false">Cancel</button>
-                  <button
-                    type="button"
-                    class="f121__btn f121__btn--primary"
-                    (click)="saveDeclaration()"
-                    [disabled]="savingDeclaration"
-                  >
-                    {{ savingDeclaration ? 'Saving…' : 'Save declaration' }}
-                  </button>
-                </div>
-              </div>
-            }
           }
-          @for (old of declarations; track old.id) {
-            @if (old.revoked && old.fy === fy) {
-              <div class="f121__kv-row f121__kv-row--muted">
-                <span>Withdrawn</span>
-                <span>
-                  Form {{ old.formType }} accepted {{ old.acceptedOn | date: 'd MMM y' }}, withdrawn
-                  {{ old.revokedOn | date: 'd MMM y' }} — {{ old.revokeReason }}
-                </span>
-              </div>
-            }
+          @if (declarationOnRecord && !acceptanceDateKnown) {
+            <div class="f121__kv-row f121__kv-row--muted">
+              <span>Acceptance date</span>
+              <span>
+                Not captured — the declaration is treated as covering the whole year. A mid-year acceptance would change
+                the figures below.
+              </span>
+            </div>
           }
           @if (eligibility) {
             @for (reason of eligibility.reasons; track reason) {

src/app/clients/clients-view/form121-tab/form121-tab.component.scss

@@ -332,61 +332,3 @@
   font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
   font-weight: 600;
 }
-
-/* ── Recording a declaration ── */
-.f121__btn {
-  padding: 6px 14px;
-  border: 1px solid #d1d5db;
-  border-radius: 6px;
-  background: #fff;
-  font: inherit;
-  font-size: 12.5px;
-  font-weight: 600;
-  cursor: pointer;
-
-  &:disabled {
-    opacity: 0.55;
-    cursor: not-allowed;
-  }
-
-  &--primary {
-    border-color: #1d4ed8;
-    background: #1d4ed8;
-    color: #fff;
-  }
-
-  &--warn {
-    border-color: #b45309;
-    color: #b45309;
-  }
-}
-
-.f121__decl-form {
-  display: grid;
-  gap: 10px;
-  padding: 12px 16px;
-
-  label {
-    display: grid;
-    gap: 4px;
-    font-size: 12px;
-
-    span {
-      color: #6b7280;
-      font-weight: 600;
-    }
-
-    input {
-      max-width: 280px;
-      padding: 6px 8px;
-      border: 1px solid #d1d5db;
-      border-radius: 6px;
-      font: inherit;
-    }
-  }
-}
-
-.f121__decl-actions {
-  display: flex;
-  gap: 8px;
-}

src/app/clients/clients-view/form121-tab/form121-tab.component.ts

@@ -23,8 +23,6 @@ import { SavingsService } from 'app/savings/savings.service';
 import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service';
 import { RecurringDepositsService } from 'app/deposits/recurring-deposits/recurring-deposits.service';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { TdsDeclarationRecord, TdsReportsService } from 'app/tds-reports/tds-reports.service';
-import { TdsDeductee } from 'app/tds-reports/tds-reports-data';
 
 /** Domain logic */
 import {
@@ -113,7 +111,6 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   private savingsService = inject(SavingsService);
   private fixedDepositsService = inject(FixedDepositsService);
   private recurringDepositsService = inject(RecurringDepositsService);
-  private tdsService = inject(TdsReportsService);
 
   private destroy$ = new Subject<void>();
 
@@ -127,25 +124,23 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   pan = '';
   panWellFormed = false;
 
-  // ── Declarations on record ──
-  /**
-   * Every declaration the customer has given, each for one year and from the day the branch
-   * accepted it. The KYC record only ever held a type and a year, which made a September
-   * declaration shield interest back to April and let last year's form run on.
-   */
-  declarations: TdsDeclarationRecord[] = [];
+  // ── Declaration on record ──
+  declarationOnRecord = false;
   /**
    * The form actually in force for the selected year. From FY 2026-27 a single
    * Form 121 replaced the 15G/15H split, so this is derived from the year rather
    * than from the payee's age.
    */
   declarationForm: DeclarationForm = '121';
-
-  // ── Recording a declaration ──
-  showDeclarationForm = false;
-  savingDeclaration = false;
-  declarationError = '';
-  newDeclaration = { acceptedOn: '', uin: '', estimatedIncome: null as number | null };
+  /** Kind recorded at KYC, meaningful only for a pre-2026 year. */
+  declarationKind: '15G' | '15H' = '15G';
+  declarationFy = '';
+  /**
+   * The KYC step records only the year, not the date the branch accepted the
+   * declaration, so it has to be treated as covering the whole year. Surfaced on
+   * screen rather than hidden — a mid-year acceptance would change the figures.
+   */
+  acceptanceDateKnown = false;
 
   eligibility: EligibilityResult | null = null;
 
@@ -158,13 +153,11 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   schedule: TdsSchedule | null = null;
   actualTds = 0;
   tdsSaved = 0;
-  /** The selected year has no entry on Organization › TDS Configuration. */
-  configMissing = false;
 
   /** Raw account inputs, kept so the year selector can recompute cheaply. */
-  private accountInputs: (TdsAccountInput & { meta: Form121AccountRow; taxLines: InterestCredit[] })[] = [];
-  /** This customer's FD/RD interest received in savings, and TDS taken there, per year. */
-  private platformByFy = new Map<string, TdsDeductee | null>();
+  private accountInputs: (TdsAccountInput & { meta: Form121AccountRow })[] = [];
+  /** Withheld-tax postings by FY, from the ledger. */
+  private actualTdsByFy = new Map<string, number>();
 
   ngOnInit(): void {
     this.route.parent.params.pipe(takeUntil(this.destroy$)).subscribe((params: any) => {
@@ -187,15 +180,13 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     forkJoin({
       client: this.clientsService.getClientData(this.clientId, true).pipe(catchError(() => of(null))),
       kyc: this.clientsService.getClientKyc(this.clientId, true).pipe(catchError(() => of(null))),
-      accounts: this.clientsService.getClientAccountData(this.clientId).pipe(catchError(() => of(null))),
-      declarations: this.tdsService.getDeclarations(Number(this.clientId)).pipe(catchError(() => of([])))
+      accounts: this.clientsService.getClientAccountData(this.clientId).pipe(catchError(() => of(null)))
     })
       .pipe(
         takeUntil(this.destroy$),
-        switchMap(({ client, kyc, accounts, declarations }) => {
+        switchMap(({ client, kyc, accounts }) => {
           this.applyClient(client);
           this.applyKyc(kyc);
-          this.declarations = declarations || [];
           const deposits = this.depositAccountsOf(accounts);
           return deposits.length ? forkJoin(deposits.map((a) => this.fetchAccount(a))) : of([] as any[]);
         }),
@@ -219,8 +210,11 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   private applyKyc(kyc: any): void {
     this.pan = (kyc?.panNumber ?? '').toUpperCase();
     this.panWellFormed = isWellFormedPan(this.pan);
-    this.declarationForm =
-      this.fy && FY_TAX_CONFIG[normaliseFy(this.fy)] ? declarationFormFor(this.fy, this.dateOfBirth) : '121';
+    this.declarationOnRecord = !!kyc?.form15Applicable;
+    this.declarationKind = kyc?.form15Type === '15H' ? '15H' : '15G';
+    this.declarationForm = this.fy ? declarationFormFor(this.fy, this.dateOfBirth) : '121';
+    this.declarationFy = kyc?.form15FY ?? '';
+    this.acceptanceDateKnown = false;
   }
 
   /** Savings, FD and RD accounts — everything that can credit interest. */
@@ -254,7 +248,7 @@ export class Form121TabComponent implements OnInit, OnDestroy {
    */
   private ingest(details: any[]): void {
     this.accountInputs = [];
-    this.platformByFy = new Map<string, TdsDeductee | null>();
+    this.actualTdsByFy = new Map<string, number>();
     const fys = new Set<string>();
     const clientIdNum = Number(this.clientId);
 
@@ -275,7 +269,6 @@ export class Form121TabComponent implements OnInit, OnDestroy {
       };
 
       const credits: InterestCredit[] = [];
-      const taxLines: InterestCredit[] = [];
       let tdsDeducted = 0;
 
       for (const t of d.transactions ?? []) {
@@ -293,7 +286,8 @@ export class Form121TabComponent implements OnInit, OnDestroy {
         } else if (t.transactionType?.withholdTax) {
           const amount = t.amount ?? 0;
           tdsDeducted += amount;
-          taxLines.push({ date: iso, amount, accountNo: ref.accountNo });
+          const txnFy = fyOf(iso);
+          this.actualTdsByFy.set(txnFy, (this.actualTdsByFy.get(txnFy) ?? 0) + amount);
         }
       }
 
@@ -316,13 +310,12 @@ export class Form121TabComponent implements OnInit, OnDestroy {
         deducteeClientId: deductee
       };
 
-      this.accountInputs.push({ ...ref, credits, taxLines, meta });
+      this.accountInputs.push({ ...ref, credits, meta });
     }
 
     this.availableFys = [...fys].sort().reverse();
     if (!this.availableFys.includes(this.fy)) {
-      this.fy =
-        this.availableFys[0] ?? this.declarations[0]?.fy ?? Object.keys(FY_TAX_CONFIG).sort().reverse()[0] ?? '';
+      this.fy = this.availableFys[0] ?? (this.declarationFy ? normaliseFy(this.declarationFy) : '');
     }
   }
 
@@ -340,37 +333,14 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     }
 
     const year = normaliseFy(this.fy);
-    this.configMissing = !FY_TAX_CONFIG[year];
-
-    // TDS is tracked on FD/RD interest once it reaches savings, and deducted there. Those figures live
-    // on the platform, not in the deposit's own transactions, so they are fetched once per year and
-    // the computation waits for them.
-    if (!this.platformByFy.has(year)) {
-      this.loadPlatformYear(year);
-      return;
-    }
-    const platform = this.platformByFy.get(year);
-    for (const a of this.accountInputs) {
-      if (!a.meta.tdsApplicable) {
-        continue;
-      }
-      const match = platform?.accounts.find((p) => p.accountNo === a.accountNo);
-      a.credits = match?.credits ?? [];
-      a.taxLines = match?.deductions ?? [];
-    }
 
     // Per-account interest for the selected year, for the three lists.
     for (const a of this.accountInputs) {
       a.meta.interest = a.credits.filter((c) => fyOf(c.date) === year).reduce((s, c) => s + c.amount, 0);
-      // The selected year only - this used to total every year the account had ever been taxed in.
-      a.meta.tdsDeducted = a.meta.tdsApplicable
-        ? a.taxLines.filter((c) => fyOf(c.date) === year).reduce((s, c) => s + c.amount, 0)
-        : 0;
     }
-    // What was actually debited for this customer as deductee, wherever the savings account sits.
-    this.actualTds = this.accountInputs.filter((a) => a.meta.tdsApplicable).reduce((s, a) => s + a.meta.tdsDeducted, 0);
+    this.actualTds = this.actualTdsByFy.get(year) ?? 0;
 
-    if (!this.dateOfBirth || this.configMissing) {
+    if (!this.dateOfBirth) {
       return;
     }
 
@@ -408,95 +378,21 @@ export class Form121TabComponent implements OnInit, OnDestroy {
     return applicable.some((a) => a.meta.mode === 'QUARTERLY') ? 'QUARTERLY' : 'ANNUAL';
   }
 
-  private loadPlatformYear(year: string): void {
-    this.tdsService
-      .getDepositInterest(Number(year.slice(0, 4)), Number(this.clientId))
-      .pipe(
-        catchError(() => of([])),
-        takeUntil(this.destroy$)
-      )
-      .subscribe((rows) => {
-        this.platformByFy.set(year, rows.find((r) => `${r.clientId}` === `${this.clientId}`) ?? null);
-        this.recompute();
-      });
-  }
-
-  /** The live declaration recorded for the year being shown, if any. */
-  get declarationRecord(): TdsDeclarationRecord | null {
-    if (!this.fy) {
+  /** The declaration, but only when it was filed for the year being shown. */
+  private declarationForSelectedFy(): Declaration | null {
+    if (!this.declarationOnRecord || !this.fy) {
       return null;
     }
     const year = normaliseFy(this.fy);
-    return this.declarations.find((d) => d.fy === year && !d.revoked) ?? null;
-  }
-
-  get declarationOnRecord(): boolean {
-    return !!this.declarationRecord;
-  }
-
-  /** The declaration as the engine takes it — operative from the day it was accepted. */
-  private declarationForSelectedFy(): Declaration | null {
-    const d = this.declarationRecord;
-    if (!d) {
+    if (this.declarationFy && normaliseFy(this.declarationFy) !== year) {
       return null;
     }
-    const kind = d.formType === '15H' ? '15H' : d.formType === '15G' ? '15G' : formKindFor(this.dateOfBirth, d.fy);
-    return { kind, acceptedOn: d.acceptedOn, fy: d.fy, uin: d.uin || undefined };
-  }
-
-  openDeclarationForm(): void {
-    this.newDeclaration = { acceptedOn: new Date().toISOString().slice(0, 10), uin: '', estimatedIncome: null };
-    this.declarationError = '';
-    this.showDeclarationForm = true;
-  }
-
-  saveDeclaration(): void {
-    if (!this.newDeclaration.acceptedOn) {
-      this.declarationError = 'Enter the date the branch accepted the form.';
-      return;
-    }
-    this.savingDeclaration = true;
-    this.declarationError = '';
-    this.tdsService
-      .createDeclaration({
-        clientId: Number(this.clientId),
-        fy: normaliseFy(this.fy),
-        formType: declarationFormFor(this.fy, this.dateOfBirth),
-        acceptedOn: this.newDeclaration.acceptedOn,
-        uin: this.newDeclaration.uin || undefined,
-        estimatedIncome: this.newDeclaration.estimatedIncome
-      })
-      .subscribe({
-        next: (rows) => {
-          this.savingDeclaration = false;
-          this.showDeclarationForm = false;
-          this.declarations = rows || [];
-          this.recompute();
-        },
-        error: (err: any) => {
-          this.savingDeclaration = false;
-          this.declarationError =
-            err?.error?.errors?.[0]?.defaultUserMessage || err?.error?.defaultUserMessage || 'Could not save.';
-        }
-      });
-  }
-
-  revokeDeclaration(): void {
-    const d = this.declarationRecord;
-    if (!d) {
-      return;
-    }
-    const reason = prompt('Why is this declaration being withdrawn? From today, TDS will be deducted again.');
-    if (!reason) {
-      return;
-    }
-    this.tdsService.revokeDeclaration(d.id, reason).subscribe({
-      next: (rows) => {
-        this.declarations = rows || [];
-        this.recompute();
-      },
-      error: (err: any) => alert(err?.error?.defaultUserMessage || 'Could not revoke the declaration.')
-    });
+    return {
+      kind: this.declarationKind,
+      // No acceptance date on record — treated as covering the whole year.
+      acceptedOn: `${year.slice(0, 4)}-04-01`,
+      fy: year
+    };
   }
 
   // ───────────────────────── Template helpers ─────────────────────────
@@ -515,7 +411,7 @@ export class Form121TabComponent implements OnInit, OnDestroy {
 
   /** The form the payee would file for the selected year. */
   get formLabel(): string {
-    if (!this.fy || this.configMissing) {
+    if (!this.fy) {
       return '—';
     }
     const form = declarationFormFor(this.fy, this.dateOfBirth);
@@ -574,12 +470,11 @@ export class Form121TabComponent implements OnInit, OnDestroy {
   }
 
   /**
-   * A declaration is on record but a deposit still carries a stock Fineract tax group. Those
-   * accounts withhold on their own rules and never consult the declaration record, so the form
-   * does not stop their deduction until the tax group is removed.
+   * A declaration is on record but deposit accounts are still set to withhold —
+   * the branch has not switched them off.
    */
   get declarationNotAppliedToAccounts(): boolean {
-    return !!this.declarationForSelectedFy() && this.liableAccounts.some((a) => !!a.taxGroup);
+    return !!this.declarationForSelectedFy() && this.liableAccounts.some((a) => a.withHoldTax);
   }
 
   /**

src/app/clients/clients-view/general-tab/general-tab.component.html

@@ -591,13 +591,16 @@
         <i class="fa fa-calendar section-header__icon"></i>
         <h3 class="section-header__title">{{ 'labels.heading.Recurring Deposit Accounts' | translate }}</h3>
       </div>
+      <div class="section-header__right">
+        <button mat-raised-button color="primary" (click)="toggleRecurringAccountsOverview()">
+          {{ viewAccountsLabel(showClosedRecurringAccounts) | translate }}
+        </button>
+      </div>
     </div>
 
-    <!-- Active and ended recurring deposits share one table; the Status column says how each one ended (matured or
-         closed early), so the client's RD history stays visible without switching views. -->
-    @if (savingAccounts) {
+    @if (!showClosedRecurringAccounts) {
       <div class="table-wrapper">
-        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'all' : 'isRecurring'">
+        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'open' : 'isRecurring'">
           <ng-container matColumnDef="Account No">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account No' | translate }}</th>
             <td mat-cell *matCellDef="let element">
@@ -611,15 +614,6 @@
               <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
             </td>
           </ng-container>
-          <ng-container matColumnDef="Status">
-            <th mat-header-cell *matHeaderCellDef>Status</th>
-            <td mat-cell *matCellDef="let element">
-              <span class="rd-status" [class.rd-status--ended]="element.timeline?.closedOnDate">{{ rdStatusLabel(element) }}</span>
-              @if (element.timeline?.closedOnDate) {
-                <div class="rd-status__date">on {{ element.timeline.closedOnDate | dateFormat }}</div>
-              }
-            </td>
-          </ng-container>
           <ng-container matColumnDef="Last Active">
             <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Last Active' | translate }}</th>
             <td mat-cell *matCellDef="let element">{{ element.lastActiveTransactionDate | dateFormat }}</td>
@@ -644,7 +638,7 @@
                   <i class="fa fa-check"></i>
                 </button>
               }
-              @if (element.status.approved) {
+              @if (!element.status.submittedAndPendingApproval && !element.status.active) {
                 <button
                   class="account-action-button"
                   mat-raised-button
@@ -670,7 +664,7 @@
           </ng-container>
 
           <ng-container matColumnDef="no-data">
-            <td mat-footer-cell *matFooterCellDef [attr.colspan]="recurringColumns.length">
+            <td mat-footer-cell *matFooterCellDef [attr.colspan]="openSavingsColumns.length">
               <div class="table-empty-state">
                 <i class="fa fa-folder-open-o table-empty-state__icon"></i>
                 <p class="table-empty-state__text">
@@ -680,17 +674,67 @@
             </td>
           </ng-container>
 
-          <tr mat-header-row *matHeaderRowDef="recurringColumns"></tr>
+          <tr mat-header-row *matHeaderRowDef="openSavingsColumns"></tr>
           <tr
             mat-row
-            *matRowDef="let row; columns: recurringColumns"
+            *matRowDef="let row; columns: openSavingsColumns"
             [routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']"
             class="select-row"
           ></tr>
           <tr
             mat-footer-row
             *matFooterRowDef="
-              (savingAccounts | accountsFilter: 'saving' : 'all' : 'isRecurring')?.length === 0 ? ['no-data'] : []
+              (savingAccounts | accountsFilter: 'saving' : 'open' : 'isRecurring')?.length === 0 ? ['no-data'] : []
+            "
+          ></tr>
+        </table>
+      </div>
+    }
+
+    <!-- Closed Recurring Deposit Accounts -->
+    @if (showClosedRecurringAccounts) {
+      <div class="table-wrapper">
+        <table mat-table [dataSource]="savingAccounts | accountsFilter: 'saving' : 'closed' : 'isRecurring'">
+          <ng-container matColumnDef="Account No">
+            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Account No' | translate }}</th>
+            <td mat-cell *matCellDef="let element">
+              <i class="fa fa-stop" [ngClass]="element.status.code | statusLookup"></i>
+              <mifosx-account-number accountNo="{{ element.accountNo }}"></mifosx-account-number>
+            </td>
+          </ng-container>
+          <ng-container matColumnDef="Saving Account">
+            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Recurring Deposit Product' | translate }}</th>
+            <td mat-cell *matCellDef="let element">
+              <mifosx-long-text textValue="{{ element.productName }}" chars="35"></mifosx-long-text>
+            </td>
+          </ng-container>
+          <ng-container matColumnDef="Closed Date">
+            <th mat-header-cell *matHeaderCellDef>{{ 'labels.inputs.Closed Date' | translate }}</th>
+            <td mat-cell *matCellDef="let element">{{ element.timeline.closedOnDate | dateFormat }}</td>
+          </ng-container>
+
+          <ng-container matColumnDef="no-data">
+            <td mat-footer-cell *matFooterCellDef [attr.colspan]="closedSavingsColumns.length">
+              <div class="table-empty-state">
+                <i class="fa fa-folder-open-o table-empty-state__icon"></i>
+                <p class="table-empty-state__text">
+                  {{ 'labels.messages.No Closed Recurring Deposit Accounts Available' | translate }}
+                </p>
+              </div>
+            </td>
+          </ng-container>
+
+          <tr mat-header-row *matHeaderRowDef="closedSavingsColumns"></tr>
+          <tr
+            mat-row
+            *matRowDef="let row; columns: closedSavingsColumns"
+            [routerLink]="['../', 'recurring-deposits-accounts', row.id, 'general']"
+            class="select-row"
+          ></tr>
+          <tr
+            mat-footer-row
+            *matFooterRowDef="
+              (savingAccounts | accountsFilter: 'saving' : 'closed' : 'isRecurring')?.length === 0 ? ['no-data'] : []
             "
           ></tr>
         </table>

src/app/clients/clients-view/general-tab/general-tab.component.scss

@@ -419,24 +419,3 @@ table[mat-table] {
   font-size: 24px;
   z-index: 1;
 }
-
-.rd-status {
-  display: inline-block;
-  padding: 2px 8px;
-  border-radius: 10px;
-  font-size: 12px;
-  font-weight: 600;
-  background: #dcfce7;
-  color: #166534;
-
-  &--ended {
-    background: #e2e8f0;
-    color: #475569;
-  }
-}
-
-.rd-status__date {
-  margin-top: 2px;
-  font-size: 11px;
-  color: #64748b;
-}

src/app/clients/clients-view/general-tab/general-tab.component.ts

@@ -187,15 +187,6 @@ export class GeneralTabComponent implements OnDestroy {
     'Saving Account',
     'Closed Date'
   ];
-  /** Closed Recurring Deposit Accounts Columns - with how each one ended, for tracking. */
-  recurringColumns: string[] = [
-    'Account No',
-    'Saving Account',
-    'Status',
-    'Last Active',
-    'Balance',
-    'Actions'
-  ];
   /** Open Shares Accounts Columns */
   openSharesColumns: string[] = [
     'Account No',
@@ -484,30 +475,6 @@ export class GeneralTabComponent implements OnDestroy {
     );
   }
 
-  /** Where a recurring deposit stands - for one that has ended, how it ended. */
-  rdStatusLabel(account: any): string {
-    switch (account?.status?.code) {
-      case 'savingsAccountStatusType.active':
-        return 'Active';
-      case 'savingsAccountStatusType.matured':
-        return 'Matured (not closed)';
-      case 'savingsAccountStatusType.submitted.and.pending.approval':
-        return 'Pending Approval';
-      case 'savingsAccountStatusType.approved':
-        return 'Approved';
-      case 'savingsAccountStatusType.closed':
-        return 'Matured & Closed';
-      case 'savingsAccountStatusType.pre.mature.closure':
-        return 'Premature Closed';
-      case 'savingsAccountStatusType.rejected':
-        return 'Rejected';
-      case 'savingsAccountStatusType.withdrawn.by.applicant':
-        return 'Withdrawn by Client';
-      default:
-        return account?.status?.value ?? '';
-    }
-  }
-
   viewAccountsLabel(closed: boolean): string {
     if (closed) {
       return 'labels.buttons.View Active Accounts';

src/app/clients/clients-view/kyc-tab/kyc-tab.component.html

@@ -1247,7 +1247,9 @@
                     </div>
 
                     @if (!docScansLoading && !docScans.front && !docScans.back) {
-                      <div class="kyc-doc-scans__empty">No scan is on file for this document. Upload one below.</div>
+                      <div class="kyc-doc-scans__empty">
+                        No scan is on file for this document. Upload one below.
+                      </div>
                     }
 
                     <div class="kyc-doc-scans__sides">

src/app/clients/clients-view/kyc-tab/kyc-tab.component.ts

@@ -182,10 +182,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
   docScans: { front: DocScanSide | null; back: DocScanSide | null } = { front: null, back: null };
 
   /** The two sides, in display order, so the template loops rather than repeating itself. */
-  readonly docScanSlots: ('front' | 'back')[] = [
-    'front',
-    'back'
-  ];
+  readonly docScanSlots: ('front' | 'back')[] = ['front', 'back'];
 
   docScanOf(slot: 'front' | 'back') {
     return this.docScans[slot];
@@ -477,8 +474,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
       adverseMediaMatch: !!v.adverseMediaMatch,
       // Blank stays null rather than becoming zero: an income nobody asked for is unknown, and a zero would read as a
       // customer who declared no income at all.
-      declaredAnnualIncome:
-        v.declaredAnnualIncome === '' || v.declaredAnnualIncome == null ? null : v.declaredAnnualIncome,
+      declaredAnnualIncome: v.declaredAnnualIncome === '' || v.declaredAnnualIncome == null ? null : v.declaredAnnualIncome,
       declaredAnnualTurnover:
         v.declaredAnnualTurnover === '' || v.declaredAnnualTurnover == null ? null : v.declaredAnnualTurnover
     };
@@ -523,7 +519,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
       dateFormat: 'dd MMMM yyyy',
       ...this.buildDocumentFields(),
       ...this.buildRiskProfileFields(),
-      ...this.buildExceptionFields()
+        ...this.buildExceptionFields()
     };
 
     if (!this.kycId) {
@@ -770,7 +766,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
       riskCategory: this.kycForm.value.riskCategory || 1,
       ...declarationFields,
       ...this.buildRiskProfileFields(),
-      ...this.buildExceptionFields()
+        ...this.buildExceptionFields()
     };
 
     this.clientsService
@@ -931,7 +927,7 @@ export class KycTabComponent implements OnInit, OnDestroy {
       riskCategory: this.kycForm.value.riskCategory || 1,
       ...receiptFields,
       ...this.buildRiskProfileFields(),
-      ...this.buildExceptionFields()
+        ...this.buildExceptionFields()
     };
 
     this.clientsService
@@ -1459,10 +1455,7 @@ I further confirm that:
       this.docScansLoading = false;
       // This runs again after every replace, so the previews being thrown away are revoked
       // rather than left holding their blobs.
-      for (const old of [
-        this.docScans.front,
-        this.docScans.back
-      ]) {
+      for (const old of [this.docScans.front, this.docScans.back]) {
         if (old?.previewUrl) {
           URL.revokeObjectURL(old.previewUrl);
         }
@@ -1504,10 +1497,7 @@ I further confirm that:
       }
 
       this.docScans = sides;
-      for (const key of [
-        'front',
-        'back'
-      ] as const) {
+      for (const key of ['front', 'back'] as const) {
         if (sides[key]) {
           this.loadScanPreview(sides[key]!);
         }
@@ -1568,9 +1558,7 @@ I further confirm that:
       error: (err: any) => {
         this.docScanUploading = null;
         this.docScanError =
-          err?.error?.defaultUserMessage ||
-          err?.error?.developerMessage ||
-          `Could not replace the ${label.toLowerCase()} side.`;
+          err?.error?.defaultUserMessage || err?.error?.developerMessage || `Could not replace the ${label.toLowerCase()} side.`;
       }
     });
   }
@@ -1753,10 +1741,7 @@ I further confirm that:
     this.destroy$.next();
     this.destroy$.complete();
     // Object URLs are held by the browser until revoked, so the scan blobs would outlive the tab.
-    for (const side of [
-      this.docScans.front,
-      this.docScans.back
-    ]) {
+    for (const side of [this.docScans.front, this.docScans.back]) {
       if (side?.previewUrl) {
         URL.revokeObjectURL(side.previewUrl);
       }

src/app/clients/clients.service.ts

@@ -569,19 +569,8 @@ export class ClientsService {
     return this.http.get(`/clients/${clientId}/documents`);
   }
 
-  /**
-   * Fetches a client document's stored file.
-   *
-   * `silent` opts the request out of ErrorHandlerInterceptor's alert. Pass it when the caller
-   * renders its own failure state - notably thumbnail fetches, where a `m_document` row whose file
-   * is no longer in the content store returns 500 and would otherwise pop a modal the user can do
-   * nothing about. The interceptor still rethrows, so the caller's error callback continues to run.
-   */
-  downloadClientDocument(parentEntityId: string, documentId: string, silent = false) {
-    return this.http.get(`/clients/${parentEntityId}/documents/${documentId}/attachment`, {
-      responseType: 'blob',
-      ...(silent ? { context: new HttpContext().set(SILENT_HTTP_ERROR, true) } : {})
-    });
+  downloadClientDocument(parentEntityId: string, documentId: string) {
+    return this.http.get(`/clients/${parentEntityId}/documents/${documentId}/attachment`, { responseType: 'blob' });
   }
 
   uploadClientDocument(clientId: string, documentData: any) {
@@ -1003,28 +992,12 @@ export class ClientsService {
     return this.http.post(`/clients/${clientId}/entityclassification/${category}`, data);
   }
 
-  /**
-   * Uploads a single CKYC artefact against the client, using the platform's generic document
-   * endpoint (DocumentApiResource, POST /v1/{entityType}/{entityId}/documents). There is no
-   * CKYC-specific document API on the backend - the earlier `/clients/{id}/ckyc/documents` path
-   * was never implemented and returned 404.
-   *
-   * The multipart body must carry `file`, `name` and `description`; the caller builds those so the
-   * stored document stays identifiable by CKYC artefact type. See ckyc-tab.component.ts.
-   */
-  uploadCkycDocument(clientId: string, formData: FormData): Observable<any> {
-    return this.http.post(`/clients/${clientId}/documents`, formData);
+  getClientCkyc(clientId: string): Observable<any> {
+    return this.http.get(`/clients/${clientId}/ckyc`);
   }
 
-  /**
-   * Replaces the content of an existing client document in place (DocumentApiResource PUT
-   * /v1/{entityType}/{entityId}/documents/{documentId}), keeping the same document id.
-   *
-   * Used by the CKYC screen's "Upload new version" so a re-upload updates the existing artefact
-   * rather than adding another row. Takes the same multipart body as the create call.
-   */
-  replaceClientDocument(clientId: string, documentId: string, formData: FormData): Observable<any> {
-    return this.http.put(`/clients/${clientId}/documents/${documentId}`, formData);
+  uploadCkycDocument(clientId: string, formData: FormData): Observable<any> {
+    return this.http.post(`/clients/${clientId}/ckyc/documents`, formData);
   }
 
   /**

src/app/clients/edit-client/edit-client.component.html

@@ -377,8 +377,6 @@
         </button>
       }
       @if (selectedTabIndex < totalTabs - 1) {
-        <!-- Tooltip sits on a wrapper: a disabled button fires no mouse events, so it can't host it. -->
-        <span [matTooltip]="currentStepBlockerMessage" [matTooltipDisabled]="!currentStepBlockerMessage">
         <button mat-raised-button color="primary" (click)="onNext()" [disabled]="savingClient || !currentStepValid">
           @if (savingClient) {
             <mat-progress-spinner diameter="18" mode="indeterminate" class="m-r-10"></mat-progress-spinner>
@@ -392,7 +390,6 @@
             <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
           }
         </button>
-        </span>
       }
       @if (selectedTabIndex === totalTabs - 1) {
         <button mat-raised-button color="primary" [routerLink]="['../']">

src/app/clients/edit-client/edit-client.component.ts

@@ -393,12 +393,6 @@ export class EditClientComponent {
     if (this.selectedTabIndex === 0 && this.clientGeneralForm?.valid && !this.contactVerificationComplete) {
       return 'Verify the OTP sent to both the old and new mobile number/email before saving.';
     }
-    if (this.selectedTabIndex === 0 && this.clientGeneralForm && !this.clientGeneralForm.valid) {
-      const labels = this.invalidGeneralFieldLabels();
-      if (labels.length) {
-        return `Please fill/correct: ${labels.join(', ')}.`;
-      }
-    }
     if (this.selectedTabIndex === 1) {
       const labels = this.clientKycStep?.invalidFieldLabels || [];
       if (labels.length) {
@@ -414,42 +408,6 @@ export class EditClientComponent {
     return 'Please fill all mandatory fields on this tab to continue.';
   }
 
-  /**
-   * Readable names of the General-tab controls that are invalid. Older clients can be missing
-   * fields that are now mandatory (e.g. mobile/email), which leaves Save disabled with nothing
-   * on screen saying why — this feeds the button tooltip.
-   */
-  private invalidGeneralFieldLabels(): string[] {
-    const labels: Record<string, string> = {
-      officeId: 'Office',
-      legalFormId: 'Legal Form',
-      genderId: 'Gender',
-      mobileNo: 'Mobile No',
-      alternateMobileNo: 'Alternate Mobile No',
-      emailAddress: 'Email',
-      dateOfBirth: 'Date of Birth',
-      submittedOnDate: 'Submitted On',
-      activationDate: 'Activation Date',
-      savingsProductId: 'Savings Product',
-      firstname: 'First Name',
-      middlename: 'Middle Name',
-      lastname: 'Last Name',
-      fullname: 'Name',
-      monthlyIncome: 'Monthly Income',
-      annualIncome: 'Annual Income',
-      monthlyTurnover: 'Monthly Turnover',
-      annualTurnover: 'Yearly Turnover',
-      agricultureIncome: 'Agriculture Income',
-      nonAgricultureIncome: 'Non-Agriculture Income',
-      guardianDetails: 'Guardian',
-      clientNonPersonDetails: 'Entity Details'
-    };
-    const controls = this.clientGeneralForm?.controls || {};
-    return Object.keys(controls)
-      .filter((name) => controls[name].invalid)
-      .map((name) => labels[name] || name);
-  }
-
   /** Whether the current tab has unsaved edits */
   isCurrentTabEdited(): boolean {
     return this.tabEditMode[this.selectedTabIndex] === true;

src/app/clients/shared/kyc-document-update-dialog/kyc-document-update-dialog.component.html

@@ -109,7 +109,13 @@
               </button>
             }
           </div>
-          <input #sideInput type="file" hidden accept="image/*,application/pdf" (change)="onFilePicked($event, slot)" />
+          <input
+            #sideInput
+            type="file"
+            hidden
+            accept="image/*,application/pdf"
+            (change)="onFilePicked($event, slot)"
+          />
         </div>
       }
     </div>

src/app/core/http/cache.interceptor.ts

@@ -25,41 +25,6 @@ import { environment } from '../../../environments/environment';
 export class CacheInterceptor implements HttpInterceptor {
   private forceUpdate = false;
 
-  /**
-   * Endpoints that compute a live figure from the current ledger/configuration and must never be
-   * served from cache. Caching them meant a report kept showing a stale response after its
-   * underlying GL mapping changed — the request was answered from cachedData and the backend was
-   * never hit again. Matched as a substring of the request URL.
-   */
-  private static readonly NEVER_CACHE = [
-    '/rbireservereturn',
-    '/rbireserveconfig',
-    '/tdsconfig',
-    '/tds/deposit-interest',
-    // Declarations and challans are entered on the very screens that read them back.
-    '/tds/declarations',
-    '/tds/challans',
-    '/tds/deducted',
-    '/savingsinterestpostingreports',
-    // Cash in vaults and drawers changes with every transaction; a cached teller list or position
-    // kept showing a branch's old tellers and figures at day close.
-    '/tellers',
-    '/cashreports',
-    '/cashreconciliation',
-    '/cashsettlement',
-    '/cashtransfer',
-    '/branchday',
-    // A deposit's lien moves with every repayment of the loan it secures, and decides whether the
-    // deposit may be closed at all - a stale copy would show a released lien as still blocking.
-    '/liens',
-    // The RD Dashboard counts late installments as of today; a cached copy would hide a payment just taken.
-    '/recurringdepositaccounts/dashboard'
-  ];
-
-  private isCacheable(url: string): boolean {
-    return !CacheInterceptor.NEVER_CACHE.some((fragment) => url.includes(fragment));
-  }
-
   // eslint-disable-next-line @angular-eslint/prefer-inject
   constructor(private httpCacheService: HttpCacheService) {}
 
@@ -77,7 +42,7 @@ export class CacheInterceptor implements HttpInterceptor {
   }
 
   intercept(request: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    if (request.method !== 'GET' || !this.isCacheable(request.urlWithParams)) {
+    if (request.method !== 'GET') {
       return next.handle(request);
     }
 

src/app/core/http/error-handler.interceptor.ts

@@ -67,18 +67,12 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
     // endpoint isn't available on a given backend deployment, the client-general-step
     // component already falls back to riskRules = [] silently; no toast needed here either.
     const isKycRiskRulesRequest = request.url.includes('/kyc/risk-rules');
-    // A document's own file can be missing from the content store (a database copied between
-    // environments without its file store is the usual cause) even though its m_document row
-    // survives — the backend reports that as a 404, same as a client with no photo, and every
-    // caller that fetches a signature/attachment image already recovers with its own catchError.
-    const isDocumentAttachmentRequest = request.url.match(/\/documents\/\d+\/attachment$/);
     const isSilentRequest =
       isClientImageRequest ||
       isClientKycRequest ||
       isDirectorRequest ||
       isClientPendingEditRequest ||
-      isKycRiskRulesRequest ||
-      isDocumentAttachmentRequest;
+      isKycRiskRulesRequest;
 
     // Explicit per-request opt-out (e.g. per-row enrichment fetches on a list page whose
     // component already recovers via its own catchError) — silenced for every status, since
@@ -99,8 +93,8 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
       throw response;
     }
 
-    // Resolved once and emitted in one place below — see the severity decision there for which of
-    // these surfaces as a centred modal versus a corner toast.
+    // Resolved once and emitted in one place below, so every failure here is consistently tagged
+    // as an error and therefore surfaces as a centred modal rather than a corner toast.
     let alert: { type: string; message: string } | null = null;
     if (status === 401 || (environment.oauth.enabled && status === 400)) {
       alert = { type: 'Authentication Error', message: 'Invalid User Details. Please try again!' };
@@ -125,13 +119,7 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
         message: errorMessage || 'This action is not allowed in the current state.'
       };
     } else if (status === 500) {
-      // errorMessage carries the backend's actual explanation (defaultUserMessage/developerMessage)
-      // when one is present; the generic sentence is only a last resort for a response with no body
-      // at all (a proxy timeout, a stack trace the server never wrapped into JSON).
-      alert = {
-        type: 'Internal Server Error',
-        message: errorMessage || 'Internal Server Error. Please try again later.'
-      };
+      alert = { type: 'Internal Server Error', message: 'Internal Server Error. Please try again later.' };
     } else if (status === 501) {
       alert = {
         type: this.translate.instant('error.resource.notImplemented.type'),
@@ -145,17 +133,7 @@ export class ErrorHandlerInterceptor implements HttpInterceptor {
     }
 
     if (alert) {
-      // A GET is the page reading data it did not ask the user for, in the background — a photo,
-      // an attachment, a notes list, a standing-instructions panel. Every one of those already has
-      // its own catchError fallback at the call site (see transaction-entry.component.ts and
-      // similar account-overview loaders), so the page keeps working regardless. Blocking the whole
-      // screen on a dialog the user has to click "OK" on, for data that was never more than a
-      // secondary panel, is the "irritate na ho" complaint this guards against — it goes to the
-      // corner toast instead, same place a non-error alert already goes. A write (POST/PUT/PATCH/
-      // DELETE) is different: that is the one action the user was waiting on, so its failure still
-      // needs the centred, must-acknowledge dialog.
-      const isBackgroundRead = request.method === 'GET' && (status === 500 || status === 501 || status === 503);
-      this.alertService.alert({ ...alert, severity: isBackgroundRead ? undefined : 'error' });
+      this.alertService.alert({ ...alert, severity: 'error' });
     }
 
     throw response;

src/app/core/shell/shell.component.html

@@ -65,14 +65,6 @@
           <span class="cashier-nav__esc-hint" (click)="onEscapeKey()"> <kbd>ESC</kbd> Show Header </span>
         </nav>
       }
-      <!-- FD Dashboard fullscreen — ESC hint bar -->
-      @else if (currentUrl.includes('/fd-dashboard')) {
-        <nav class="cashier-nav cashier-nav--election">
-          <span class="cashier-nav__esc-hint" (click)="onEscapeKey()">
-            <kbd>ESC</kbd> Exit Fullscreen (Show Header &amp; Footer)
-          </span>
-        </nav>
-      }
       <!-- Clerk Dashboard fullscreen nav — only visible at /clerk/* -->
       @else if (currentUrl.includes('/clerk/')) {
         <nav class="cashier-nav cashier-nav--clerk">
@@ -256,6 +248,13 @@
           >
             <fa-icon icon="exchange"></fa-icon> Cash Exchange
           </a>
+          <a
+            class="cashier-nav__item"
+            [routerLink]="['/cashier/exchange-detail']"
+            routerLinkActive="cashier-nav__item--active"
+          >
+            <fa-icon icon="globe"></fa-icon> Exchange Detail
+          </a>
           <a
             class="cashier-nav__item"
             [routerLink]="['/cashier/inter-cashier']"
@@ -263,6 +262,13 @@
           >
             <fa-icon icon="exchange-alt"></fa-icon> Inter-Cashier
           </a>
+          <a
+            class="cashier-nav__item"
+            [routerLink]="['/cashier/excess-report']"
+            routerLinkActive="cashier-nav__item--active"
+          >
+            <fa-icon icon="exclamation-circle"></fa-icon> Excess Report
+          </a>
           <a
             class="cashier-nav__item"
             [routerLink]="['/cashier/cashier-position']"
@@ -270,13 +276,6 @@
           >
             <fa-icon icon="wallet"></fa-icon> Position
           </a>
-          <a
-            class="cashier-nav__item"
-            [routerLink]="['/cashier/reconciliation']"
-            routerLinkActive="cashier-nav__item--active"
-          >
-            <fa-icon icon="balance-scale"></fa-icon> Reconciliation
-          </a>
           <a
             class="cashier-nav__item"
             [routerLink]="['/cashier/cash-history']"
@@ -301,6 +300,13 @@
           >
             <fa-icon icon="list"></fa-icon> Payment
           </a>
+          <a
+            class="cashier-nav__item"
+            [routerLink]="['/cashier/closing-report']"
+            routerLinkActive="cashier-nav__item--active"
+          >
+            <fa-icon icon="file-alt"></fa-icon> Closing Report
+          </a>
         </nav>
       }
     }
@@ -489,8 +495,7 @@
             [matMenuTriggerFor]="loanOriginationMenu"
             *mifosxHasPermission="'MENU_LOAN_ORIGINATION'"
           >
-            <fa-icon icon="clipboard-check" class="ni-ico"></fa-icon><span class="ni-full">Loan Origination</span
-            ><span class="ni-short">Loans</span>
+            <fa-icon icon="clipboard-check" class="ni-ico"></fa-icon>Loan Origination
             <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
           </a>
           <a
@@ -499,8 +504,7 @@
             (click)="glMenuOpen = !glMenuOpen; subLedgerOpen = false"
             *mifosxHasPermission="'MENU_GENERAL_LEDGER'"
           >
-            <fa-icon icon="book-open" class="ni-ico"></fa-icon><span class="ni-full">General Ledger</span
-            ><span class="ni-short">GL</span>
+            <fa-icon icon="book-open" class="ni-ico"></fa-icon>General Ledger
             <fa-icon [icon]="glMenuOpen ? 'caret-up' : 'caret-down'" class="ni-caret"></fa-icon>
           </a>
           <a
@@ -509,8 +513,7 @@
             (click)="subLedgerOpen = !subLedgerOpen; glMenuOpen = false"
             *mifosxHasPermission="'MENU_SUB_LEDGER'"
           >
-            <fa-icon icon="book" class="ni-ico"></fa-icon><span class="ni-full">Sub Ledger</span
-            ><span class="ni-short">Sub GL</span>
+            <fa-icon icon="book" class="ni-ico"></fa-icon>Sub Ledger
             <fa-icon [icon]="subLedgerOpen ? 'caret-up' : 'caret-down'" class="ni-caret"></fa-icon>
           </a>
         </div>
@@ -572,16 +575,14 @@
             [matMenuTriggerFor]="reconciliationMenu"
             *mifosxHasPermission="'MENU_CONFIG_WIZARD'"
           >
-            <fa-icon icon="sync-alt" class="ni-ico"></fa-icon><span class="ni-full">Reconciliation</span
-            ><span class="ni-short">Recon</span>
+            <fa-icon icon="sync-alt" class="ni-ico"></fa-icon>Reconciliation
             <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
           </a>
           <a class="ni" tabindex="0" routerLink="/chequebook" *mifosxHasPermission="'MENU_CHEQUEBOOK'">
             <fa-icon icon="book" class="ni-ico"></fa-icon>Cheque Book
           </a>
           <a class="ni" tabindex="0" [matMenuTriggerFor]="letterMgmtMenu" *mifosxHasPermission="'MENU_LETTER_MGMT'">
-            <fa-icon icon="envelope" class="ni-ico"></fa-icon><span class="ni-full">Documents Hub</span
-            ><span class="ni-short">Docs Hub</span>
+            <fa-icon icon="envelope" class="ni-ico"></fa-icon>Documents Hub
             <fa-icon icon="caret-down" class="ni-caret"></fa-icon>
           </a>
         </div>
@@ -608,89 +609,71 @@
       </button>
     </mat-menu>
 
-    <mat-menu #reportsMenu="matMenu" class="reports-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid reports-grid" (click)="$event.stopPropagation()">
-        <!-- Core Reports -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Core Reports</div>
-          <button mat-menu-item [routerLink]="['/branch-ops/account-register']" tabindex="0">
-            <i class="fa fa-book menu-item-icon"></i> Account Register
-          </button>
-          <button mat-menu-item [routerLink]="['/reports']" tabindex="0">
-            <i class="fa fa-th-list menu-item-icon"></i> All Reports
-          </button>
-          <button mat-menu-item [routerLink]="['/reports', 'Client']" tabindex="0">
-            <i class="fa fa-user menu-item-icon"></i> Clients
-          </button>
-          <button mat-menu-item [routerLink]="['/reports', 'Loan']" tabindex="0">
-            <i class="fa fa-credit-card menu-item-icon"></i> Loans
-          </button>
-          <button mat-menu-item [routerLink]="['/reports', 'Savings']" tabindex="0">
-            <i class="fa fa-piggy-bank menu-item-icon"></i> Savings
-          </button>
-          <button mat-menu-item [routerLink]="['/reports', 'Fund']" tabindex="0">
-            <i class="fa fa-hand-holding-usd menu-item-icon"></i> Funds
-          </button>
-          <button mat-menu-item [routerLink]="['/reports', 'Accounting']" tabindex="0">
-            <i class="fa fa-calculator menu-item-icon"></i> Accounting
-          </button>
-        </div>
-
-        <!-- Operations & Interest -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Operations &amp; Interest</div>
-          <button mat-menu-item routerLink="/branch-ops/day-book" tabindex="0">
-            <i class="fa fa-book menu-item-icon"></i> Day Book &amp; Officer Verification
-          </button>
-          <button mat-menu-item routerLink="/branch-ops/end-of-day" tabindex="0">
-            <i class="fa fa-clipboard-check menu-item-icon"></i> End of the Day Report
-          </button>
-          <button mat-menu-item routerLink="/reports/savings-interest" tabindex="0">
-            <i class="fa fa-percentage menu-item-icon"></i> Savings Interest Posted
-          </button>
-          <button mat-menu-item routerLink="/reports/interest-posting" tabindex="0">
-            <i class="fa fa-clipboard-check menu-item-icon"></i> Interest Posting Reports
-          </button>
-          <button mat-menu-item routerLink="/reports/fd-interest-posting" tabindex="0">
-            <i class="fa fa-clipboard-check menu-item-icon"></i> FD Interest Posting Reports
-          </button>
-          <button mat-menu-item routerLink="/reports/interest-posting-summary" tabindex="0">
-            <i class="fa fa-table menu-item-icon"></i> Interest Posting Summary (Branch-wise)
-          </button>
-          <button mat-menu-item routerLink="/reports/tds-interest" tabindex="0">
-            <i class="fa fa-percent menu-item-icon"></i> Deposit Interest &amp; TDS
-          </button>
-        </div>
-
-        <!-- Compliance & Registers -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Compliance &amp; Registers</div>
-          <button mat-menu-item routerLink="/reports/form-97-98" tabindex="0">
-            <i class="fa fa-file-invoice menu-item-icon"></i> Form 97/98 Transaction Report
-          </button>
-          <button mat-menu-item routerLink="/reports/risk-review" tabindex="0">
-            <i class="fa fa-user-shield menu-item-icon"></i> Risk Review Report
-          </button>
-          <button mat-menu-item routerLink="/reports/kyc-expiry" tabindex="0">
-            <i class="fa fa-id-card menu-item-icon"></i> Re-KYC Expiry &amp; Outreach
-          </button>
-          <button mat-menu-item routerLink="/reports/dormancy" tabindex="0">
-            <i class="fa fa-hourglass-half menu-item-icon"></i> Inactive, Dormant &amp; DEAF
-          </button>
-          <button mat-menu-item routerLink="/reports/sanctions-logs" tabindex="0">
-            <i class="fa fa-shield-alt menu-item-icon"></i> Sanctions Screening &amp; Alerts
-          </button>
-          <button mat-menu-item routerLink="/reports/dip-lookups" tabindex="0">
-            <i class="fa fa-satellite-dish menu-item-icon"></i> DIP / MNRL Mobile Lookups
-          </button>
-          <button mat-menu-item routerLink="/reports/tds-remittance" tabindex="0">
-            <i class="fa fa-landmark menu-item-icon"></i> TDS Remitted to Government
-          </button>
-          <button mat-menu-item routerLink="/reports/bor" tabindex="0">
-            <i class="fa fa-gavel menu-item-icon"></i> BOR Register &mdash; Share Capital
-          </button>
-        </div>
-      </div>
+    <mat-menu #reportsMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
+      <button mat-menu-item [routerLink]="['/branch-ops/account-register']" tabindex="0">
+        <i class="fa fa-book menu-item-icon"></i> Account Register
+      </button>
+      <button mat-menu-item [routerLink]="['/reports']" tabindex="0">
+        <i class="fa fa-th-list menu-item-icon"></i> All Reports
+      </button>
+      <button mat-menu-item [routerLink]="['/reports', 'Client']" tabindex="0">
+        <i class="fa fa-user menu-item-icon"></i> Clients
+      </button>
+      <button mat-menu-item [routerLink]="['/reports', 'Loan']" tabindex="0">
+        <i class="fa fa-credit-card menu-item-icon"></i> Loans
+      </button>
+      <button mat-menu-item [routerLink]="['/reports', 'Savings']" tabindex="0">
+        <i class="fa fa-piggy-bank menu-item-icon"></i> Savings
+      </button>
+      <button mat-menu-item [routerLink]="['/reports', 'Fund']" tabindex="0">
+        <i class="fa fa-hand-holding-usd menu-item-icon"></i> Funds
+      </button>
+      <button mat-menu-item [routerLink]="['/reports', 'Accounting']" tabindex="0">
+        <i class="fa fa-calculator menu-item-icon"></i> Accounting
+      </button>
+      <mat-divider></mat-divider>
+      <!-- Listed here as well as under Branch Ops: an officer looking for the day's figures reaches
+           for Reports, and the same screen answers both. -->
+      <button mat-menu-item routerLink="/branch-ops/day-book" tabindex="0">
+        <i class="fa fa-book menu-item-icon"></i> Day Book &amp; Officer Verification
+      </button>
+      <button mat-menu-item routerLink="/branch-ops/end-of-day" tabindex="0">
+        <i class="fa fa-clipboard-check menu-item-icon"></i> End of the Day Report
+      </button>
+      <button mat-menu-item routerLink="/reports/form-97-98" tabindex="0">
+        <i class="fa fa-file-invoice menu-item-icon"></i> Form 97/98 Transaction Report
+      </button>
+      <button mat-menu-item routerLink="/reports/risk-review" tabindex="0">
+        <i class="fa fa-user-shield menu-item-icon"></i> Risk Review Report
+      </button>
+      <button mat-menu-item routerLink="/reports/kyc-expiry" tabindex="0">
+        <i class="fa fa-id-card menu-item-icon"></i> Re-KYC Expiry &amp; Outreach
+      </button>
+      <button mat-menu-item routerLink="/reports/dormancy" tabindex="0">
+        <i class="fa fa-hourglass-half menu-item-icon"></i> Inactive, Dormant &amp; DEAF
+      </button>
+      <button mat-menu-item routerLink="/reports/savings-interest" tabindex="0">
+        <i class="fa fa-percentage menu-item-icon"></i> Savings Interest Posted
+      </button>
+      <!--
+        The Principal Officer clears flagged UNSC screenings here. It is not a runnable report,
+        so it never shows up under the report categories above and had no nav entry at all.
+      -->
+      <button mat-menu-item routerLink="/reports/sanctions-logs" tabindex="0">
+        <i class="fa fa-shield-alt menu-item-icon"></i> Sanctions Screening &amp; Alerts
+      </button>
+      <button mat-menu-item routerLink="/reports/dip-lookups" tabindex="0">
+        <i class="fa fa-satellite-dish menu-item-icon"></i> DIP / MNRL Mobile Lookups
+      </button>
+      <button mat-menu-item routerLink="/reports/tds-interest" tabindex="0">
+        <i class="fa fa-percent menu-item-icon"></i> Deposit Interest &amp; TDS
+      </button>
+      <button mat-menu-item routerLink="/reports/tds-remittance" tabindex="0">
+        <i class="fa fa-landmark menu-item-icon"></i> TDS Remitted to Government
+      </button>
+      <button mat-menu-item routerLink="/reports/bor" tabindex="0">
+        <i class="fa fa-gavel menu-item-icon"></i> BOR Register &mdash; Share Capital
+      </button>
     </mat-menu>
 
     <!-- Admin Mega Menu — 3-column rectangular panel grouping Setup,
@@ -1067,140 +1050,121 @@
     <!-- Sub Menu Dropdowns -->
     <!-- Branch-level operations. Starts with the day register; other branch-wide controls belong
          here rather than under Cashier, which is one role's workspace. -->
-    <mat-menu #branchOpsMenu="matMenu" class="branch-ops-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid branch-ops-grid" (click)="$event.stopPropagation()">
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Day Operations</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/day-register']">
-            <fa-icon icon="calendar-check" class="menu-item-icon"></fa-icon> Day Open / Day Close
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/missed-close']">
-            <fa-icon icon="exclamation-triangle" class="menu-item-icon"></fa-icon> Missed Close Register
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/vault-position']">
-            <fa-icon icon="lock" class="menu-item-icon"></fa-icon> Vault Position
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/branch-position']">
-            <fa-icon icon="coins" class="menu-item-icon"></fa-icon> Branch Cash Position
-          </button>
-        </div>
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Verification &amp; Reports</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/day-book']">
-            <fa-icon icon="book" class="menu-item-icon"></fa-icon> Day Book &amp; Verification
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/end-of-day']">
-            <fa-icon icon="clipboard-check" class="menu-item-icon"></fa-icon> End of the Day Report
-          </button>
-        </div>
-      </div>
+    <mat-menu #branchOpsMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
+      <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/day-register']">
+        <fa-icon icon="calendar-check" class="menu-item-icon"></fa-icon> Day Open / Day Close
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/missed-close']">
+        <fa-icon icon="exclamation-triangle" class="menu-item-icon"></fa-icon> Missed Close Register
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/vault-position']">
+        <fa-icon icon="lock" class="menu-item-icon"></fa-icon> Vault Position
+      </button>
+      <!-- The day book carries the Officer Verification Sheet — each person's credit, debit and net
+           for the day. It was reachable only from the Clerk and Cashier menus, which is the one
+           place a principal officer signing the day off does not look. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/day-book']">
+        <fa-icon icon="book" class="menu-item-icon"></fa-icon> Day Book &amp; Verification
+      </button>
+      <!-- The signed sheet, as against the day book's working list: the day's modes, the drawer
+           against the books, and what is still open. This is what goes in the file. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/branch-ops/end-of-day']">
+        <fa-icon icon="clipboard-check" class="menu-item-icon"></fa-icon> End of the Day Report
+      </button>
     </mat-menu>
 
-    <!-- Clerk Desk -->
-    <mat-menu #clerkMenu="matMenu" class="clerk-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid clerk-grid" (click)="$event.stopPropagation()">
-        <!-- Clerk Desk -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Clerk Desk</div>
-          <button mat-menu-item tabindex="0" routerLink="/clerk/dashboard" (click)="hideShellLayout = true">
-            <fa-icon icon="id-card" class="menu-item-icon"></fa-icon> Clerk Dashboard
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/clerk/withdrawal-requests']">
-            <fa-icon icon="money-bill-wave" class="menu-item-icon"></fa-icon> My Withdrawal Requests
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/clerk/my-disbursement-requests']">
-            <fa-icon icon="exchange" class="menu-item-icon"></fa-icon> Disbursements &amp; Transfer
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/clerk/dividend-dashboard']">
-            <fa-icon icon="chart-pie" class="menu-item-icon"></fa-icon> Dividend Dashboard
-          </button>
-        </div>
-
-        <!-- Vouchers -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Vouchers</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/clerk/my-work']">
-            <fa-icon icon="user-check" class="menu-item-icon"></fa-icon> My Vouchers
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/clerk/system-vouchers']">
-            <fa-icon icon="robot" class="menu-item-icon"></fa-icon> System Vouchers
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/clerk/received-report']">
-            <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Received Vouchers
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/clerk/payment-report']">
-            <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Payment Vouchers
-          </button>
-        </div>
-
-        <!-- Counter & Reports -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Counter &amp; Reports</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cashier-position']">
-            <fa-icon icon="wallet" class="menu-item-icon"></fa-icon> Cashier Position
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/closing-report']">
-            <fa-icon icon="file-invoice" class="menu-item-icon"></fa-icon> Closing Cash Report
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/clerk/end-of-day']">
-            <fa-icon icon="clipboard-check" class="menu-item-icon"></fa-icon> End of the Day Report
-          </button>
-        </div>
-      </div>
+    <!-- Clerk was a bare link straight into the fullscreen dashboard, which left the clerk's other
+         screens reachable only from inside that fullscreen nav. Anything a clerk needs from the
+         normal shell — an open voucher exception above all — belongs here. -->
+    <mat-menu #clerkMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
+      <button mat-menu-item tabindex="0" routerLink="/clerk/dashboard" (click)="hideShellLayout = true">
+        <fa-icon icon="id-card" class="menu-item-icon"></fa-icon> Clerk Dashboard
+      </button>
+      <!-- The clerk reads the day as a sheet to sign off, not as a working list of vouchers: the
+           day's summary, the counter counted against the books, and what is still open. The day
+           book's own row-by-row view stays reachable from Branch Ops and from the Cashier menu. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/end-of-day']">
+        <fa-icon icon="clipboard-check" class="menu-item-icon"></fa-icon> End of the Day Report
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/withdrawal-requests']">
+        <fa-icon icon="money-bill-wave" class="menu-item-icon"></fa-icon> My Withdrawal Requests
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/my-disbursement-requests']">
+        <fa-icon icon="exchange" class="menu-item-icon"></fa-icon> Disbursements &amp; Transfer
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/dividend-dashboard']">
+        <fa-icon icon="chart-pie" class="menu-item-icon"></fa-icon> Dividend Dashboard
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/my-work']">
+        <fa-icon icon="user-check" class="menu-item-icon"></fa-icon> My Vouchers
+      </button>
+      <!-- Sits under My Vouchers because it answers the same question for the one worker who has no
+           own list: the system. A nightly run belongs to nobody, so it appears on no person's page. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/system-vouchers']">
+        <fa-icon icon="robot" class="menu-item-icon"></fa-icon> System Vouchers
+      </button>
+      <!-- A clerk supervises the counter, so they need to see what each cashier is holding and what
+           went through their drawer. Both screens already return every cashier for a non-cashier
+           caller (CashierRoleHelper scopes only a cashier to themselves) — they were simply not
+           reachable from this menu. -->
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cashier-position']">
+        <fa-icon icon="wallet" class="menu-item-icon"></fa-icon> Cashier Position
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/closing-report']">
+        <fa-icon icon="file-invoice" class="menu-item-icon"></fa-icon> Closing Cash Report
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/received-report']">
+        <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Received Vouchers
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/clerk/payment-report']">
+        <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Payment Vouchers
+      </button>
     </mat-menu>
 
-    <!-- Cashier Desk -->
-    <mat-menu #cashierMenu="matMenu" class="cashier-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid cashier-grid" (click)="$event.stopPropagation()">
-        <!-- Cash Entries & Exchange -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Cash &amp; Counter</div>
-          <!-- Cash Exchange, Currency Exchange Detail, Inter-Cashier Transfer and Reconciliation are not
-               here: they move or count notes in one cashier's own drawer, so only the cashier who is logged
-               in does them, from the cashier screen. -->
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/transaction-entry']">
-            <fa-icon icon="keyboard" class="menu-item-icon"></fa-icon> Transaction Entry
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/system/denomination-master']">
-            <fa-icon icon="coins" class="menu-item-icon"></fa-icon> Cash Denomination
-          </button>
-        </div>
-
-        <!-- Transfers & Settlement -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Transfers &amp; Settlement</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cash-transfer']">
-            <fa-icon icon="random" class="menu-item-icon"></fa-icon> Cash Transfer
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cash-settlement']">
-            <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Cash Settlement
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cashier-position']">
-            <fa-icon icon="wallet" class="menu-item-icon"></fa-icon> Cashier Position
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/day-book']">
-            <fa-icon icon="book" class="menu-item-icon"></fa-icon> Day Book
-          </button>
-        </div>
-
-        <!-- Reports & Audit -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Reports &amp; Audit</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/closing-report']">
-            <fa-icon icon="file-alt" class="menu-item-icon"></fa-icon> Closing Cash Report
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/excess-report']">
-            <fa-icon icon="exclamation-circle" class="menu-item-icon"></fa-icon> Excess Transaction Report
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cash-history']">
-            <fa-icon icon="history" class="menu-item-icon"></fa-icon> Cash History
-          </button>
-        </div>
-      </div>
+    <mat-menu #cashierMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cash-exchange']">
+        <fa-icon icon="exchange" class="menu-item-icon"></fa-icon> Cash Exchange Entry
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/system/denomination-master']">
+        <fa-icon icon="coins" class="menu-item-icon"></fa-icon> Cash Denomination
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/closing-report']">
+        <fa-icon icon="file-alt" class="menu-item-icon"></fa-icon> Closing Cash Report
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/exchange-detail']">
+        <fa-icon icon="globe" class="menu-item-icon"></fa-icon> Currency Exchange Detail
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cash-transfer']">
+        <fa-icon icon="random" class="menu-item-icon"></fa-icon> Cash Transfer
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/excess-report']">
+        <fa-icon icon="exclamation-circle" class="menu-item-icon"></fa-icon> Excess Transaction Report
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cash-settlement']">
+        <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Cash Settlement
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/inter-cashier']">
+        <fa-icon icon="exchange-alt" class="menu-item-icon"></fa-icon> Inter-Cashier Transfer
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cashier-position']">
+        <fa-icon icon="wallet" class="menu-item-icon"></fa-icon> Cashier Position
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/reconciliation']">
+        <fa-icon icon="balance-scale" class="menu-item-icon"></fa-icon> Reconciliation
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/cash-history']">
+        <fa-icon icon="history" class="menu-item-icon"></fa-icon> Cash History
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/day-book']">
+        <fa-icon icon="book" class="menu-item-icon"></fa-icon> Day Book
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/cashier/transaction-entry']">
+        <fa-icon icon="keyboard" class="menu-item-icon"></fa-icon> Transaction Entry
+      </button>
     </mat-menu>
 
     <mat-menu #depositsMenu="matMenu" class="deposits-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid deposits-grid" (click)="$event.stopPropagation()">
+      <div class="deposit-menu-grid" (click)="$event.stopPropagation()">
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Accounts</div>
           <button mat-menu-item tabindex="0" [routerLink]="['/accounts/savings']">
@@ -1266,11 +1230,8 @@
           <button mat-menu-item tabindex="0">
             <fa-icon icon="clock" class="menu-item-icon"></fa-icon> Account Expiry
           </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/fd-dashboard']">
-            <fa-icon icon="calendar-check" class="menu-item-icon"></fa-icon> FD Dashboard
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/rd-dashboard']">
-            <fa-icon icon="piggy-bank" class="menu-item-icon"></fa-icon> RD Dashboard
+          <button mat-menu-item tabindex="0">
+            <fa-icon icon="file-alt" class="menu-item-icon"></fa-icon> FD Maturity Report
           </button>
           <button mat-menu-item tabindex="0">
             <fa-icon icon="chart-line" class="menu-item-icon"></fa-icon> FD Interest Report
@@ -1288,54 +1249,34 @@
       </div>
     </mat-menu>
 
-    <mat-menu #clearingMenu="matMenu" class="clearing-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid clearing-grid" (click)="$event.stopPropagation()">
-        <!-- CTS Clearing -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">CTS Clearing</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/inward']">
-            <fa-icon icon="arrow-left" class="menu-item-icon"></fa-icon> Inward Clearing (CTS)
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/outward']">
-            <fa-icon icon="arrow-right" class="menu-item-icon"></fa-icon> Outward Clearing (CTS)
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/positive-pay']">
-            <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Positive Pay (PPS)
-          </button>
-        </div>
-
-        <!-- Settlement & Recon -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Settlement &amp; Recon</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/settlement']">
-            <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Settlement
-          </button>
-          <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/reconciliation']">
-            <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Reconciliation
-          </button>
-          <button mat-menu-item [routerLink]="['/sponsor-dd/inventory']" tabindex="0">
-            <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Sponsor DD Inventory
-          </button>
-        </div>
-
-        <!-- NACH & Other -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">NACH &amp; Direct</div>
-          <button mat-menu-item tabindex="0" [routerLink]="['/nachclearing']">
-            <fa-icon icon="money-check" class="menu-item-icon"></fa-icon> NACH Clearing
-          </button>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="arrow-right" class="menu-item-icon"></fa-icon> Outward
-          </button>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="arrow-left" class="menu-item-icon"></fa-icon> Inward
-          </button>
-        </div>
-      </div>
+    <mat-menu #clearingMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
+      <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/inward']">
+        <fa-icon icon="arrow-left" class="menu-item-icon"></fa-icon> Inward Clearing (CTS)
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/outward']">
+        <fa-icon icon="arrow-right" class="menu-item-icon"></fa-icon> Outward Clearing (CTS)
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/positive-pay']">
+        <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Positive Pay (PPS)
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/settlement']">
+        <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Settlement
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/ctsclearing/reconciliation']">
+        <fa-icon icon="check-circle" class="menu-item-icon"></fa-icon> Reconciliation
+      </button>
+      <button mat-menu-item tabindex="0" [routerLink]="['/nachclearing']">
+        <fa-icon icon="money-check" class="menu-item-icon"></fa-icon> NACH Clearing
+      </button>
+      <button mat-menu-item tabindex="0"><fa-icon icon="arrow-right" class="menu-item-icon"></fa-icon> Outward</button>
+      <button mat-menu-item tabindex="0"><fa-icon icon="arrow-left" class="menu-item-icon"></fa-icon> Inward</button>
+      <button mat-menu-item [routerLink]="['/sponsor-dd/inventory']" tabindex="0">
+        <fa-icon icon="receipt" class="menu-item-icon"></fa-icon> Sponsor DD Inventory
+      </button>
     </mat-menu>
 
     <mat-menu #hrmMenu="matMenu" class="hrm-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid hrm-grid" (click)="$event.stopPropagation()">
+      <div class="deposit-menu-grid" (click)="$event.stopPropagation()">
         <!-- Payroll -->
         <div class="deposit-menu-group">
           <div class="deposit-group-title">Payroll</div>
@@ -1644,33 +1585,23 @@
       </div>
     </mat-menu>
 
-    <mat-menu #ckycMenu="matMenu" class="ckyc-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid ckyc-grid" (click)="$event.stopPropagation()">
-        <!-- KYC Operations -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">KYC Operations</div>
-          <button mat-menu-item routerLink="/ckyc" tabindex="0">
-            <fa-icon icon="id-card" class="menu-item-icon"></fa-icon> CKYC Management
-          </button>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="database" class="menu-item-icon" style="color: #be185d"></fa-icon> Dump KYC &amp; Loan Data
-          </button>
-        </div>
-
-        <!-- Reports & Screening -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Reports &amp; Screening</div>
-          <button mat-menu-item tabindex="0" (click)="openCkycReportsDialog('REKYC')">
-            <fa-icon icon="sync-alt" class="menu-item-icon" style="color: #be185d"></fa-icon> Re-KYC Report
-          </button>
-          <button mat-menu-item tabindex="0" (click)="openCkycReportsDialog('RISK-REVIEW')">
-            <fa-icon icon="history" class="menu-item-icon" style="color: #be185d"></fa-icon> Risk Review
-          </button>
-          <button mat-menu-item tabindex="0" (click)="openCkycReportsDialog('CERSAI')">
-            <fa-icon icon="shield-alt" class="menu-item-icon" style="color: #be185d"></fa-icon> CERSAI Report
-          </button>
-        </div>
-      </div>
+    <mat-menu #ckycMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
+      <button mat-menu-item routerLink="/ckyc" tabindex="0">
+        <fa-icon icon="id-card" class="menu-item-icon"></fa-icon> CKYC Management
+      </button>
+      <button mat-menu-item tabindex="0" (click)="openCkycReportsDialog('REKYC')">
+        <fa-icon icon="sync-alt" class="menu-item-icon" style="color: #be185d"></fa-icon> Re-KYC Report
+      </button>
+      <button mat-menu-item tabindex="0" (click)="openCkycReportsDialog('RISK-REVIEW')">
+        <fa-icon icon="history" class="menu-item-icon" style="color: #be185d"></fa-icon> Risk Review
+      </button>
+      <button mat-menu-item tabindex="0" (click)="openCkycReportsDialog('CERSAI')">
+        <fa-icon icon="shield-alt" class="menu-item-icon" style="color: #be185d"></fa-icon> CERSAI Report
+      </button>
+      <mat-divider></mat-divider>
+      <button mat-menu-item tabindex="0">
+        <fa-icon icon="database" class="menu-item-icon" style="color: #be185d"></fa-icon> Dump KYC &amp; Loan Data
+      </button>
     </mat-menu>
 
     <!-- CFCFRMS — single landing page (CfcfrmsShell) hosts the full
@@ -1688,11 +1619,11 @@
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/sundry-dr-cr">
             <fa-icon icon="random" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            Sundry Dr / Cr
+            Sundry Dr / Cr Reconciliation
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/pnl-impact">
             <fa-icon icon="chart-line" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            P&amp;L Impact
+            P&amp;L Impact Reconciliation
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/gl-reconciliation">
             <fa-icon icon="book-open" class="menu-item-icon" style="color: #0d9488"></fa-icon>
@@ -1700,11 +1631,11 @@
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/fixed-assets">
             <fa-icon icon="cube" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            Fixed Assets
+            Fixed Assets Reconciliation
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/inter-company">
             <fa-icon icon="sitemap" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            Inter-Company
+            Inter-Company Reconciliation
           </button>
         </div>
 
@@ -1717,15 +1648,15 @@
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/api-bank-reco">
             <fa-icon icon="code-branch" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            API Bank Reco
+            API Based Bank Reconciliation
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/neft-rtgs">
             <fa-icon icon="exchange" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            NEFT / RTGS Reco
+            NEFT / RTGS Reconciliation
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/clearing-reco">
             <fa-icon icon="hand-holding-usd" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            Clearing Reco
+            Clearing Reconciliation
           </button>
         </div>
 
@@ -1738,11 +1669,11 @@
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/three-way-digital">
             <fa-icon icon="project-diagram" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            Three-way Digital
+            Three-way Digital Reconciliation
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/nach-reco">
             <fa-icon icon="sync-alt" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            NACH Reco
+            NACH Reconciliation
           </button>
         </div>
 
@@ -1751,11 +1682,11 @@
           <div class="deposit-group-title">Instruments &amp; Members</div>
           <button mat-menu-item [routerLink]="['/sponsor-dd-reconciliation']" tabindex="0">
             <fa-icon icon="money-check-alt" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            DD / Pay Order
+            DD / Pay Order Reconciliation
           </button>
           <button mat-menu-item tabindex="0" routerLink="/reconciliation/share-member">
             <fa-icon icon="coins" class="menu-item-icon" style="color: #0d9488"></fa-icon>
-            Share Member
+            Share Member Reconciliation
           </button>
         </div>
 
@@ -1931,68 +1862,46 @@
       </div>
     </mat-menu>
 
-    <mat-menu #insuranceMenu="matMenu" class="insurance-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid insurance-grid" (click)="$event.stopPropagation()">
-        <!-- Social & Policy Schemes -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Schemes &amp; Social</div>
-          <button mat-menu-item routerLink="/dicgc" tabindex="0">
-            <fa-icon icon="building" class="menu-item-icon" style="color: #c2410c"></fa-icon> DICGC
-          </button>
-          <button mat-menu-item tabindex="0"><fa-icon icon="heart" class="menu-item-icon"></fa-icon> PMJBY</button>
-          <button mat-menu-item tabindex="0"><fa-icon icon="heart" class="menu-item-icon"></fa-icon> PMSBY</button>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="hand-holding-heart" class="menu-item-icon"></fa-icon> Indemnity
-          </button>
-        </div>
-
-        <!-- Institutional & Loans -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Institutional &amp; Loans</div>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="file-invoice" class="menu-item-icon"></fa-icon> Loan Insurance
-          </button>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="home" class="menu-item-icon"></fa-icon> Assets Insurance
-          </button>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="laptop" class="menu-item-icon"></fa-icon> Cyber Insurance
-          </button>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="university" class="menu-item-icon"></fa-icon> Bank Insurance
-          </button>
-        </div>
-      </div>
+    <mat-menu #insuranceMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
+      <button mat-menu-item routerLink="/dicgc" tabindex="0">
+        <fa-icon icon="building" class="menu-item-icon" style="color: #c2410c"></fa-icon> DICGC
+      </button>
+      <button mat-menu-item tabindex="0"><fa-icon icon="heart" class="menu-item-icon"></fa-icon> PMJBY</button>
+      <button mat-menu-item tabindex="0"><fa-icon icon="heart" class="menu-item-icon"></fa-icon> PMSBY</button>
+      <button mat-menu-item tabindex="0">
+        <fa-icon icon="hand-holding-heart" class="menu-item-icon"></fa-icon> Indemnity
+      </button>
+      <button mat-menu-item tabindex="0">
+        <fa-icon icon="home" class="menu-item-icon"></fa-icon> Assets Insurance
+      </button>
+      <button mat-menu-item tabindex="0">
+        <fa-icon icon="laptop" class="menu-item-icon"></fa-icon> Cyber Insurance
+      </button>
+      <button mat-menu-item tabindex="0">
+        <fa-icon icon="university" class="menu-item-icon"></fa-icon> Bank Insurance
+      </button>
+      <button mat-menu-item tabindex="0">
+        <fa-icon icon="file-invoice" class="menu-item-icon"></fa-icon> Loan Insurance
+      </button>
     </mat-menu>
 
-    <mat-menu #digitalMenu="matMenu" class="digital-mega-panel" [overlapTrigger]="false">
-      <div class="deposit-menu-grid digital-grid" (click)="$event.stopPropagation()">
-        <!-- Payment Systems -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Payments</div>
-          <button mat-menu-item routerLink="/digital/neft-rtgs-report" tabindex="0">
-            <fa-icon icon="exchange" class="menu-item-icon"></fa-icon> NEFT / RTGS
-          </button>
-          <button mat-menu-item routerLink="/digital/imps-report" tabindex="0">
-            <fa-icon icon="bolt" class="menu-item-icon"></fa-icon> IMPS
-          </button>
-          <button mat-menu-item routerLink="/digital/upi-report" tabindex="0">
-            <fa-icon icon="mobile-alt" class="menu-item-icon"></fa-icon> UPI Reports
-          </button>
-        </div>
-
-        <!-- Cards & Mandates -->
-        <div class="deposit-menu-group">
-          <div class="deposit-group-title">Cards &amp; Mandates</div>
-          <button mat-menu-item routerLink="/digital/atm-pos-ecom" tabindex="0">
-            <fa-icon icon="credit-card" class="menu-item-icon"></fa-icon> ATM / POS / ECOM Reports
-          </button>
-          <button mat-menu-item tabindex="0"><fa-icon icon="sync" class="menu-item-icon"></fa-icon> NACH</button>
-          <button mat-menu-item tabindex="0">
-            <fa-icon icon="file-signature" class="menu-item-icon"></fa-icon> Mandate
-          </button>
-        </div>
-      </div>
+    <mat-menu #digitalMenu="matMenu" [overlapTrigger]="false" class="nav-dropdown">
+      <button mat-menu-item routerLink="/digital/neft-rtgs-report" tabindex="0">
+        <fa-icon icon="exchange" class="menu-item-icon"></fa-icon> NEFT / RTGS
+      </button>
+      <button mat-menu-item routerLink="/digital/imps-report" tabindex="0">
+        <fa-icon icon="bolt" class="menu-item-icon"></fa-icon> IMPS
+      </button>
+      <button mat-menu-item routerLink="/digital/upi-report" tabindex="0">
+        <fa-icon icon="mobile-alt" class="menu-item-icon"></fa-icon> UPI Reports
+      </button>
+      <button mat-menu-item routerLink="/digital/atm-pos-ecom" tabindex="0">
+        <fa-icon icon="credit-card" class="menu-item-icon"></fa-icon> ATM / POS / ECOM Reports
+      </button>
+      <button mat-menu-item tabindex="0"><fa-icon icon="sync" class="menu-item-icon"></fa-icon> NACH</button>
+      <button mat-menu-item tabindex="0">
+        <fa-icon icon="file-signature" class="menu-item-icon"></fa-icon> Mandate
+      </button>
     </mat-menu>
 
     <!-- RBI Mega Menu -->
@@ -2183,35 +2092,6 @@
               <fa-icon icon="users" class="gl-icon" style="color: #4f46e5"></fa-icon> Members &amp; Share Capital
             </a>
           </div>
-          <!-- Reserve Returns — CRR and SLR, computed live from the ledger. Grouped apart from the
-               OSS returns because they are filed on their own cycles: Form 1 twice a month, Form 9
-               at month end. -->
-          <div class="gl-group">
-            <div class="gl-group-title">Reserve Returns</div>
-            <!-- The statutory form is a tab on Form 1 rather than an entry of its own: two menu
-                 items for one return had a filer guessing which one they were looking at. -->
-            <a
-              class="gl-link"
-              [class.hidden]="!matchesRbiSearch('Form 1 CRR Cash Reserve Ratio')"
-              routerLink="/rbi/form1"
-              (click)="rbiMenuOpen = false"
-            >
-              <fa-icon icon="percentage" class="gl-icon" style="color: #b45309"></fa-icon> Form 1 — CRR (fortnightly)
-            </a>
-            <!-- Form 9 (SLR) has no entry of its own. Section 24 is settled on the statutory Form 1,
-                 at Part C, on the same liabilities Part B charges the cash reserve on — so the SLR
-                 position is read there rather than on a second screen that computed it from a
-                 differently drawn base and disagreed. -->
-            <a
-              class="gl-link"
-              [class.hidden]="!matchesRbiSearch('Form IX R408 Return on Assets and Liabilities balance sheet')"
-              routerLink="/rbi/form9-return"
-              (click)="rbiMenuOpen = false"
-            >
-              <fa-icon icon="percentage" class="gl-icon" style="color: #b45309"></fa-icon> Form IX — Assets &amp;
-              Liabilities (R408)
-            </a>
-          </div>
           <!-- CIMS / XBRL Returns -->
           <div class="gl-group">
             <div class="gl-group-title">CIMS / XBRL Returns</div>

src/app/core/shell/shell.component.scss

@@ -244,44 +244,6 @@ $color: #e2e4ec;
   }
 }
 
-/*
- * The cashier's bar is meant to be one row at a normal window size: it carries about eleven items, and at
- * the usual padding the last one wrapped onto a second row. The items are tightened so they fit, and spread
- * across the row. As the window narrows they tighten further, then drop their icons, and only wrap in a very
- * narrow window. The clerk's bar (cashier-nav--clerk) has its own dropdowns and is left as it was.
- */
-.cashier-nav:not(.cashier-nav--clerk) {
-  flex-wrap: nowrap;
-  justify-content: space-between;
-  gap: 0;
-  padding: 4px 8px;
-
-  .cashier-nav__item {
-    flex: 0 0 auto;
-    gap: 4px;
-    padding: 5px 8px;
-    font-size: 11.5px;
-  }
-
-  @media (width <= 1240px) {
-    .cashier-nav__item {
-      padding: 5px 6px;
-      font-size: 11px;
-    }
-  }
-
-  @media (width <= 1120px) {
-    .cashier-nav__item fa-icon {
-      display: none;
-    }
-  }
-
-  @media (width <= 900px) {
-    flex-wrap: wrap;
-    justify-content: flex-start;
-  }
-}
-
 .sidenav {
   overflow-x: hidden;
   position: relative;
@@ -304,7 +266,7 @@ $color: #e2e4ec;
     max-width: 100%;
     overflow-x: hidden;
     box-sizing: border-box;
-    padding: 10px 18px;
+    padding: 16px 28px;
   }
 }
 
@@ -320,15 +282,21 @@ $gray-700: #334155;
 /* ============================================================
    Main header (top 2-row navigation)
    --------------------------------------------------------------
-   Compact, modern enterprise SaaS navigation:
-   • Height reduced to 32px per row (64px total) to save screen space.
-   • Smooth horizontal scrolling prevents menu items from getting cut off.
-   • Compact typography, icons and paddings fit all banking modules cleanly.
+   Redesigned 2026 — clean, modern enterprise SaaS feel:
+   • Both rows live on the same white surface separated only by a
+     hairline; r2 has a barely-there blue-50 wash so frequent vs
+     secondary menus read at a glance without dark/light contrast.
+   • Items are now equal-width "tabs" with NO vertical dividers
+     between them (the old cell borders made it look spreadsheet-y).
+   • Hover / active = a 3 px brand-coloured TOP bar + brand text +
+     coloured icon. Reads instantly without colour-flooding the row.
+   • Icons larger (12.5 px) and full-opacity always — easier to scan
+     during demos. Caret is subtle and rotates on open.
    ============================================================ */
 .main-header {
   background: #fff;
-  border-bottom: 2px solid $brand;
-  box-shadow: 0 1px 3px rgb(0 0 0 / 6%);
+  border-bottom: 2.5px solid $brand;
+  box-shadow: 0 1px 4px rgb(0 0 0 / 7%);
   position: sticky;
 
   /* Sit directly under the sticky toolbar (32px tall) so both stay visible. */
@@ -338,19 +306,19 @@ $gray-700: #334155;
 }
 
 .nav-row {
-  height: 32px;
+  height: 44px;
   display: flex;
   align-items: stretch;
-  overflow: auto visible;
+  overflow: visible;
   position: relative;
+
+  /* Outer frame; vertical dividers between cells are drawn as `border-right`
+     on each `.ni` below. Switched away from the equal-column grid so each
+     cell can size to its own label — long names (General Ledger, Documents
+     Hub) no longer overflow and short ones (Approvals, HRM) no longer waste
+     space. */
   border: 1px solid $gray-200;
   background: #fff;
-  scrollbar-width: none;
-  -ms-overflow-style: none;
-
-  &::-webkit-scrollbar {
-    display: none;
-  }
 }
 
 .r2.nav-row {
@@ -366,17 +334,25 @@ $gray-700: #334155;
   background: #f8fafc;
 }
 
-// ===== Nav Item — compact modern tab style =====
+// ===== Nav Item — modern tab style =====
+// Typography spec — same family / size / weight / color for BOTH rows.
 .ni {
   position: relative;
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  gap: 2.5px;
+  gap: 7px;
   height: 100%;
+
+  /* Each cell sizes to its own label (min-width: max-content) and grows
+     to share any leftover row width. Short labels stay compact, long ones
+     get the room they need — no overlap, no wasted gap. */
   flex: 1 0 auto;
-  min-width: 0;
-  padding: 0 4px;
+  min-width: max-content;
+  padding: 0 14px;
+
+  /* Vertical divider between adjacent cells; outer frame is the row's
+     own border, and the last cell drops its right border below. */
   border-right: 1px solid $gray-200;
   cursor: pointer;
   white-space: nowrap;
@@ -384,11 +360,11 @@ $gray-700: #334155;
     'IBM Plex Sans',
     -apple-system,
     sans-serif;
-  font-size: 10px;
+  font-size: 12px;
   font-weight: 500;
   color: #0a1a2e;
-  line-height: 1.2;
-  letter-spacing: -0.015em;
+  line-height: 1.3;
+  letter-spacing: 0.01em;
   text-decoration: none;
   user-select: none;
   transition:
@@ -397,15 +373,17 @@ $gray-700: #334155;
     box-shadow 0.15s ease;
   border-radius: 0;
 
+  /* 3px accent strip that fills on hover / active (uses ::before so we
+     don't reflow the row when toggling). */
   &::before {
     content: '';
     position: absolute;
-    left: 2px;
-    right: 2px;
+    left: 4px;
+    right: 4px;
     top: 0;
-    height: 2px;
+    height: 3px;
     background: transparent;
-    border-radius: 0 0 2px 2px;
+    border-radius: 0 0 3px 3px;
     transition: background 0.15s ease;
   }
 
@@ -432,19 +410,17 @@ $gray-700: #334155;
     outline-offset: -2px;
   }
 
+  /* Last cell in a row sits flush against the row's own right edge, so
+     drop its divider to avoid a double 2 px line. */
   &:last-child {
     border-right: none;
   }
-
-  .ni-short {
-    display: none;
-  }
 }
 
 .ni-ico {
-  width: 9.5px;
-  height: 9.5px;
-  font-size: 9.5px;
+  width: 12px;
+  height: 12px;
+  font-size: 12px;
   color: $gray-500;
   flex-shrink: 0;
   transition: color 0.15s ease;
@@ -456,12 +432,11 @@ $gray-700: #334155;
 }
 
 .ni-caret {
-  width: 5px;
-  height: 5px;
-  font-size: 5px;
+  width: 7px;
+  height: 7px;
+  font-size: 7px;
   color: $gray-400;
   flex-shrink: 0;
-  margin-left: 0.5px;
   transition:
     transform 0.18s ease,
     color 0.18s ease;
@@ -472,89 +447,17 @@ $gray-700: #334155;
   }
 }
 
-@media (width >= 1400px) {
-  .ni {
-    padding: 0 6px;
-    gap: 3.5px;
-    font-size: 10.8px;
-    letter-spacing: 0;
-  }
-
-  .ni-ico {
-    width: 10px;
-    height: 10px;
-    font-size: 10px;
-  }
-
-  .ni-caret {
-    width: 5.5px;
-    height: 5.5px;
-    font-size: 5.5px;
-    margin-left: 1px;
-  }
-}
-
 @media (width <= 1200px) {
   .ni {
-    padding: 0 3px;
-    gap: 2px;
-    font-size: 9.8px;
-    letter-spacing: -0.02em;
-  }
-
-  .ni-ico {
-    width: 9px;
-    height: 9px;
-    font-size: 9px;
-  }
-
-  .ni-caret {
-    width: 4.5px;
-    height: 4.5px;
-    font-size: 4.5px;
+    padding: 0 8px;
+    gap: 5px;
   }
 }
 
-@media (width <= 1080px) {
+@media (width <= 980px) {
   .ni {
-    padding: 0 2.5px;
-    gap: 1.5px;
-    font-size: 9.4px;
-    letter-spacing: -0.025em;
-
-    .ni-full {
-      display: none;
-    }
-
-    .ni-short {
-      display: inline;
-    }
-  }
-
-  .ni-ico {
-    width: 8.5px;
-    height: 8.5px;
-    font-size: 8.5px;
-  }
-
-  .ni-caret {
-    width: 4px;
-    height: 4px;
-    font-size: 4px;
-  }
-}
-
-@media (width <= 880px) {
-  .nav-row {
-    overflow-x: auto;
-    scrollbar-width: thin;
-  }
-
-  .ni {
-    flex: 0 0 auto;
     padding: 0 6px;
-    gap: 3px;
-    font-size: 10px;
+    gap: 4px;
   }
 }
 
@@ -796,29 +699,21 @@ $gray-700: #334155;
 
 // ===== Nav Dropdown Menus =====
 ::ng-deep .nav-dropdown {
-  border-radius: 6px !important;
+  border-radius: 8px !important;
   border: 1px solid $gray-200 !important;
-  box-shadow: 0 4px 16px rgb(0 0 0 / 12%) !important;
-  min-width: 170px !important;
-  padding: 3px 0 !important;
-  margin-top: 1px !important;
+  box-shadow: 0 6px 24px rgb(0 0 0 / 10%) !important;
+  min-width: 180px !important;
+  padding: 4px 0 !important;
+  margin-top: 2px !important;
 
   .mat-mdc-menu-item {
-    font-size: 10.5px !important;
+    font-size: 12.5px !important;
     font-weight: 500 !important;
-    height: 25px !important;
-    min-height: 25px !important;
-    padding: 0 6px !important;
-    line-height: 25px !important;
+    height: 34px !important;
+    min-height: 34px !important;
+    padding: 0 14px !important;
     color: $gray-700 !important;
-    font-family: 'IBM Plex Sans', Roboto, sans-serif !important;
-    white-space: nowrap !important;
-
-    .menu-item-icon {
-      font-size: 10.5px !important;
-      margin-right: 5px !important;
-      opacity: 0.8;
-    }
+    font-family: 'DM Sans', Roboto, sans-serif !important;
 
     &:hover {
       background: $brand-hover !important;
@@ -833,44 +728,39 @@ $gray-700: #334155;
 }
 
 /* Deposits Mega Panel (inside mat-menu overlay) */
-::ng-deep .deposit-menu-grid {
+.deposit-menu-grid {
   display: grid;
-  gap: 4px 12px;
-  padding: 6px 10px;
-  min-width: 0;
-  width: 100%;
-  box-sizing: border-box;
-  overflow-x: hidden;
+  grid-template-columns: repeat(3, 1fr);
+  gap: 8px 24px;
+  padding: 8px 12px;
+  min-width: 600px;
 }
 
-::ng-deep .deposit-menu-group {
+.deposit-menu-group {
   .deposit-group-title {
     font-weight: 700;
-    font-size: 9.5px;
+    font-size: 11px;
     text-transform: uppercase;
-    letter-spacing: 0.5px;
+    letter-spacing: 0.6px;
     color: #1074b9;
-    padding: 2px 6px 3px;
+    padding: 4px 16px 6px;
     margin-bottom: 2px;
-    border-bottom: 1.5px solid #1074b9;
-    white-space: nowrap;
+    border-bottom: 2px solid #1074b9;
   }
 }
 
-/* NPA Mega Panel — 3 columns */
-::ng-deep .npa-grid {
-  grid-template-columns: repeat(3, minmax(210px, 1fr));
-  min-width: 0;
-  max-width: 100%;
-  overflow-x: hidden;
+/* NPA Mega Panel — 4 columns (Reports / Analysis / Classification / Recovery Management) */
+.npa-grid {
+  grid-template-columns: repeat(4, minmax(200px, 1fr));
+  min-width: 880px;
+  max-width: 96vw;
 }
 
-/* Reconciliation Mega Panel — 5 columns */
-::ng-deep .reconciliation-grid {
-  grid-template-columns: repeat(5, minmax(170px, 1fr));
-  min-width: 0;
-  max-width: 100%;
-  overflow-x: hidden;
+/* Reconciliation Mega Panel — 5 columns, teal accent to match the icon palette */
+.reconciliation-grid {
+  grid-template-columns: repeat(5, minmax(190px, 1fr));
+  min-width: 1040px;
+  max-width: 96vw;
 
   .deposit-group-title {
     color: #0d9488;
@@ -890,49 +780,47 @@ $gray-700: #334155;
 
 .gl-mega-menu {
   position: absolute;
-  top: 96px;
+  top: 100px;
   left: 50%;
   transform: translateX(-50%);
   background: #fff;
-  width: 760px;
-  max-width: 94vw;
-  max-height: 72vh;
-  overflow-y: auto;
-  padding: 12px 16px;
-  box-shadow: 0 6px 20px rgb(0 0 0 / 18%);
-  border-radius: 0 0 8px 8px;
+  width: 860px;
+  max-width: 95vw;
+  padding: 20px 24px;
+  box-shadow: 0 6px 24px rgb(0 0 0 / 22%);
+  border-radius: 0 0 10px 10px;
   z-index: 1000;
-  border-top: 2.5px solid #0d47a1;
+  border-top: 3px solid #0d47a1;
 }
 
 .gl-mega-menu-header {
   display: flex;
   align-items: center;
-  gap: 8px;
-  margin-bottom: 8px;
-  padding-bottom: 6px;
+  gap: 10px;
+  margin-bottom: 14px;
+  padding-bottom: 12px;
   border-bottom: 1px solid #e5e7eb;
 
   span {
-    font-size: 14px;
+    font-size: 18px;
     font-weight: 700;
     color: #0d47a1;
-    letter-spacing: 0.01em;
+    letter-spacing: 0.02em;
   }
 }
 
 .gl-mega-menu-header-icon {
-  font-size: 14px;
+  font-size: 18px;
   color: #0d47a1;
 }
 
 .gl-search {
   width: 100%;
-  padding: 6px 10px;
-  margin-bottom: 10px;
+  padding: 10px 14px;
+  margin-bottom: 16px;
   border: 1px solid #d0d5dd;
-  border-radius: 5px;
-  font-size: 12px;
+  border-radius: 6px;
+  font-size: 14px;
   box-sizing: border-box;
   background: #f9fafb;
 
@@ -940,37 +828,36 @@ $gray-700: #334155;
     outline: none;
     border-color: #0d47a1;
     background: #fff;
-    box-shadow: 0 0 0 2px rgb(13 71 161 / 10%);
+    box-shadow: 0 0 0 3px rgb(13 71 161 / 10%);
   }
 }
 
 .gl-columns {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
-  gap: 10px 16px;
+  gap: 24px;
 }
 
 .gl-group-title {
   font-weight: 700;
-  font-size: 10px;
+  font-size: 11px;
   text-transform: uppercase;
-  letter-spacing: 0.6px;
+  letter-spacing: 0.8px;
   color: #0d47a1;
-  margin-bottom: 5px;
-  padding-bottom: 3px;
-  border-bottom: 1.5px solid #0d47a1;
+  margin-bottom: 10px;
+  padding-bottom: 6px;
+  border-bottom: 2px solid #0d47a1;
 }
 
 .gl-link {
   display: flex;
   align-items: center;
-  padding: 3.5px 5px;
+  padding: 7px 6px;
   text-decoration: none;
   color: #344054;
-  font-size: 11.5px;
-  line-height: 1.3;
+  font-size: 13px;
   cursor: pointer;
-  border-radius: 4px;
+  border-radius: 5px;
   transition:
     background 0.15s,
     color 0.15s;
@@ -986,21 +873,23 @@ $gray-700: #334155;
 }
 
 .gl-icon {
-  width: 14px;
-  margin-right: 5px;
+  width: 18px;
+  margin-right: 8px;
   color: #667085;
-  font-size: 11px;
-  flex-shrink: 0;
+  font-size: 13px;
 
   .gl-link:hover & {
     color: #0d47a1;
   }
 }
 
+// Marks a menu link as actually wired to a working screen/dialog (vs a still-unwired
+// placeholder) — a small green dot at the end of the row, so a reviewer can tell at a glance
+// which items in a mega-menu are functional without having to click every one of them.
 .gl-link--live::after {
   content: '';
-  width: 5px;
-  height: 5px;
+  width: 6px;
+  height: 6px;
   margin-left: auto;
   flex-shrink: 0;
   border-radius: 50%;
@@ -1010,9 +899,9 @@ $gray-700: #334155;
 
 /* RBI Mega Menu */
 .rbi-mega-menu {
-  width: 880px;
-  max-width: 94vw;
-  max-height: 72vh;
+  width: 1100px;
+  max-width: 97vw;
+  max-height: 80vh;
   overflow-y: auto;
   border-top-color: #b71c1c;
 }
@@ -1020,7 +909,7 @@ $gray-700: #334155;
 .rbi-columns {
   display: grid;
   grid-template-columns: repeat(4, 1fr);
-  gap: 10px 16px;
+  gap: 20px;
 }
 
 @keyframes move {

src/app/core/shell/shell.component.ts

@@ -167,9 +167,7 @@ export class ShellComponent implements OnInit, OnDestroy {
         url.includes('/clerk/withdrawal-request') ||
         url.includes('/clerk/my-disbursement-requests');
       const isElectionRoute = url.includes('/election');
-      const isFdDashboardRoute = url.includes('/fd-dashboard');
-      this.hideShellLayout =
-        isCashierOnly || isClerkRoute || isElectionRoute || isFdDashboardRoute || this.isWithdrawalReviewUrl;
+      this.hideShellLayout = isCashierOnly || isClerkRoute || isElectionRoute || this.isWithdrawalReviewUrl;
       this.cdr.detectChanges();
     };
     this.routeSub = this.router.events.pipe(filter((e) => e instanceof NavigationEnd)).subscribe(() => checkLayout());
@@ -182,7 +180,10 @@ export class ShellComponent implements OnInit, OnDestroy {
     });
   }
 
-  /** Toggles the current collapsed state of sidenav according to the emitted event. */
+  /**
+   * Toggles the current collapsed state of sidenav according to the emitted event.
+   * @param {boolean} event denotes state of sidenav
+   */
   toggleCollapse($event: boolean) {
     this.sidenavCollapsed = $event;
     this.cdr.detectChanges();
@@ -203,15 +204,12 @@ export class ShellComponent implements OnInit, OnDestroy {
     return /\/checker-inbox-and-tasks\/(share-)?withdrawal-requests\/\d+\/review/.test(this.router.url);
   }
 
-  /** ESC key — exit fullscreen at Clerk Dashboard / Election / FD Dashboard / review screen, restoring full shell header. */
+  /** ESC key — exit fullscreen at Clerk Dashboard / Election / review screen, restoring full shell header. */
   @HostListener('document:keydown.escape')
   onEscapeKey(): void {
     if (
       this.hideShellLayout &&
-      (this.router.url.includes('/clerk/') ||
-        this.router.url.includes('/election') ||
-        this.router.url.includes('/fd-dashboard') ||
-        this.isWithdrawalReviewUrl)
+      (this.router.url.includes('/clerk/') || this.router.url.includes('/election') || this.isWithdrawalReviewUrl)
     ) {
       this.hideShellLayout = false;
       this.cdr.detectChanges();

src/app/core/shell/toolbar/toolbar.component.html

@@ -20,9 +20,7 @@
       <div class="t-live"></div>
       &nbsp;LIVE
     </div>
-    <div class="t-chip">
-      Branch:&nbsp;<strong>{{ officeLabel }}</strong>
-    </div>
+    <div class="t-chip">Branch:&nbsp;<strong>HO</strong></div>
     <div class="t-chip">
       Date:&nbsp;<strong>{{ today | date: 'dd MMM yyyy' }}</strong>
     </div>
@@ -524,7 +522,7 @@
 </mat-menu>
 
 <!-- Application User Help Menu -->
-<mat-menu #applicationMenu="matMenu" [overlapTrigger]="false" class="t-user-menu" xPosition="before">
+<mat-menu #applicationMenu="matMenu" [overlapTrigger]="false">
   <button mat-menu-item (click)="help()" tabindex="0">
     <mat-icon matListIcon>
       <fa-icon icon="question-circle" size="sm"></fa-icon>

src/app/core/shell/toolbar/toolbar.component.scss

@@ -390,103 +390,6 @@ $icon-hover-border: rgb(255 255 255 / 28%);
     max-height: 80vh;
     overflow-y: auto;
   }
-
-  // Compact card per AI module
-  .ai-card.mat-mdc-menu-item {
-    display: flex !important;
-    align-items: flex-start !important;
-    gap: 10px !important;
-    padding: 10px !important;
-    min-height: 52px !important;
-    height: auto !important;
-    border-radius: 9px !important;
-    font-family: inherit !important;
-    line-height: 1.3 !important;
-    white-space: normal !important;
-    overflow: visible !important;
-    transition: background 0.16s ease !important;
-
-    .mat-mdc-menu-item-text,
-    .mdc-list-item__primary-text,
-    .mdc-list-item__content {
-      display: flex !important;
-      align-items: flex-start !important;
-      gap: 10px !important;
-      width: 100% !important;
-      white-space: normal !important;
-      overflow: visible !important;
-    }
-
-    .ai-card-ic {
-      width: 32px !important;
-      height: 32px !important;
-      min-width: 32px !important;
-      display: inline-flex !important;
-      align-items: center !important;
-      justify-content: center !important;
-      border-radius: 8px !important;
-      font-size: 13px !important;
-      flex-shrink: 0 !important;
-      background: var(--c-bg) !important;
-      color: var(--c-color) !important;
-      margin: 0 !important;
-      opacity: 1 !important;
-      transition:
-        background 0.16s ease,
-        color 0.16s ease,
-        transform 0.16s ease !important;
-
-      fa-icon {
-        font-size: 13px !important;
-        width: auto !important;
-        min-width: auto !important;
-        margin: 0 !important;
-        color: inherit !important;
-        opacity: 1 !important;
-      }
-    }
-
-    .ai-card-body {
-      display: flex !important;
-      flex-direction: column !important;
-      flex: 1 !important;
-      min-width: 0 !important;
-      text-align: left !important;
-      white-space: normal !important;
-    }
-
-    .ai-card-t {
-      font-size: 12.5px !important;
-      font-weight: 600 !important;
-      color: #0f172a !important;
-      line-height: 1.25 !important;
-      white-space: normal !important;
-      display: block !important;
-    }
-
-    .ai-card-d {
-      font-size: 10.5px !important;
-      color: #64748b !important;
-      margin-top: 3px !important;
-      line-height: 1.35 !important;
-      white-space: normal !important;
-      display: block !important;
-    }
-
-    &:hover {
-      background: var(--c-bg) !important;
-
-      .ai-card-ic {
-        background: var(--c-hover) !important;
-        color: #fff !important;
-        transform: scale(1.06) !important;
-      }
-
-      .ai-card-t {
-        color: var(--c-color) !important;
-      }
-    }
-  }
 }
 
 .ai-menu-header {
@@ -585,101 +488,70 @@ $icon-hover-border: rgb(255 255 255 / 28%);
   font-size: 11px;
 }
 
-// ===== User Account Dropdown Menu =====
-::ng-deep .t-user-menu.mat-mdc-menu-panel {
-  min-width: 190px !important;
-  border-radius: 10px !important;
-  box-shadow:
-    0 10px 25px rgb(15 23 42 / 12%),
-    0 2px 6px rgb(15 23 42 / 6%) !important;
-  border: 1px solid #e2e8f0 !important;
-  padding: 6px 0 !important;
-  background: #fff !important;
+// Compact card per AI module
+.ai-card.mat-mdc-menu-item {
+  display: flex !important;
+  align-items: flex-start;
+  gap: 10px;
+  padding: 9px 10px;
+  min-height: 0;
+  height: auto;
+  border-radius: 9px;
+  font-family: inherit;
+  line-height: 1.3;
+  white-space: normal;
+  transition: background 0.16s ease;
 
-  .mat-mdc-menu-content {
-    padding: 4px 0 !important;
+  .ai-card-ic {
+    width: 32px;
+    height: 32px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 8px;
+    font-size: 13px;
+    flex-shrink: 0;
+    background: var(--c-bg);
+    color: var(--c-color);
+    transition:
+      background 0.16s ease,
+      color 0.16s ease,
+      transform 0.16s ease;
   }
 
-  .mat-mdc-menu-item {
-    height: 38px !important;
-    min-height: 38px !important;
-    line-height: 38px !important;
-    padding: 0 14px !important;
-    display: flex !important;
-    align-items: center !important;
-    font-size: 13px !important;
-    font-weight: 500 !important;
-    color: #334155 !important;
-    transition:
-      background-color 0.15s ease,
-      color 0.15s ease !important;
+  .ai-card-body {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    min-width: 0;
+    text-align: left;
+  }
 
-    .mat-mdc-menu-item-text {
-      display: inline-flex !important;
-      align-items: center !important;
-      width: 100% !important;
-      font-size: 13px !important;
-      color: inherit !important;
-      font-weight: 500 !important;
+  .ai-card-t {
+    font-size: 12.5px;
+    font-weight: 600;
+    color: #0f172a;
+    line-height: 1.25;
+  }
+
+  .ai-card-d {
+    font-size: 10.5px;
+    color: #64748b;
+    margin-top: 2px;
+    line-height: 1.35;
+  }
+
+  &:hover {
+    background: var(--c-bg);
+
+    .ai-card-ic {
+      background: var(--c-hover);
+      color: #fff;
+      transform: scale(1.06);
     }
 
-    mat-icon {
-      margin-right: 10px !important;
-      width: 18px !important;
-      height: 18px !important;
-      min-width: 18px !important;
-      display: inline-flex !important;
-      align-items: center !important;
-      justify-content: center !important;
-      color: #64748b !important;
-      font-size: 14px !important;
-      flex-shrink: 0 !important;
-
-      fa-icon {
-        font-size: 14px !important;
-        width: 14px !important;
-        min-width: 14px !important;
-        text-align: center !important;
-        margin-right: 0 !important;
-        color: inherit !important;
-        opacity: 1 !important;
-      }
-    }
-
-    span {
-      font-size: 13px !important;
-      color: inherit !important;
-      font-weight: 500 !important;
-      white-space: nowrap !important;
-    }
-
-    &:hover {
-      background-color: #f1f5f9 !important;
-      color: #0d47a1 !important;
-
-      mat-icon {
-        color: #0d47a1 !important;
-      }
-    }
-
-    &#logout {
-      color: #dc2626 !important;
-      border-top: 1px solid #f1f5f9 !important;
-      margin-top: 4px !important;
-      padding-top: 2px !important;
-
-      mat-icon {
-        color: #dc2626 !important;
-      }
-
-      &:hover {
-        background-color: #fef2f2 !important;
-        color: #b91c1c !important;
-
-        mat-icon {
-          color: #b91c1c !important;
-        }
-      }
+    .ai-card-t {
+      color: var(--c-color);
     }
   }
 }

src/app/core/shell/toolbar/toolbar.component.ts

@@ -49,7 +49,6 @@ import { MatIcon } from '@angular/material/icon';
 import { NotificationsTrayComponent as NotificationsTrayComponent_1 } from '../../../shared/notifications-tray/notifications-tray.component';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { DocumentationLinksService } from 'app/shared/services/documentation-links.service';
-import { businessToday } from 'app/core/utils/business-today';
 
 /**
  * Toolbar component.
@@ -93,14 +92,6 @@ export class ToolbarComponent implements OnInit, AfterViewInit, AfterContentChec
   @ViewChild('templateAppMenu') templateAppMenu: TemplateRef<any>;
   @ViewChild('notificationsTray') notificationsTray: NotificationsTrayComponent;
 
-  /** The signed-in user's office — this chip read "HO" for every login, branch staff included. */
-  get officeLabel(): string {
-    if (this.authenticationService.isHeadOfficeUser()) {
-      return 'HO';
-    }
-    return this.authenticationService.getCredentials()?.officeName || '—';
-  }
-
   /** Subscription to breakpoint observer for handset. */
   isHandset$: Observable<boolean> = this.breakpointObserver
     .observe(Breakpoints.Handset)
@@ -109,10 +100,8 @@ export class ToolbarComponent implements OnInit, AfterViewInit, AfterContentChec
   /** Sets the initial state of sidenav as collapsed. Not collapsed if false. */
   sidenavCollapsed = true;
 
-  /** The bank's "today" for the top bar — the business date when enabled, else the server date. */
-  get today(): Date {
-    return businessToday();
-  }
+  /** Current date for top bar display */
+  today = new Date();
 
   /** Last login time display */
   lastLoginTime = this.formatLastLogin();

src/app/core/utils/business-today.ts

@@ -1,30 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/**
- * The bank's "today": the business date while `enable-business-date` is on, the server's own date
- * while it is off. The server decides which (GET /branchday/today); the web app stores the answer
- * in `mifosXServerDate` at login and whenever the business date changes. Before that has happened
- * the browser clock is the only date there is, so it is the fallback.
- */
-export function businessToday(): Date {
-  const stored = localStorage.getItem('mifosXServerDate');
-  const match = stored ? /^(\d{4})-(\d{2})-(\d{2})$/.exec(stored) : null;
-  if (!match) {
-    return new Date();
-  }
-  // Built from parts so it is local midnight — new Date('yyyy-MM-dd') would be UTC midnight and
-  // land on the previous day in any timezone behind UTC.
-  return new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3]));
-}
-
-/** {@link businessToday} as yyyy-MM-dd. */
-export function businessTodayIso(): string {
-  const d = businessToday();
-  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`;
-}

src/app/current-accounts/current-account-view/current-account-view.component.html

@@ -8,10 +8,7 @@
 
 <div class="cur-view">
   <!-- ─── Dormancy risk alert (only when subStatus has left Active) ──── -->
-  <!-- Shown only when the account's product has Dormancy Alert = Yes -->
-  @if (currentAccountData?.dormancyAlert) {
-    <mifosx-dormancy-alert-panel [accountData]="currentAccountData"></mifosx-dormancy-alert-panel>
-  }
+  <mifosx-dormancy-alert-panel [accountData]="currentAccountData"></mifosx-dormancy-alert-panel>
 
   <!-- ─── Gradient hero header ─────────────────────────────────────── -->
   <header class="cur-hero">

src/app/current-accounts/current-account-view/general-tab/general-tab.component.html

@@ -59,7 +59,16 @@
                 <span class="nx-mono">[{{ currentAccountData.currency.code }}]</span>
               </span>
             </div>
-            <!-- A current account earns no interest, so no interest rate is shown here; OD interest is under Overdraft. -->
+            <div class="nx-row">
+              <span class="nx-row__label">{{ 'labels.inputs.Nominal Interest Rate' | translate }}</span>
+              <span class="nx-row__value nx-row__value--amount">
+                @if (currentAccountData.nominalAnnualInterestRate) {
+                  {{ currentAccountData.nominalAnnualInterestRate | formatNumber }} %
+                } @else {
+                  0 %
+                }
+              </span>
+            </div>
           } @else {
             <div class="nx-row">
               <span class="nx-row__label">{{ 'labels.inputs.Field Officer' | translate }}</span>
@@ -93,17 +102,17 @@
                 </span>
               </div>
             }
-            @if (currentAccountData.summary.totalWithdrawals) {
+            @if (currentAccountData.summary.totalInterestEarned >= 0) {
               <div class="nx-row">
-                <span class="nx-row__label">{{ 'labels.inputs.Total Withdrawls' | translate }}</span>
-                <span class="nx-row__value nx-row__value--amount nx-row__value--negative">
+                <span class="nx-row__label">{{ 'labels.inputs.Total Interest Earned' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount">
                   {{
-                    currentAccountData.summary.totalWithdrawals | currency: currency.code : 'symbol-narrow' : '1.2-2'
+                    currentAccountData.summary.totalInterestEarned | currency: currency.code : 'symbol-narrow' : '1.2-2'
                   }}
                 </span>
               </div>
             }
-            @if (!currentAccountData.summary.totalDeposits && !currentAccountData.summary.totalWithdrawals) {
+            @if (!currentAccountData.summary.totalDeposits && !(currentAccountData.summary.totalInterestEarned >= 0)) {
               <div class="nx-empty">
                 <fa-icon icon="inbox" class="nx-empty__ico"></fa-icon>
                 <span>No activity yet.</span>
@@ -123,7 +132,16 @@
             <h3 class="nx-card__title">{{ 'labels.heading.Account Summary' | translate }}</h3>
           </header>
           <div class="nx-card__body">
-            <!-- A current account earns no interest: no interest earned/posted rows. OD interest has its own card. -->
+            @if (currentAccountData.summary.totalWithdrawals) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Total Withdrawls' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount nx-row__value--negative">
+                  {{
+                    currentAccountData.summary.totalWithdrawals | currency: currency.code : 'symbol-narrow' : '1.2-2'
+                  }}
+                </span>
+              </div>
+            }
             @if (currentAccountData.summary.totalWithdrawalFees) {
               <div class="nx-row">
                 <span class="nx-row__label">{{ 'labels.inputs.Withdrawals Fees' | translate }}</span>
@@ -142,6 +160,89 @@
                 </span>
               </div>
             }
+            @if (currentAccountData.summary.totalInterestEarned >= 0) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Interest Earned' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount">
+                  {{
+                    currentAccountData.summary.totalInterestEarned | currency: currency.code : 'symbol-narrow' : '1.2-2'
+                  }}
+                </span>
+              </div>
+            }
+            @if (currentAccountData.summary.totalInterestPosted) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Interest Posted' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount">
+                  {{
+                    currentAccountData.summary.totalInterestPosted | currency: currency.code : 'symbol-narrow' : '1.2-2'
+                  }}
+                </span>
+              </div>
+            }
+            @if (currentAccountData.summary.interestNotPosted >= 0) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Interest Earned Not Posted' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount">
+                  {{
+                    currentAccountData.summary.interestNotPosted | currency: currency.code : 'symbol-narrow' : '1.2-2'
+                  }}
+                </span>
+              </div>
+            }
+            @if (currentAccountData.summary.totalOverdraftInterestDerived) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Interest On Overdraft' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount">
+                  {{
+                    currentAccountData.summary.totalOverdraftInterestDerived
+                      | currency: currency.code : 'symbol-narrow' : '1.2-2'
+                  }}
+                </span>
+              </div>
+            }
+            @if (currentAccountData.summary.interestNotPosted < 0) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Overdraft Interest Not Posted' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount">
+                  {{
+                    currentAccountData.summary.interestNotPosted | currency: currency.code : 'symbol-narrow' : '1.2-2'
+                  }}
+                </span>
+              </div>
+            }
+            @if (currentAccountData.nominalAnnualInterestRate) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Nominal Interest Rate' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount">
+                  {{ currentAccountData.nominalAnnualInterestRate | formatNumber }} %
+                </span>
+              </div>
+            }
+            <div class="nx-row">
+              <span class="nx-row__label">{{ 'labels.inputs.Interest Compounding Period' | translate }}</span>
+              <span class="nx-row__value">
+                {{ currentAccountData.interestCompoundingPeriodType.value | translateKey: 'catalogs' }}
+              </span>
+            </div>
+            <div class="nx-row">
+              <span class="nx-row__label">{{ 'labels.inputs.Interest Posting Period' | translate }}</span>
+              <span class="nx-row__value">
+                {{ currentAccountData.interestPostingPeriodType.value | translateKey: 'catalogs' }}
+              </span>
+            </div>
+            <div class="nx-row">
+              <span class="nx-row__label">{{ 'labels.inputs.Interest Calculated Using' | translate }}</span>
+              <span class="nx-row__value">
+                {{ currentAccountData.interestCalculationType.value | translateKey: 'catalogs' }}
+              </span>
+            </div>
+            <div class="nx-row">
+              <span class="nx-row__label">{{ 'labels.inputs.Days in Year' | translate }}</span>
+              <span class="nx-row__value">
+                {{ currentAccountData.interestCalculationDaysInYearType.value | translateKey: 'catalogs' }}
+              </span>
+            </div>
             @if (currentAccountData.withdrawalFee) {
               <div class="nx-row">
                 <span class="nx-row__label">{{ 'labels.inputs.Withdrawal Fee' | translate }}</span>
@@ -188,6 +289,37 @@
                 </span>
               </div>
             }
+            @if (currentAccountData.allowOverdraft) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Overdraft Limit' | translate }}</span>
+                <span class="nx-row__value nx-row__value--amount">
+                  {{ currentAccountData.overdraftLimit | currency: currency.code : 'symbol-narrow' : '1.2-2' }}
+                </span>
+              </div>
+            }
+            @if (currentAccountData.allowOverdraft) {
+              <div class="nx-row">
+                <span class="nx-row__label">
+                  {{ 'labels.inputs.Minimum Overdraft Required for Interest Calculation' | translate }}
+                </span>
+                <span class="nx-row__value">
+                  {{
+                    currentAccountData.minOverdraftForInterestCalculation
+                      | currency: currency.code : 'symbol-narrow' : '1.2-2'
+                  }}
+                </span>
+              </div>
+            }
+            @if (currentAccountData.minBalanceForInterestCalculation) {
+              <div class="nx-row">
+                <span class="nx-row__label">
+                  {{ 'labels.inputs.Min Balance Required for Interest Calculation' | translate }}
+                </span>
+                <span class="nx-row__value">
+                  {{ currentAccountData.minBalanceForInterestCalculation | formatNumber }}
+                </span>
+              </div>
+            }
             @if (currentAccountData.minRequiredBalance) {
               <div class="nx-row">
                 <span class="nx-row__label">{{ 'labels.inputs.Minimum Required Balance' | translate }}</span>
@@ -200,6 +332,14 @@
                 <span class="nx-row__value">{{ currentAccountData.enforceMinRequiredBalance | yesNo }}</span>
               </div>
             }
+            @if (currentAccountData.summary.lastInterestCalculationDate) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Interest Recalculation Date' | translate }}</span>
+                <span class="nx-row__value">
+                  {{ currentAccountData.summary.lastInterestCalculationDate | dateFormat }}
+                </span>
+              </div>
+            }
             @if (currentAccountData.onHoldFunds) {
               <div class="nx-row">
                 <span class="nx-row__label">{{ 'labels.inputs.On Hold Funds' | translate }}</span>
@@ -210,72 +350,14 @@
                 </span>
               </div>
             }
+            @if (currentAccountData.withHoldTax) {
+              <div class="nx-row">
+                <span class="nx-row__label">{{ 'labels.inputs.Withhold Tax Group' | translate }}</span>
+                <span class="nx-row__value">{{ currentAccountData.taxGroup.name }}</span>
+              </div>
+            }
           </div>
         </section>
-
-        <!-- Overdraft: the only interest on a current account is what the customer pays on an OD. -->
-        @if (currentAccountData.allowOverdraft) {
-          <section class="nx-card">
-            <header class="nx-card__head">
-              <fa-icon icon="hand-holding-usd" class="nx-card__ico"></fa-icon>
-              <h3 class="nx-card__title">Overdraft (OD)</h3>
-            </header>
-            <div class="nx-card__body">
-              <div class="nx-row">
-                <span class="nx-row__label">Maximum OD Limit (per product)</span>
-                <span class="nx-row__value nx-row__value--amount">
-                  {{ currentAccountData.overdraftLimit | currency: currency.code : 'symbol-narrow' : '1.2-2' }}
-                </span>
-              </div>
-              @if (currentAccountData.nominalAnnualInterestRateOverdraft) {
-                <div class="nx-row">
-                  <span class="nx-row__label">OD Interest Rate</span>
-                  <span class="nx-row__value">
-                    {{ currentAccountData.nominalAnnualInterestRateOverdraft | formatNumber }} % p.a.
-                  </span>
-                </div>
-              }
-              @if (currentAccountData.minOverdraftForInterestCalculation) {
-                <div class="nx-row">
-                  <span class="nx-row__label">Minimum OD for Interest</span>
-                  <span class="nx-row__value">
-                    {{
-                      currentAccountData.minOverdraftForInterestCalculation
-                        | currency: currency.code : 'symbol-narrow' : '1.2-2'
-                    }}
-                  </span>
-                </div>
-              }
-              <div class="nx-row">
-                <span class="nx-row__label">OD Interest Posting</span>
-                <span class="nx-row__value">
-                  {{ currentAccountData.interestPostingPeriodType?.value | translateKey: 'catalogs' }}
-                </span>
-              </div>
-              <div class="nx-row">
-                <span class="nx-row__label">{{ 'labels.inputs.Days in Year' | translate }}</span>
-                <span class="nx-row__value">
-                  {{ currentAccountData.interestCalculationDaysInYearType?.value | translateKey: 'catalogs' }}
-                </span>
-              </div>
-              @if (currentAccountData.validForPeriod) {
-                <div class="nx-row">
-                  <span class="nx-row__label">Sanction Validity</span>
-                  <span class="nx-row__value">{{ currentAccountData.validForPeriod }}</span>
-                </div>
-              }
-              <div class="nx-row">
-                <span class="nx-row__label">OD Interest Charged</span>
-                <span class="nx-row__value nx-row__value--amount">
-                  {{
-                    currentAccountData.summary.totalOverdraftInterestDerived || 0
-                      | currency: currency.code : 'symbol-narrow' : '1.2-2'
-                  }}
-                </span>
-              </div>
-            </div>
-          </section>
-        }
       } @else {
         <section class="nx-card">
           <header class="nx-card__head">

src/app/current-accounts/current-account-view/passbook-tab/passbook-tab.component.html

@@ -54,8 +54,8 @@
           <mat-icon>account_balance</mat-icon>
         </div>
         <div class="bank-name-block">
-          <div class="bank-title">{{ bankName }}</div>
-          <div class="bank-subtitle">{{ bankSubtitle }}</div>
+          <div class="bank-title">LincPay Co-operative Bank Ltd.</div>
+          <div class="bank-subtitle">Current Account Statement</div>
         </div>
       </div>
       <div class="statement-label">
@@ -64,25 +64,6 @@
       </div>
     </div>
 
-    <!-- Branch line — IFSC/MICR are how a UCB customer identifies which branch issued this, and are
-         needed for NEFT/RTGS/cheque printing, so a real passbook always carries them. -->
-    @if (branchName || ifscCode || micrCode) {
-      <div class="branch-line">
-        @if (branchName) {
-          <span>{{ branchName }} Branch</span>
-        }
-        @if (branchAddress) {
-          <span>{{ branchAddress }}</span>
-        }
-        @if (ifscCode) {
-          <span>IFSC: {{ ifscCode }}</span>
-        }
-        @if (micrCode) {
-          <span>MICR: {{ micrCode }}</span>
-        }
-      </div>
-    }
-
     <!-- Account Details -->
     <div class="account-details-band">
       <div class="account-details-grid">

src/app/current-accounts/current-account-view/passbook-tab/passbook-tab.component.scss

@@ -127,18 +127,6 @@ $header-text: #fff;
   }
 }
 
-// ─── Branch Identification Line ──────────────────────────────────────────────
-.branch-line {
-  background: #e8edf5;
-  border-bottom: 1px solid $border-color;
-  padding: 6px 24px;
-  display: flex;
-  flex-wrap: wrap;
-  gap: 4px 18px;
-  font-size: 11px;
-  color: #4a5a7a;
-}
-
 // ─── Account Details Band ────────────────────────────────────────────────────
 .account-details-band {
   background: #f0f3f9;

src/app/current-accounts/current-account-view/passbook-tab/passbook-tab.component.ts

@@ -11,12 +11,11 @@ import { Component, OnInit, OnDestroy, inject, ElementRef, ViewChild } from '@an
 import { ActivatedRoute } from '@angular/router';
 import { UntypedFormBuilder } from '@angular/forms';
 import { CurrencyPipe } from '@angular/common';
-import { Subject, takeUntil, catchError, forkJoin, of } from 'rxjs';
+import { Subject, takeUntil } from 'rxjs';
 
 /** Custom Services */
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
-import { OrganizationService } from '../../../organization/organization.service';
 import { Currency } from 'app/shared/models/general.model';
 import {
   CurrentAccountTransaction,
@@ -45,7 +44,6 @@ export class PassbookTabComponent implements OnInit, OnDestroy {
   private formBuilder = inject(UntypedFormBuilder);
   private settingsService = inject(SettingsService);
   private dateUtils = inject(Dates);
-  private organizationService = inject(OrganizationService);
 
   private destroy$ = new Subject<void>();
 
@@ -62,17 +60,6 @@ export class PassbookTabComponent implements OnInit, OnDestroy {
   availableBalance: number = 0;
   activatedOnDate: any = null;
 
-  /** Bank/branch letterhead — real values from Institution Profile + Branch Profile (Organization
-   *  module) rather than a hardcoded name, so a printed passbook actually identifies which bank and
-   *  branch issued it, the way a real UCB's core banking system does. Falls back to a generic label
-   *  if the profile was never filled in, rather than showing a fabricated bank name. */
-  bankName = 'Bank';
-  bankSubtitle = 'Current Account Statement';
-  branchName = '';
-  branchAddress = '';
-  ifscCode = '';
-  micrCode = '';
-
   /** Transactions */
   allTransactions: CurrentAccountTransaction[] = [];
   filteredTransactions: CurrentAccountTransaction[] = [];
@@ -105,33 +92,6 @@ export class PassbookTabComponent implements OnInit, OnDestroy {
       fromDate: [''],
       toDate: ['']
     });
-
-    this.loadLetterhead();
-  }
-
-  /** Institution Profile is the bank's own single record; Branch Profile is per-office. There is no
-   *  office id on the current account data reaching this tab, and this deployment runs a single
-   *  branch, so the first branch profile on record is the correct one here — a genuinely
-   *  multi-branch deployment would need the account's own office id threaded through instead. */
-  private loadLetterhead(): void {
-    forkJoin({
-      institution: this.organizationService.getInstitutionProfile().pipe(catchError(() => of(null))),
-      branches: this.organizationService.getBranchProfiles().pipe(catchError(() => of([])))
-    }).subscribe(({ institution, branches }: any) => {
-      if (institution) {
-        this.bankName = institution.passbookHeaderName || institution.bankName || institution.legalName || 'Bank';
-        this.bankSubtitle = institution.licenseNumber
-          ? `Lic. No. ${institution.licenseNumber}`
-          : 'Current Account Statement';
-      }
-      const branch = Array.isArray(branches) ? branches[0] : null;
-      if (branch) {
-        this.branchName = branch.officeName || '';
-        this.branchAddress = branch.address || '';
-        this.ifscCode = branch.ifscCode || '';
-        this.micrCode = branch.micrCode || '';
-      }
-    });
   }
 
   private computeRunningBalances(transactions: CurrentAccountTransaction[]): CurrentAccountTransaction[] {
@@ -319,18 +279,6 @@ export class PassbookTabComponent implements OnInit, OnDestroy {
       margin-top: 3px;
     }
 
-    /* Branch identification line */
-    .branch-line {
-      background: #e8edf5;
-      border-bottom: 1px solid #d0d7e3;
-      padding: 5px 20px;
-      display: flex;
-      flex-wrap: wrap;
-      gap: 4px 16px;
-      font-size: 9.5px;
-      color: #4a5a7a;
-    }
-
     /* Account details band */
     .account-details-band {
       background: #f0f3f9;

src/app/current-accounts/current-account-view/transactions-tab/transactions-tab.component.html

@@ -135,6 +135,18 @@
               <mat-icon><fa-icon icon="eye" size="sm"></fa-icon></mat-icon>
               <span>{{ 'labels.text.View Transaction' | translate }}</span>
             </button>
+            @if (!transaction.reversed) {
+              <span>
+                <button
+                  mat-menu-item
+                  *mifosxHasPermission="'ADJUSTTRANSACTION_CURRENTACCOUNT'"
+                  (click)="undoTransaction(transaction, $event)"
+                >
+                  <mat-icon><fa-icon icon="undo" size="sm"></fa-icon></mat-icon>
+                  <span>{{ 'tooltips.Undo Transaction' | translate }}</span>
+                </button>
+              </span>
+            }
             <button
               mat-menu-item
               class="account-action-button"

src/app/current-accounts/current-account-view/transactions/view-transaction/current-accounts-transaction-general-tab/current-accounts-transaction-general-tab.component.html

@@ -40,6 +40,18 @@
       </button>
     </span>
   }
+  @if (allowUndo()) {
+    <span>
+      <button
+        mat-raised-button
+        color="warn"
+        *mifosxHasPermission="'UNDOTRANSACTION_CURRENTACCOUNT'"
+        (click)="undoTransaction()"
+      >
+        <fa-icon icon="undo" class="m-r-10"></fa-icon>{{ 'labels.buttons.Undo' | translate }}
+      </button>
+    </span>
+  }
 </div>
 
 <div class="container">

src/app/deposits/daily-transaction-entry/day-collection-dialog/day-collection-dialog.component.html

@@ -45,7 +45,9 @@
   @if (amount > 0) {
     <div class="dcd-amount">
       <span class="dcd-amount__figure">{{ amount | number: '1.2-2' }}</span>
-      <span class="dcd-amount__basis"> {{ days }} × {{ party?.dailyDepositAmount | number: '1.2-2' }} daily </span>
+      <span class="dcd-amount__basis">
+        {{ days }} × {{ party?.dailyDepositAmount | number: '1.2-2' }} daily
+      </span>
     </div>
   }
 </mat-dialog-content>

src/app/deposits/daily-transaction-entry/day-collection-dialog/day-collection-dialog.component.ts

@@ -84,7 +84,9 @@ export class DayCollectionDialogComponent {
     if (!this.party || daily <= 0) {
       return [];
     }
-    const limit = this.isAdvance ? 5 : Math.floor(Number(this.party.recoverableAmount || 0) / daily);
+    const limit = this.isAdvance
+      ? 5
+      : Math.floor(Number(this.party.recoverableAmount || 0) / daily);
     return Array.from({ length: Math.max(0, limit) }, (_, index) => index + 1);
   }
 

src/app/deposits/daily-transaction-entry/notice-dialog/notice-dialog.component.scss

@@ -37,7 +37,7 @@
 
 .nd-message {
   margin: 0;
-  max-width: 44ch; /* stylelint-disable-line unit-allowed-list */
+  max-width: 44ch;
   font-size: 0.9rem;
   line-height: 1.55;
   color: rgb(0 0 0 / 70%);

src/app/deposits/dds-reports/report-viewer/report-viewer.component.html

@@ -21,43 +21,43 @@
       @if (!hasNoFilters) {
         <div class="rv-grid">
           @if (usesDate) {
-            <mat-form-field appearance="outline" class="rv-field">
-              <mat-label>{{ dateLabel }} — from</mat-label>
-              <input matInput required [matDatepicker]="fromPicker" formControlName="fromDate" />
-              <mat-datepicker-toggle matIconSuffix [for]="fromPicker"></mat-datepicker-toggle>
-              <mat-datepicker #fromPicker></mat-datepicker>
-            </mat-form-field>
+          <mat-form-field appearance="outline" class="rv-field">
+            <mat-label>{{ dateLabel }} — from</mat-label>
+            <input matInput required [matDatepicker]="fromPicker" formControlName="fromDate" />
+            <mat-datepicker-toggle matIconSuffix [for]="fromPicker"></mat-datepicker-toggle>
+            <mat-datepicker #fromPicker></mat-datepicker>
+          </mat-form-field>
 
-            <mat-form-field appearance="outline" class="rv-field">
-              <mat-label>{{ dateLabel }} — to</mat-label>
-              <input matInput required [matDatepicker]="toPicker" formControlName="toDate" />
-              <mat-datepicker-toggle matIconSuffix [for]="toPicker"></mat-datepicker-toggle>
-              <mat-datepicker #toPicker></mat-datepicker>
-            </mat-form-field>
-          }
+          <mat-form-field appearance="outline" class="rv-field">
+            <mat-label>{{ dateLabel }} — to</mat-label>
+            <input matInput required [matDatepicker]="toPicker" formControlName="toDate" />
+            <mat-datepicker-toggle matIconSuffix [for]="toPicker"></mat-datepicker-toggle>
+            <mat-datepicker #toPicker></mat-datepicker>
+          </mat-form-field>
+        }
 
-          @if (usesAgent) {
-            <mat-form-field appearance="outline" class="rv-field">
-              <mat-label>Agent From</mat-label>
-              <input matInput type="number" formControlName="agentFrom" />
-            </mat-form-field>
+        @if (usesAgent) {
+          <mat-form-field appearance="outline" class="rv-field">
+            <mat-label>Agent From</mat-label>
+            <input matInput type="number" formControlName="agentFrom" />
+          </mat-form-field>
 
-            <mat-form-field appearance="outline" class="rv-field">
-              <mat-label>Agent To</mat-label>
-              <input matInput type="number" formControlName="agentTo" />
-            </mat-form-field>
-          }
+          <mat-form-field appearance="outline" class="rv-field">
+            <mat-label>Agent To</mat-label>
+            <input matInput type="number" formControlName="agentTo" />
+          </mat-form-field>
+        }
 
-          @if (usesParty) {
-            <mat-form-field appearance="outline" class="rv-field">
-              <mat-label>Party From</mat-label>
-              <input matInput type="number" formControlName="partyFrom" />
-            </mat-form-field>
+        @if (usesParty) {
+          <mat-form-field appearance="outline" class="rv-field">
+            <mat-label>Party From</mat-label>
+            <input matInput type="number" formControlName="partyFrom" />
+          </mat-form-field>
 
-            <mat-form-field appearance="outline" class="rv-field">
-              <mat-label>Party To</mat-label>
-              <input matInput type="number" formControlName="partyTo" />
-            </mat-form-field>
+          <mat-form-field appearance="outline" class="rv-field">
+            <mat-label>Party To</mat-label>
+            <input matInput type="number" formControlName="partyTo" />
+          </mat-form-field>
           }
         </div>
       }
@@ -136,7 +136,9 @@
                 </table>
               </div>
 
-              <p class="rv-statement__count">{{ rows.length }} {{ rows.length === 1 ? 'row' : 'rows' }}</p>
+              <p class="rv-statement__count">
+                {{ rows.length }} {{ rows.length === 1 ? 'row' : 'rows' }}
+              </p>
             </div>
           }
         </div>

src/app/deposits/dds-reports/report-viewer/report-viewer.component.ts

@@ -324,18 +324,20 @@ export class ReportViewerComponent implements OnInit {
       params['partyTo'] = raw.partyTo;
     }
 
-    this.organizationService.runDdsReport(reportKey, params).subscribe((result: any) => {
-      this.available = result.available;
-      this.unavailableMessage = result.message || '';
-      this.columns = result.columns || [];
-      this.rows = result.rows || [];
-      // Captured here so the printed heading names the range these rows came from, and does not
-      // silently change if the filter is edited without re-running.
-      this.ranFromDate = raw.fromDate;
-      this.ranToDate = raw.toDate;
-      this.ranOnDate = new Date();
-      this.hasRun = true;
-    });
+    this.organizationService
+      .runDdsReport(reportKey, params)
+      .subscribe((result: any) => {
+        this.available = result.available;
+        this.unavailableMessage = result.message || '';
+        this.columns = result.columns || [];
+        this.rows = result.rows || [];
+        // Captured here so the printed heading names the range these rows came from, and does not
+        // silently change if the filter is edited without re-running.
+        this.ranFromDate = raw.fromDate;
+        this.ranToDate = raw.toDate;
+        this.ranOnDate = new Date();
+        this.hasRun = true;
+      });
   }
 
   exit(): void {

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-interest-rate-chart-step/fixed-deposit-account-interest-rate-chart-step.component.ts

@@ -334,19 +334,14 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
     const frequencyId = this.resolveFrequencyId(this.tenurePeriodUnit);
 
     if (this.principalAmount && this.principalAmount > 0) {
-      // Years and Months convert exactly; a Days tenure is sent as days and never converted.
-      let tenureInMonths: number | undefined;
-      let tenureInDays: number | undefined;
+      // Convert tenure to months for backend API
+      let tenureInMonths = 0;
       if (this.tenurePeriodUnit === 'Years') {
         tenureInMonths = this.tenureValue * 12;
       } else if (this.tenurePeriodUnit === 'Months') {
         tenureInMonths = this.tenureValue;
       } else {
-        // Sent as days, whatever the count. Converting to whole months silently dropped the
-        // remainder — a 200-day deposit quoted as six months lost 20 days of interest, and the
-        // screen still said "200 Days" above the figure. The backend takes days directly and
-        // works the calendar out itself.
-        tenureInDays = enteredDays;
+        tenureInMonths = Math.floor(enteredDays / 30);
       }
 
       // Map compounding period type id → months (0=Daily, 1=Daily, 4=Monthly, 5=Quarterly, 6=SemiAnnual, 7=Annual)
@@ -400,7 +395,6 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
           principalAmount: this.principalAmount,
           annualInterestRate: rate,
           tenureInMonths,
-          tenureInDays,
           interestCompoundingPeriodInMonths: compMonths, // 0 = daily, now supported by backend
           interestPostingPeriodInMonths: postMonths,
           submittedOnDate: submittedOnDateStr,
@@ -423,18 +417,10 @@ export class FixedDepositAccountInterestRateChartStepComponent implements OnChan
                 Math.round(this.principalAmount * Math.pow(1 + r / daysInYearVal, enteredDays) * 100) / 100;
             } else {
               const n = 12 / compMonths;
-              const effectiveMonths = tenureInMonths ?? enteredDays / 30;
+              const totalCompoundings = Math.floor(tenureInMonths / compMonths);
               const rPerCompounding = rate / (n * 100);
-              // Whole compounding periods, then simple interest on the days left over. Flooring the
-              // periods and stopping there dropped the remainder entirely: a 200-day deposit
-              // compounding monthly quoted only six months of interest and lost the other twenty
-              // days, which is the depositor's money.
-              const wholePeriods = Math.floor(effectiveMonths / compMonths);
-              const compounded = this.principalAmount * Math.pow(1 + rPerCompounding, wholePeriods);
-              const leftoverDays = enteredDays - wholePeriods * compMonths * 30;
-              const leftoverInterest =
-                leftoverDays > 0 ? (compounded * rate * leftoverDays) / (100 * daysInYearVal) : 0;
-              result.maturityAmount = Math.round((compounded + leftoverInterest) * 100) / 100;
+              result.maturityAmount =
+                Math.round(this.principalAmount * Math.pow(1 + rPerCompounding, totalCompoundings) * 100) / 100;
             }
             result.interestEarned = Math.round((result.maturityAmount - this.principalAmount) * 100) / 100;
             this.matchResult = { ...result };

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-maturity-terms-step/fixed-deposit-account-maturity-terms-step.component.html

@@ -7,29 +7,17 @@
 -->
 
 <form [formGroup]="closureSettingsForm" class="layout-row-wrap gap-2px responsive-column">
-  <h4 class="mat-h4 flex-98">{{ 'labels.heading.Maturity Instructions' | translate }}</h4>
+  <h4 class="mat-h4 flex-98">{{ 'labels.heading.For Pre-mature closure' | translate }}</h4>
 
   <mat-form-field class="flex-48">
     <mat-label>{{ 'labels.inputs.Maturity Instructions' | translate }}</mat-label>
     <mat-select formControlName="maturityInstructionId">
-      <mat-option [value]="''">-- Not selected (decide later via FD Dashboard) --</mat-option>
       @for (maturityInstruction of maturityInstructionOptions; track maturityInstruction) {
         <mat-option [value]="maturityInstruction.id">
           {{ maturityInstruction.value | translateKey: 'catalogs' }}
         </mat-option>
       }
     </mat-select>
-    @if (closureSettingsForm.value.maturityInstructionId) {
-      <button
-        mat-icon-button
-        matSuffix
-        type="button"
-        title="Clear -- decide later via FD Dashboard"
-        (click)="$event.stopPropagation(); closureSettingsForm.get('maturityInstructionId')?.setValue('')"
-      >
-        <mat-icon>close</mat-icon>
-      </button>
-    }
   </mat-form-field>
 
   @if (closureSettingsForm.contains('transferToSavingsId')) {
@@ -40,8 +28,8 @@
             <mat-icon>savings</mat-icon>
           </div>
           <div>
-            <h3 class="dal-card__title">{{ transferAccountCardTitle }}</h3>
-            <span class="dal-card__sub">{{ transferAccountCardSubtitle }}</span>
+            <h3 class="dal-card__title">{{ 'labels.inputs.Transfer to savings account' | translate }}</h3>
+            <span class="dal-card__sub">Maturity proceeds will be credited to this account</span>
           </div>
         </div>
       </div>
@@ -81,7 +69,7 @@
           </div>
         } @else {
           <mat-form-field appearance="outline" class="flex-98">
-            <mat-label>{{ transferAccountCardTitle }}</mat-label>
+            <mat-label>{{ 'labels.inputs.Transfer to savings account' | translate }}</mat-label>
             <mat-select formControlName="transferToSavingsId" required>
               @for (account of savingsAccountsData; track account) {
                 <mat-option [value]="account.id">
@@ -89,15 +77,13 @@
                 </mat-option>
               }
             </mat-select>
-            <mat-error>{{ transferAccountCardTitle }} is required</mat-error>
+            <mat-error>Transfer to savings account is required</mat-error>
           </mat-form-field>
         }
       </div>
     </div>
   }
 
-  <h4 class="mat-h4 flex-98">{{ 'labels.heading.For Pre-mature closure' | translate }}</h4>
-
   <mat-checkbox class="flex-98 margin-v" labelPosition="before" formControlName="preClosurePenalApplicable">
     {{ 'labels.inputs.Apply Penal Interest (less)' | translate }}
   </mat-checkbox>

src/app/deposits/fixed-deposits/fixed-deposit-account-stepper/fixed-deposit-account-maturity-terms-step/fixed-deposit-account-maturity-terms-step.component.ts

@@ -11,7 +11,6 @@ import { Component, Input, OnChanges, SimpleChanges, inject } from '@angular/cor
 import { UntypedFormGroup, UntypedFormBuilder, UntypedFormControl, Validators } from '@angular/forms';
 import { MatCheckbox } from '@angular/material/checkbox';
 import { MatIcon } from '@angular/material/icon';
-import { MatIconButton } from '@angular/material/button';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 
 /**
@@ -26,8 +25,7 @@ import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
   imports: [
     ...STANDALONE_SHARED_IMPORTS,
     MatCheckbox,
-    MatIcon,
-    MatIconButton
+    MatIcon
   ]
 })
 export class FixedDepositAccountMaturityTermsStepComponent implements OnChanges {
@@ -55,12 +53,9 @@ export class FixedDepositAccountMaturityTermsStepComponent implements OnChanges
       preClosurePenalInterestOnTypeId: ['']
     });
     this.closureSettingsForm.get('maturityInstructionId').valueChanges.subscribe((value: number) => {
-      // 200 = Transfer to Savings -- the whole matured balance goes here. 400 = Reinvest Principal
-      // Only -- the principal rolls into a new FD, but the leftover interest still needs the same
-      // kind of target so it isn't left stranded on the closed account (a real gap the account used
-      // to silently hit before this field also asked for it here). Reinvest Principal + Interest
-      // (300) rolls the whole balance into the same account, so it never needs a target at all.
-      if (value === 200 || value === 400) {
+      // 200 = Transfer to Savings -- Withdraw Deposit (100) needs no target account, and both
+      // Reinvest options (300/400) open a brand-new FD instead, so they ignore this field too.
+      if (value === 200) {
         this.closureSettingsForm.addControl(
           'transferToSavingsId',
           new UntypedFormControl(this.linkedSavingsAccountId ?? '', Validators.required)
@@ -96,48 +91,15 @@ export class FixedDepositAccountMaturityTermsStepComponent implements OnChanges
         });
       }
     }
-    // Editing an existing account: its own already-saved Maturity Instructions choice lives on
-    // `fixedDepositsAccountTemplate` (the real account+template GET, FixedDepositAccountData's
-    // `onAccountClosure`) -- NOT on `fixedDepositsAccountProductTemplate`, which is only the blank
-    // per-product default template refetched from the Product dropdown's own productId (via
-    // getFixedDepositsAccountTemplate(clientId, productId)) and carries no account-specific data at
-    // all. This was never read from the right place before, so Edit always opened onto a blank
-    // picker even for an account that really does have an instruction saved. `.dirty` guards it the
-    // same way the penal-interest fields above do, so a maker's own in-progress edit here is never
-    // silently overwritten if this input fires again mid-edit.
-    if (this.fixedDepositsAccountTemplate && !this.closureSettingsForm.get('maturityInstructionId').dirty) {
-      this.closureSettingsForm
-        .get('maturityInstructionId')
-        ?.setValue(this.fixedDepositsAccountTemplate.onAccountClosure?.id ?? '');
-      const transferControl = this.closureSettingsForm.get('transferToSavingsId');
-      if (transferControl) {
-        transferControl.setValue(
-          this.fixedDepositsAccountTemplate.transferToSavingsId ?? this.linkedSavingsAccountId ?? ''
-        );
-      }
-    }
   }
 
-  /** The linked-savings account for the transfer-to-savings / reinvest-principal-only-interest
-   *  maturity instruction, once picked. */
+  /** The linked-savings account for the transfer-to-savings maturity instruction, once picked. */
   get selectedTransferAccount(): any {
     const id = this.closureSettingsForm.value.transferToSavingsId;
     if (!id) return null;
     return this.savingsAccountsData.find((account: any) => account.id === id) ?? null;
   }
 
-  get transferAccountCardTitle(): string {
-    return this.closureSettingsForm.value.maturityInstructionId === 400
-      ? 'Interest payout account'
-      : 'Transfer to savings account';
-  }
-
-  get transferAccountCardSubtitle(): string {
-    return this.closureSettingsForm.value.maturityInstructionId === 400
-      ? 'The principal renews into a new FD; interest earned is paid out to this account.'
-      : 'Maturity proceeds will be credited to this account.';
-  }
-
   clearTransferAccount(): void {
     this.closureSettingsForm.get('transferToSavingsId')?.setValue('');
   }

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.html

@@ -8,24 +8,11 @@
 
 <div class="pmt">
   <div class="pmt__header">
-    <div class="pmt__header-left">
-      <span class="pmt__header-ico"><fa-icon icon="sync-alt"></fa-icon></span>
-      <div class="pmt__header-text">
-        <h2 class="pmt__title">
-          {{ isDashboardRenewalMode ? 'Renew Fixed Deposit' : ('labels.heading.Payment' | translate) }}
-        </h2>
-        <p class="pmt__subtitle">
-          {{
-            isDashboardRenewalMode
-              ? 'Renew ' + (dashboardRenewalRow?.accountNo ?? 'this matured FD') + '.'
-              : 'Process this matured Fixed Deposit now.'
-          }}
-        </p>
-      </div>
+    <span class="pmt__header-ico"><fa-icon icon="sync-alt"></fa-icon></span>
+    <div class="pmt__header-text">
+      <h2 class="pmt__title">{{ 'labels.heading.Payment' | translate }}</h2>
+      <p class="pmt__subtitle">Process this Fixed Deposit now -- works whether it's Active or Matured.</p>
     </div>
-    <button type="button" class="pmt__header-close" mat-dialog-close [disabled]="submitting" title="Close">
-      <fa-icon icon="times"></fa-icon>
-    </button>
   </div>
 
   <div mat-dialog-content class="pmt__content">
@@ -40,92 +27,37 @@
       </div>
     } @else {
       <form [formGroup]="paymentForm">
-        @if (isMaturedRenewal) {
-          <p class="pmt__hint">
-            <fa-icon icon="info-circle" class="m-r-5"></fa-icon>
-            {{ maturedRenewalTimingText }}
-          </p>
-
-          @if (renewalPreviewLoading) {
-            <p class="pmt__hint">
-              <fa-icon icon="spinner" [class.fa-spin]="true" class="m-r-5"></fa-icon>
-              Calculating gap-period interest...
-            </p>
-          } @else if (renewalPreview && !renewalPreview.withinGrace) {
-            @if (!renewalPreview.linkedAccountId) {
-              <p class="pmt__hint pmt__hint--warn" role="alert">
-                <fa-icon icon="info-circle" class="m-r-5"></fa-icon>
-                This FD has no Deposit Account Link, so there is no account to read a gap-interest rate from. Link a
-                Savings account to it before renewing late.
-              </p>
-            } @else {
-              <div class="pmt__preview">
-                <div class="pmt__preview-row">
-                  <span class="pmt__preview-label">FD Maturity Balance (renews as-is below)</span>
-                  <span class="pmt__preview-value">{{ renewalPreview.currentBalance | formatNumber }}</span>
-                </div>
-                <div class="pmt__preview-row">
-                  <span class="pmt__preview-label">Gap Days ({{ renewalPreview.maturityDate }} &rarr; today)</span>
-                  <span class="pmt__preview-value">{{ renewalPreview.gapDays }}</span>
-                </div>
-                <div class="pmt__preview-row">
-                  <span class="pmt__preview-label">Deposit Account Link</span>
-                  <span class="pmt__preview-value">{{ renewalPreview.linkedAccountNo }}</span>
-                </div>
-                <div class="pmt__preview-row">
-                  <span class="pmt__preview-label">Its Interest Rate</span>
-                  <span class="pmt__preview-value">{{ renewalPreview.linkedAccountRate }}%</span>
-                </div>
-                <div class="pmt__preview-row pmt__preview-row--highlight pmt__preview-row--total">
-                  <span class="pmt__preview-label"
-                    >Gap-Period Interest &rarr; paid to {{ renewalPreview.linkedAccountNo }}</span
-                  >
-                  <span class="pmt__preview-value">+ {{ renewalPreview.gapInterestAmount | formatNumber }}</span>
-                </div>
-              </div>
-              <p class="pmt__hint">
-                <fa-icon icon="info-circle" class="m-r-5"></fa-icon>
-                This gap interest was earned at the linked account's own rate, not the FD's -- it is credited straight
-                to account {{ renewalPreview.linkedAccountNo }} (the FD's Deposit Account Link), separately from
-                whatever you choose below. The FD itself renews from its own maturity balance, unchanged.
-              </p>
-            }
-          }
-        }
-
         @if (reinvestCap !== null && reinvestCap !== undefined) {
           <div class="pmt__stat">
             <span class="pmt__stat-label">
               {{
-                isMaturedRenewal || !remainderIsApproximate
-                  ? ('labels.inputs.Maturity Amount' | translate)
-                  : 'Amount available on the selected date'
+                remainderIsApproximate
+                  ? 'Amount available on the selected date'
+                  : ('labels.inputs.Maturity Amount' | translate)
               }}
             </span>
             <span class="pmt__stat-value">{{ reinvestCap | formatNumber }}</span>
           </div>
         }
 
-        @if (!isMaturedRenewal) {
-          <mat-form-field appearance="outline" class="pmt__date" (click)="closedOnDatePicker.open()">
-            <mat-label>{{ 'labels.inputs.Closed On Date' | translate }}</mat-label>
-            <input
-              matInput
-              [max]="maxDate"
-              [matDatepicker]="closedOnDatePicker"
-              required
-              formControlName="closedOnDate"
-            />
-            <mat-datepicker-toggle matSuffix [for]="closedOnDatePicker"></mat-datepicker-toggle>
-            <mat-datepicker #closedOnDatePicker></mat-datepicker>
-            @if (paymentForm.controls.closedOnDate.hasError('required')) {
-              <mat-error>
-                {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }}
-                <strong>{{ 'labels.commons.required' | translate }}</strong>
-              </mat-error>
-            }
-          </mat-form-field>
-        }
+        <mat-form-field appearance="outline" class="pmt__date" (click)="closedOnDatePicker.open()">
+          <mat-label>{{ 'labels.inputs.Closed On Date' | translate }}</mat-label>
+          <input
+            matInput
+            [max]="maxDate"
+            [matDatepicker]="closedOnDatePicker"
+            required
+            formControlName="closedOnDate"
+          />
+          <mat-datepicker-toggle matSuffix [for]="closedOnDatePicker"></mat-datepicker-toggle>
+          <mat-datepicker #closedOnDatePicker></mat-datepicker>
+          @if (paymentForm.controls.closedOnDate.hasError('required')) {
+            <mat-error>
+              {{ 'labels.inputs.Closed On Date' | translate }} {{ 'labels.commons.is' | translate }}
+              <strong>{{ 'labels.commons.required' | translate }}</strong>
+            </mat-error>
+          }
+        </mat-form-field>
 
         <div class="pmt__section-label" id="pmt-action-label">{{ 'labels.inputs.Action' | translate }}</div>
         <div class="pmt__options" role="radiogroup" aria-labelledby="pmt-action-label">
@@ -230,12 +162,10 @@
           </mat-form-field>
         }
 
-        @if (!isMaturedRenewal) {
-          <mat-form-field appearance="outline">
-            <mat-label>{{ 'labels.inputs.Note' | translate }}</mat-label>
-            <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
-          </mat-form-field>
-        }
+        <mat-form-field appearance="outline">
+          <mat-label>{{ 'labels.inputs.Note' | translate }}</mat-label>
+          <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
+        </mat-form-field>
 
         @if (submitError) {
           <p class="pmt__error" role="alert">
@@ -248,25 +178,14 @@
   </div>
 
   <div mat-dialog-actions align="end" class="pmt__actions">
-    <button mat-button mat-dialog-close [disabled]="submitting" class="pmt__btn-cancel">
-      {{ 'labels.buttons.Cancel' | translate }}
-    </button>
+    <button mat-button mat-dialog-close [disabled]="submitting">{{ 'labels.buttons.Cancel' | translate }}</button>
     <button
       mat-raised-button
       color="primary"
-      class="pmt__btn-submit"
       [disabled]="!paymentForm?.valid || submitting || loadFailed"
       (click)="submit()"
     >
-      {{
-        submitting
-          ? isDashboardRenewalMode
-            ? 'Renewing...'
-            : ('labels.buttons.Processing' | translate)
-          : isDashboardRenewalMode
-            ? 'Confirm & Renew'
-            : ('labels.buttons.Confirm' | translate)
-      }}
+      {{ submitting ? ('labels.buttons.Processing' | translate) : ('labels.buttons.Confirm' | translate) }}
     </button>
   </div>
 </div>

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.scss

@@ -6,466 +6,291 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-/**
- * Payment / Renewal Dialog Styles
- * CBSNexora Core Banking System
- */
+$navy: #0d1b2a;
+$slate: #475569;
+$muted: #64748b;
+$border: #e2e8f0;
+$soft: #f8fafc;
+$blue: #1e40af;
+$blue-soft: #eff6ff;
+$green: #166534;
+$green-soft: #f0fdf4;
 
 .pmt {
   display: flex;
   flex-direction: column;
-  height: 100%;
-  max-height: 92vh;
-  box-sizing: border-box;
-  font-family:
-    'DM Sans',
-    system-ui,
-    -apple-system,
-    sans-serif;
-  color: #0f172a;
-  border-radius: 16px;
+  min-height: 320px;
+  max-height: 85vh;
   overflow: hidden;
-  box-shadow: 0 24px 48px -12px rgb(15 23 42 / 25%);
+  margin: -24px;
 }
 
 .pmt__header {
   display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16px;
-  padding: 26px 30px;
-  background: linear-gradient(135deg, #1e3a8a 0%, #1d4ed8 55%, #2563eb 100%);
+  align-items: flex-start;
+  gap: 14px;
+  padding: 22px 28px 18px;
+  background: linear-gradient(135deg, #1e3a8a 0%, #1e40af 55%, #4338ca 100%);
   color: #fff;
-  flex-shrink: 0;
-  position: relative;
-  overflow: hidden;
+  flex: 0 0 auto;
+}
 
-  &::after {
-    content: '';
-    position: absolute;
-    inset: 0;
-    background: radial-gradient(circle at 88% -20%, rgb(255 255 255 / 22%), transparent 55%);
-    pointer-events: none;
-  }
-
-  &-left {
-    display: flex;
-    align-items: center;
-    gap: 16px;
-    position: relative;
-    z-index: 1;
-  }
-
-  &-ico {
-    width: 48px;
-    height: 48px;
-    border-radius: 14px;
-    background: rgb(255 255 255 / 16%);
-    border: 1px solid rgb(255 255 255 / 25%);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 20px;
-    color: #fff;
-    flex-shrink: 0;
-  }
-
-  &-text {
-    display: flex;
-    flex-direction: column;
-  }
-
-  &-close {
-    position: relative;
-    z-index: 1;
-    background: rgb(255 255 255 / 14%);
-    border: none;
-    color: #fff;
-    width: 34px;
-    height: 34px;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-    transition: all 0.2s ease;
-    flex-shrink: 0;
-
-    &:hover:not(:disabled) {
-      background: rgb(255 255 255 / 28%);
-      transform: rotate(90deg);
-    }
-
-    &:disabled {
-      opacity: 0.5;
-      cursor: not-allowed;
-    }
-  }
+.pmt__header-ico {
+  width: 40px;
+  height: 40px;
+  min-width: 40px;
+  border-radius: 10px;
+  background: rgb(255 255 255 / 15%);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 18px;
 }
 
 .pmt__title {
   margin: 0;
-  font-size: 20px;
-  font-weight: 800;
-  color: #fff;
-  line-height: 1.25;
-  letter-spacing: -0.01em;
+  font-size: 19px;
+  font-weight: 700;
 }
 
 .pmt__subtitle {
-  margin: 5px 0 0;
-  font-size: 13px;
-  color: rgb(255 255 255 / 88%);
+  margin: 4px 0 0;
+  font-size: 12.5px;
+  color: rgb(255 255 255 / 82%);
   line-height: 1.4;
 }
 
 .pmt__content {
-  padding: 26px 30px !important;
+  padding: 22px 28px 8px !important;
   overflow-y: auto;
   flex: 1 1 auto;
-  background: #fbfcfe;
-
-  mat-form-field {
-    width: 100%;
-  }
 }
 
 .pmt__loading {
   display: flex;
   justify-content: center;
   align-items: center;
-  min-height: 240px;
+  min-height: 260px;
 }
 
 .pmt__stat {
   display: flex;
   flex-direction: column;
-  gap: 4px;
-  background: linear-gradient(135deg, #eff6ff 0%, #e0e9ff 100%);
-  border: 1px solid #bfdbfe;
-  border-radius: 14px;
-  padding: 18px 22px;
+  gap: 2px;
+  background: $blue-soft;
+  border: 1px solid #dbeafe;
+  border-radius: 10px;
+  padding: 12px 16px;
   margin-bottom: 18px;
-
-  &-label {
-    font-size: 11.5px;
-    font-weight: 700;
-    text-transform: uppercase;
-    letter-spacing: 0.07em;
-    color: #1d4ed8;
-  }
-
-  &-value {
-    font-family: 'JetBrains Mono', 'DM Sans', monospace;
-    font-size: 28px;
-    font-weight: 800;
-    color: #0f172a;
-    letter-spacing: -0.01em;
-  }
 }
 
-.pmt__preview {
-  display: flex;
-  flex-direction: column;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 14px;
-  padding: 4px 18px;
-  margin: 0 0 18px;
+.pmt__stat-label {
+  font-size: 11px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+  color: $blue;
+}
 
-  &-row {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 12px;
-    padding: 11px 0;
-    border-bottom: 1px solid #f1f5f9;
+.pmt__stat-value {
+  font-size: 22px;
+  font-weight: 800;
+  color: $navy;
+  font-variant-numeric: tabular-nums;
+}
 
-    &:last-child {
-      border-bottom: none;
-    }
-
-    &--highlight {
-      .pmt__preview-value {
-        color: #0d9488;
-        font-weight: 800;
-      }
-    }
-
-    &--total {
-      margin: 0 -18px;
-      padding: 14px 18px;
-      background: linear-gradient(135deg, #eff6ff 0%, #e0e9ff 100%);
-      border-bottom: none;
-      border-radius: 0 0 12px 12px;
-
-      .pmt__preview-label {
-        color: #1d4ed8;
-        font-weight: 700;
-      }
-
-      .pmt__preview-value {
-        color: #0f172a;
-        font-size: 18px;
-        font-weight: 800;
-      }
-    }
-  }
-
-  &-label {
-    font-size: 12.5px;
-    color: #64748b;
-    font-weight: 600;
-  }
-
-  &-value {
-    font-family: 'JetBrains Mono', 'DM Sans', monospace;
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
+.pmt__date {
+  width: 100%;
 }
 
 .pmt__section-label {
-  font-size: 12px;
+  font-size: 11.5px;
   font-weight: 700;
   text-transform: uppercase;
-  letter-spacing: 0.06em;
-  color: #475569;
-  margin: 10px 0 12px;
+  letter-spacing: 0.05em;
+  color: $slate;
+  margin: 4px 0 10px;
 }
 
-/* Action Options Grid - 2 Equal Columns, comfortably wide now that the dialog itself is wider */
 .pmt__options {
   display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 14px;
-  margin-bottom: 18px;
-
-  @media (width <= 560px) {
-    grid-template-columns: 1fr;
-  }
+  grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
+  gap: 10px;
+  margin-bottom: 6px;
 }
 
 .pmt__option {
   display: flex;
   align-items: flex-start;
-  gap: 14px;
+  gap: 10px;
   text-align: left;
   background: #fff;
-  border: 1.5px solid #e2e8f0;
-  border-radius: 14px;
-  padding: 16px;
+  border: 1.5px solid $border;
+  border-radius: 10px;
+  padding: 12px 14px;
   cursor: pointer;
   font: inherit;
-  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
-  position: relative;
+  transition:
+    border-color 0.15s,
+    background 0.15s,
+    box-shadow 0.15s;
+}
 
-  &:hover {
-    border-color: #93c5fd;
-    background: #f8fafc;
-    box-shadow: 0 6px 16px rgb(15 23 42 / 6%);
-    transform: translateY(-1px);
-  }
+.pmt__option:hover {
+  border-color: #93c5fd;
+  background: $blue-soft;
+}
 
-  &--active {
-    border-color: #2563eb;
-    background: #eff6ff;
-    box-shadow: 0 0 0 1.5px #2563eb;
+.pmt__option--active {
+  border-color: $blue;
+  background: $blue-soft;
+  box-shadow: 0 0 0 1px $blue;
+}
 
-    .pmt__option-ico {
-      background: #2563eb;
-      color: #fff;
-      border-color: #2563eb;
-    }
-  }
+.pmt__option-ico {
+  width: 30px;
+  height: 30px;
+  min-width: 30px;
+  border-radius: 8px;
+  background: $soft;
+  color: $blue;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 13px;
+}
 
-  &-ico {
-    width: 38px;
-    height: 38px;
-    min-width: 38px;
-    border-radius: 10px;
-    background: #f1f5f9;
-    border: 1px solid #e2e8f0;
-    color: #2563eb;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 15px;
-    flex-shrink: 0;
-    transition: all 0.2s ease;
-  }
+.pmt__option--active .pmt__option-ico {
+  background: $blue;
+  color: #fff;
+}
 
-  // Distinct accent per option while unselected, purely presentational -- helps the four cards read
-  // apart at a glance. Selecting a card always fills its icon blue (see &--active above), matching the
-  // blue selection border/check regardless of which option it is, rather than mixing selection-blue
-  // with the option's own accent.
-  &:not(.pmt__option--active):nth-child(2) .pmt__option-ico {
-    color: #7c3aed;
-  }
+.pmt__option-text {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
 
-  &:not(.pmt__option--active):nth-child(3) .pmt__option-ico {
-    color: #0d9488;
-  }
+.pmt__option-title {
+  font-size: 13px;
+  font-weight: 700;
+  color: $navy;
+}
 
-  &:not(.pmt__option--active):nth-child(4) .pmt__option-ico {
-    color: #d97706;
-  }
+.pmt__option-desc {
+  font-size: 11px;
+  color: $muted;
+  line-height: 1.35;
+}
 
-  &-text {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    flex: 1;
-  }
+.pmt__option:focus-visible {
+  outline: 2px solid $blue;
+  outline-offset: 2px;
+}
 
-  &-title {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-    line-height: 1.3;
-  }
-
-  &-desc {
-    font-size: 12px;
-    color: #64748b;
-    line-height: 1.4;
-  }
-
-  &-check {
-    color: #2563eb;
-    font-size: 17px;
-    position: absolute;
-    top: 14px;
-    right: 14px;
-  }
+.pmt__option-check {
+  margin-left: auto;
+  color: $blue;
+  font-size: 13px;
 }
 
 .pmt__option-error {
   color: #b91c1c;
   font-size: 12px;
-  font-weight: 600;
-  margin: -10px 0 14px;
-}
-
-.pmt__split {
-  display: flex;
-  align-items: center;
-  gap: 16px;
-  background: #f8fafc;
-  border: 1px dashed #cbd5e1;
-  border-radius: 14px;
-  padding: 18px;
-  margin: 10px 0 18px;
-  flex-wrap: wrap;
-
-  &-input {
-    flex: 1 1 220px;
-  }
-
-  &-arrow {
-    color: #94a3b8;
-    font-size: 17px;
-  }
-
-  &-remainder {
-    display: flex;
-    flex-direction: column;
-    gap: 3px;
-    background: #f0fdf4;
-    border: 1px solid #bbf7d0;
-    border-radius: 10px;
-    padding: 12px 16px;
-    flex: 1 1 220px;
-
-    &-label {
-      font-size: 11px;
-      font-weight: 700;
-      text-transform: uppercase;
-      letter-spacing: 0.04em;
-      color: #166534;
-    }
-
-    &-value {
-      font-family: 'JetBrains Mono', 'DM Sans', monospace;
-      font-size: 19px;
-      font-weight: 800;
-      color: #166534;
-    }
-  }
-}
-
-.pmt__hint {
-  display: flex;
-  align-items: flex-start;
-  gap: 10px;
-  background: #f0f9ff;
-  border: 1px solid #bae6fd;
-  border-left: 4px solid #0284c7;
-  border-radius: 10px;
-  color: #0369a1;
-  font-size: 13px;
-  line-height: 1.5;
-  padding: 12px 16px;
-  margin: 0 0 18px;
-
-  &--warn {
-    background: #fffbeb;
-    border-color: #fde68a;
-    border-left-color: #d97706;
-    color: #b45309;
-  }
+  margin: 4px 0 14px;
 }
 
 .pmt__error {
   display: flex;
   align-items: flex-start;
-  gap: 10px;
+  gap: 4px;
   background: #fef2f2;
   border: 1px solid #fecaca;
-  border-left: 4px solid #ef4444;
-  border-radius: 10px;
+  border-radius: 8px;
   color: #b91c1c;
-  font-size: 13px;
-  padding: 12px 16px;
-  margin: 10px 0;
+  font-size: 12.5px;
+  line-height: 1.45;
+  padding: 10px 14px;
+  margin: 4px 0 8px;
+}
+
+.pmt__hint {
+  display: flex;
+  align-items: flex-start;
+  gap: 4px;
+  background: $soft;
+  border: 1px solid $border;
+  border-radius: 8px;
+  color: $slate;
+  font-size: 12px;
+  line-height: 1.45;
+  padding: 9px 13px;
+  margin: 0 0 10px;
+}
+
+.pmt__hint--warn {
+  background: #fffbeb;
+  border-color: #fde68a;
+  color: #92400e;
+}
+
+.pmt__split {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  background: $soft;
+  border: 1px dashed #cbd5e1;
+  border-radius: 10px;
+  padding: 14px 16px 0;
+  margin: 4px 0 8px;
+  flex-wrap: wrap;
+}
+
+.pmt__split-input {
+  flex: 1 1 180px;
+  min-width: 160px;
+}
+
+.pmt__split-arrow {
+  color: $muted;
+  font-size: 14px;
+  margin-bottom: 20px;
+}
+
+.pmt__split-remainder {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  background: $green-soft;
+  border: 1px solid #bbf7d0;
+  border-radius: 8px;
+  padding: 8px 14px;
+  margin-bottom: 14px;
+  flex: 1 1 180px;
+  min-width: 160px;
+}
+
+.pmt__split-remainder-label {
+  font-size: 10.5px;
+  font-weight: 700;
+  text-transform: uppercase;
+  letter-spacing: 0.04em;
+  color: $green;
+}
+
+.pmt__split-remainder-value {
+  font-size: 16px;
+  font-weight: 800;
+  color: $green;
+  font-variant-numeric: tabular-nums;
+}
+
+.pmt__content mat-form-field {
+  width: 100%;
 }
 
 .pmt__actions {
-  padding: 18px 30px !important;
-  border-top: 1px solid #e2e8f0;
-  background: #fff;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  gap: 14px;
-  flex-shrink: 0;
-
-  .pmt__btn-cancel {
-    border-radius: 10px;
-    font-weight: 600;
-    color: #475569;
-  }
-
-  .pmt__btn-submit {
-    border-radius: 10px;
-    font-weight: 700;
-    padding: 0 26px;
-    height: 42px;
-    background: linear-gradient(135deg, #1d4ed8 0%, #2563eb 100%);
-    color: #fff;
-    box-shadow: 0 8px 20px rgb(37 99 235 / 30%);
-    transition: all 0.2s ease;
-
-    &:hover:not(:disabled) {
-      box-shadow: 0 10px 24px rgb(37 99 235 / 40%);
-      transform: translateY(-1px);
-    }
-
-    &:disabled {
-      background: #cbd5e1;
-      box-shadow: none;
-      color: #64748b;
-    }
-  }
+  padding: 14px 28px 20px !important;
+  border-top: 1px solid $border;
+  flex: 0 0 auto;
 }

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/payment-dialog/payment-dialog.component.ts

@@ -24,26 +24,15 @@ import { UntypedFormBuilder, UntypedFormGroup, UntypedFormControl, ValidatorFn,
 /** Custom Services */
 import { FixedDepositsService } from '../../../fixed-deposits.service';
 import { SettingsService } from 'app/settings/settings.service';
-import { AlertService } from 'app/core/alert/alert.service';
 import { Dates } from 'app/core/utils/dates';
 import { FormatNumberPipe } from '../../../../../pipes/format-number.pipe';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-import { FdMaturityRow } from 'app/fd-dashboard/fd-dashboard.compute';
 
 /**
  * "Payment" dialog -- an always-available alternative to Premature Close (Active-only, no reinvest) and
  * Close (Matured-only, no partial option). Works on an FD in either state and offers a fourth choice,
  * Partial Reinvest, alongside the ones the backend's `DepositAccountOnClosureType` already had: the
  * entered amount renews on this same account, the rest transfers to a savings account picked here.
- *
- * Doubles as the FD Dashboard's Renew action when opened with `data.dashboardRenewal` set: same form,
- * same full set of closure types (nothing removed -- Transfer to Savings and Partial Reinvest work from
- * the Dashboard too, not just the two Reinvest options). The only two differences in that mode: the
- * Closed On Date is computed from the FD's grace window instead of picked freely (backdated to the
- * original maturity date within grace, today once it's passed -- the picker is hidden, not just
- * defaulted, so it can't accidentally be moved off that date), and submit() first calls
- * `creditGapInterestIfPastGrace` when past grace, crediting the gap-period interest (at the linked
- * account's rate) onto the FD before the normal `payment` command runs and reads its balance.
  */
 @Component({
   selector: 'mifosx-payment-dialog',
@@ -87,18 +76,11 @@ export class PaymentDialogComponent implements OnInit {
   };
 
   dialogRef = inject<MatDialogRef<PaymentDialogComponent>>(MatDialogRef);
-  data: {
-    accountId: number | string;
-    accountBalance?: number;
-    maturityDate?: any;
-    /** Present only when opened from the FD Dashboard's Renew action. */
-    dashboardRenewal?: { row: FdMaturityRow };
-  } = inject(MAT_DIALOG_DATA);
+  data: { accountId: number | string; accountBalance?: number; maturityDate?: any } = inject(MAT_DIALOG_DATA);
   private formBuilder = inject(UntypedFormBuilder);
   private fixedDepositsService = inject(FixedDepositsService);
   private settingsService = inject(SettingsService);
   private dateUtils = inject(Dates);
-  private alertService = inject(AlertService);
 
   paymentForm: UntypedFormGroup;
   /** Loaded once, on open, from the same closure template the existing Close action already uses. */
@@ -111,16 +93,6 @@ export class PaymentDialogComponent implements OnInit {
   submitError: string = null;
   maxDate: Date;
 
-  /** Whether gap-interest still needs crediting before this submits -- only ever true once, right
-   *  after open; cleared as soon as `submit()` has credited it, so a retried submit doesn't double-post. */
-  private gapInterestPending = false;
-
-  /** Read-only numbers (current balance, linked account's rate, gap days, gap-interest amount,
-   *  projected new balance) fetched once on open in dashboard-renewal mode, shown above the Action
-   *  cards so staff see exactly what a late renewal is about to credit before confirming anything. */
-  renewalPreview: any = null;
-  renewalPreviewLoading = false;
-
   ngOnInit(): void {
     this.maxDate = this.settingsService.businessDate;
     this.paymentForm = this.formBuilder.group({
@@ -134,34 +106,6 @@ export class PaymentDialogComponent implements OnInit {
       ],
       note: ['']
     });
-
-    // Fetched every time this dialog opens, not just from the FD Dashboard -- Payment is now only ever
-    // offered once an FD has Matured (see FixedDepositsButtonsConfiguration), so a plain Payment on it
-    // is exactly the same "late renewal" scenario the Dashboard's Renew action handles, and needs the
-    // exact same date-locking/gap-interest treatment, or an FD closed this way instead of from the
-    // Dashboard would silently skip crediting interest it genuinely earned.
-    this.renewalPreviewLoading = true;
-    this.fixedDepositsService.getFdRenewalPreview(this.data.accountId).subscribe({
-      next: (preview: any) => {
-        this.renewalPreview = preview;
-        this.renewalPreviewLoading = false;
-        if (preview?.isMatured) {
-          // Computed from the grace window, never picked -- the date field stays in the form (the
-          // generic submit path and reinvestCap/processingOnOrAfterMaturity both key off it) but its
-          // picker is hidden once matured (see the template), so it can't be moved off this value.
-          this.paymentForm
-            .get('closedOnDate')
-            .setValue(preview.withinGrace ? new Date(preview.maturityDate) : this.maxDate);
-          this.gapInterestPending = !preview.withinGrace;
-        }
-      },
-      // Non-fatal -- Confirm still works from here (backend re-derives the same numbers on submit),
-      // only the numeric preview and its date-locking are unavailable, not the action itself.
-      error: () => {
-        this.renewalPreviewLoading = false;
-      }
-    });
-
     this.paymentForm.get('onAccountClosureId').valueChanges.subscribe((id: number) => this.onClosureTypeChange(id));
     // The cap depends on whether the chosen date is on or after maturity, so a date change can make an
     // already-entered amount valid or invalid. Without this the amount keeps its verdict from the old date.
@@ -192,31 +136,6 @@ export class PaymentDialogComponent implements OnInit {
     });
   }
 
-  get isDashboardRenewalMode(): boolean {
-    return !!this.data.dashboardRenewal;
-  }
-
-  get dashboardRenewalRow(): FdMaturityRow | null {
-    return this.data.dashboardRenewal?.row ?? null;
-  }
-
-  /** True once the loaded preview confirms this FD has actually Matured -- which, since Payment is
-   *  only ever offered on a Matured account, is every real open of this dialog now, from either entry
-   *  point. Drives the date-locking and gap-interest preview/crediting identically either way. */
-  get isMaturedRenewal(): boolean {
-    return !!this.renewalPreview?.isMatured;
-  }
-
-  /** What clicking Confirm is actually about to do -- shown above the (hidden-picker) date once
-   *  matured, since the date itself is no longer visible to explain it. */
-  get maturedRenewalTimingText(): string {
-    if (!this.renewalPreview) return '';
-    return this.renewalPreview.withinGrace
-      ? `Backdated to its original maturity date (${this.renewalPreview.maturityDate}), at the currently active interest rate.`
-      : `This FD's grace period has passed -- gap-period interest (for the days since maturity) will be ` +
-          `credited at the linked account's rate first, then this renews from today.`;
-  }
-
   /**
    * The amount being split, and the bound the entered partial amount is checked against.
    * <p>
@@ -340,31 +259,6 @@ export class PaymentDialogComponent implements OnInit {
   }
 
   submit(): void {
-    if (this.gapInterestPending) {
-      this.submitting = true;
-      this.submitError = null;
-      this.fixedDepositsService.creditGapInterestIfPastGrace(this.data.accountId).subscribe({
-        next: () => {
-          this.gapInterestPending = false;
-          this.submitGenericPayment();
-        },
-        error: (error: any) => {
-          this.submitting = false;
-          this.submitError =
-            error?.error?.defaultUserMessage ??
-            error?.error?.errors?.[0]?.defaultUserMessage ??
-            'Could not credit gap-period interest. Please review the details and try again.';
-        }
-      });
-      return;
-    }
-    this.submitGenericPayment();
-  }
-
-  /** The same `command=payment` submission every non-Dashboard call to this dialog already used --
-   *  Dashboard-renewal mode reaches it too, once any gap-interest pre-step above has cleared, so every
-   *  closure type behaves identically regardless of where the dialog was opened from. */
-  private submitGenericPayment(): void {
     const formValue = { ...this.paymentForm.value };
     const locale = this.settingsService.language.code;
     const dateFormat = this.settingsService.dateFormat;
@@ -377,16 +271,7 @@ export class PaymentDialogComponent implements OnInit {
     this.fixedDepositsService
       .executeFixedDepositsAccountCommand(this.data.accountId as string, 'payment', data)
       .subscribe({
-        next: (response: any) => {
-          // Parked in the Checker Inbox rather than executed -- see the same handling in
-          // PrematureCloseDialogComponent for why an HTTP 200 here can still mean "not applied yet".
-          if (response?.rollbackTransaction) {
-            this.alertService.alert({
-              type: 'Success',
-              message:
-                'This payment has been submitted for approval. The deposit is unchanged until a checker approves it.'
-            });
-          }
+        next: () => {
           this.dialogRef.close({ confirm: true });
         },
         // Keep the dialog open with the entered values and say what went wrong, rather than leaving a

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.html

@@ -1,282 +0,0 @@
-<!--
-  Copyright since 2025 Mifos Initiative
-
-  This Source Code Form is subject to the terms of the Mozilla Public
-  License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
--->
-
-<div class="pcd">
-  <div class="pcd__header">
-    <div class="pcd__header-left">
-      <span class="pcd__header-ico"><fa-icon icon="times-circle"></fa-icon></span>
-      <div class="pcd__header-text">
-        <h2 class="pcd__title">{{ 'labels.heading.Premature Close' | translate }}</h2>
-        <p class="pcd__subtitle">
-          Close {{ data.accountNo ?? 'this account' }} before maturity -- interest is recalculated as of the date below,
-          usually at a lower, penalty rate.
-        </p>
-      </div>
-    </div>
-    <button type="button" class="pcd__header-close" mat-dialog-close [disabled]="submitting" title="Close">
-      <fa-icon icon="times"></fa-icon>
-    </button>
-  </div>
-
-  <div mat-dialog-content class="pcd__content">
-    @if (loadFailed) {
-      <div class="pcd__error" role="alert">
-        <fa-icon icon="times-circle" class="m-r-10"></fa-icon>
-        Could not calculate the premature-closure amount for this account. Close this dialog and try again.
-      </div>
-    } @else {
-      <form [formGroup]="prematureCloseForm">
-        <mat-form-field appearance="outline" class="pcd__date" (click)="closedOnDatePicker.open()">
-          <mat-label>{{ 'labels.inputs.Premature Close Date' | translate }}</mat-label>
-          <input
-            matInput
-            [min]="minDate"
-            [max]="maxDate"
-            [matDatepicker]="closedOnDatePicker"
-            required
-            formControlName="closedOnDate"
-          />
-          <mat-datepicker-toggle matSuffix [for]="closedOnDatePicker"></mat-datepicker-toggle>
-          <mat-datepicker #closedOnDatePicker></mat-datepicker>
-          @if (prematureCloseForm.controls.closedOnDate.hasError('required')) {
-            <mat-error>
-              {{ 'labels.inputs.Premature Close Date' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
-          }
-        </mat-form-field>
-
-        <mat-form-field appearance="outline">
-          <mat-label>Closure Reason</mat-label>
-          <mat-select formControlName="prematureClosureReasonId">
-            @for (reason of closureReasonOptions; track reason.id) {
-              <mat-option [value]="reason.id">{{ reason.label }}</mat-option>
-            }
-          </mat-select>
-        </mat-form-field>
-
-        @if (loadingAmount) {
-          <div class="pcd__loading">
-            <mat-spinner diameter="28"></mat-spinner>
-            <span>Calculating premature-closure amount...</span>
-          </div>
-        } @else {
-          @if (data.activatedOnDate || data.maturityDate || data.currentBalance !== undefined) {
-            <div class="pcd__preview pcd__preview--tenure">
-              @if (data.activatedOnDate) {
-                <div class="pcd__preview-row">
-                  <span class="pcd__preview-label">Current Term Started</span>
-                  <span class="pcd__preview-value">{{ activatedOnDateDisplay }}</span>
-                </div>
-                <div class="pcd__preview-row">
-                  <span class="pcd__preview-label">Tenure Completed (this term)</span>
-                  <span class="pcd__preview-value"
-                    >{{ tenureElapsedDisplay }} <span class="pcd__preview-sub">({{ daysElapsed }} days)</span></span
-                  >
-                </div>
-              }
-              @if (data.maturityDate) {
-                <div class="pcd__preview-row">
-                  <span class="pcd__preview-label">Scheduled Maturity Date</span>
-                  <span class="pcd__preview-value"
-                    >{{ maturityDateDisplay }}
-                    <span class="pcd__preview-sub">({{ daysRemainingToMaturity }} days left)</span></span
-                  >
-                </div>
-              }
-              @if (data.currentBalance !== undefined && data.currentBalance !== null) {
-                <div class="pcd__preview-row">
-                  <span class="pcd__preview-label">Current Balance (as of today)</span>
-                  <span class="pcd__preview-value">{{ data.currentBalance | formatNumber }}</span>
-                </div>
-              }
-            </div>
-          }
-
-          @if (maturityAmount !== null && maturityAmount !== undefined) {
-            <div class="pcd__preview">
-              @if (data.depositAmount) {
-                <div class="pcd__preview-row">
-                  <span class="pcd__preview-label">Deposit Amount</span>
-                  <span class="pcd__preview-value">{{ data.depositAmount | formatNumber }}</span>
-                </div>
-              }
-              @if (data.nominalAnnualInterestRate) {
-                <div class="pcd__preview-row">
-                  <span class="pcd__preview-label">Contracted Interest Rate</span>
-                  <span class="pcd__preview-value">{{ data.nominalAnnualInterestRate }}%</span>
-                </div>
-              }
-              @if (effectiveInterestRate !== null && effectiveInterestRate !== undefined) {
-                <div class="pcd__preview-row pcd__preview-row--highlight">
-                  <span class="pcd__preview-label">Effective Rate for this closure</span>
-                  <span class="pcd__preview-value">{{ effectiveInterestRate }}%</span>
-                </div>
-              }
-              @if (data.preClosurePenalApplicable) {
-                <div
-                  class="pcd__preview-row"
-                  [class.pcd__preview-row--waived]="prematureCloseForm.get('waivePreClosurePenalty').value"
-                >
-                  <span class="pcd__preview-label"
-                    >Pre-Closure Penalty (on {{ data.preClosurePenalInterestOnType?.value }})</span
-                  >
-                  <span class="pcd__preview-value">
-                    @if (prematureCloseForm.get('waivePreClosurePenalty').value) {
-                      <span class="pcd__penalty-waived-tag">Waived</span>
-                    } @else {
-                      &minus; {{ data.preClosurePenalInterest }}%
-                    }
-                  </span>
-                </div>
-              }
-              @if (interestEarned !== null) {
-                <div class="pcd__preview-row pcd__preview-row--highlight">
-                  <span class="pcd__preview-label"
-                    >Interest Earned (to {{ 'labels.inputs.Premature Close Date' | translate }})</span
-                  >
-                  <span class="pcd__preview-value"
-                    >{{ interestEarned >= 0 ? '+' : '' }} {{ interestEarned | formatNumber }}</span
-                  >
-                </div>
-              }
-              <div class="pcd__preview-row pcd__preview-row--total">
-                <span class="pcd__preview-label">{{ 'labels.inputs.Maturity Amount' | translate }}</span>
-                <span class="pcd__preview-value">{{ maturityAmount | formatNumber }}</span>
-              </div>
-            </div>
-          }
-
-          @if (data.preClosurePenalApplicable) {
-            @if (isAutoWaivedReason) {
-              <div class="pcd__waive-locked">
-                <fa-icon icon="check-circle" class="m-r-10"></fa-icon>
-                <span>
-                  Penalty automatically waived -- <strong>{{ selectedReasonLabel }}</strong> always waives the
-                  pre-closure penalty, regardless of this checkbox.
-                </span>
-              </div>
-            } @else {
-              <mat-checkbox formControlName="waivePreClosurePenalty" class="pcd__waive-checkbox">
-                Waive the pre-closure penalty for this closure
-                <span class="pcd__waive-hint">
-                  Interest recalculates at the full contracted rate instead of the penalty rate above. This does not
-                  change the product's own penalty setting -- it applies to this one closure only.
-                </span>
-              </mat-checkbox>
-            }
-          }
-
-          <div class="pcd__section-label" id="pcd-action-label">{{ 'labels.inputs.Action' | translate }}</div>
-          <div class="pcd__options" role="radiogroup" aria-labelledby="pcd-action-label">
-            @for (closureOption of onAccountClosureOptions; track closureOption) {
-              <button
-                type="button"
-                class="pcd__option"
-                role="radio"
-                [attr.aria-checked]="prematureCloseForm.get('onAccountClosureId').value === closureOption.id"
-                [class.pcd__option--active]="prematureCloseForm.get('onAccountClosureId').value === closureOption.id"
-                (click)="selectClosureType(closureOption.id)"
-              >
-                <span class="pcd__option-ico"><fa-icon [icon]="iconFor(closureOption.id)"></fa-icon></span>
-                <span class="pcd__option-text">
-                  <span class="pcd__option-title">{{ closureOption.value }}</span>
-                  <span class="pcd__option-desc">{{ descriptionFor(closureOption.id) }}</span>
-                </span>
-                @if (prematureCloseForm.get('onAccountClosureId').value === closureOption.id) {
-                  <fa-icon icon="check-circle" class="pcd__option-check"></fa-icon>
-                }
-              </button>
-            }
-          </div>
-          @if (
-            prematureCloseForm.controls.onAccountClosureId?.hasError('required') &&
-            prematureCloseForm.controls.onAccountClosureId?.touched
-          ) {
-            <div class="pcd__option-error">
-              {{ 'labels.inputs.Account action' | translate }} {{ 'labels.commons.is' | translate }}
-              {{ 'labels.commons.required' | translate }}
-            </div>
-          }
-
-          @if (noDestinationAccounts) {
-            <p class="pcd__hint pcd__hint--warn" role="alert">
-              <fa-icon icon="info-circle" class="m-r-5"></fa-icon>
-              This customer has no active savings account to transfer into. Premature closure has to be paid into a
-              savings account, so open one for this customer before closing this deposit.
-            </p>
-          }
-
-          @if (prematureCloseForm.contains('toSavingsAccountId')) {
-            <mat-form-field appearance="outline">
-              <mat-label>{{ 'labels.inputs.Transfer to Savings' | translate }}</mat-label>
-              <mat-select required formControlName="toSavingsAccountId">
-                @for (account of savingsAccountsData; track account) {
-                  <mat-option [value]="account.id">
-                    {{ account.accountNo }}
-                  </mat-option>
-                }
-              </mat-select>
-              @if (prematureCloseForm.controls.toSavingsAccountId?.hasError('required')) {
-                <mat-error>
-                  {{ 'labels.inputs.Transfer to savings account' | translate }} {{ 'labels.commons.is' | translate }}
-                  <strong>{{ 'labels.commons.required' | translate }}</strong>
-                </mat-error>
-              }
-            </mat-form-field>
-          }
-
-          @if (prematureCloseForm.contains('toGlAccountId')) {
-            <mifosx-gl-account-selector
-              [inputFormControl]="toGlAccountControl"
-              [glAccountList]="glAccountsData"
-              [required]="true"
-              [inputLabel]="'Transfer to GL Account'"
-            >
-            </mifosx-gl-account-selector>
-          }
-
-          @if (prematureCloseForm.contains('transferDescription')) {
-            <mat-form-field appearance="outline">
-              <mat-label>{{ 'labels.inputs.Transfer Description' | translate }}</mat-label>
-              <input matInput formControlName="transferDescription" />
-            </mat-form-field>
-          }
-
-          @if (prematureCloseForm.contains('note')) {
-            <mat-form-field appearance="outline">
-              <mat-label>{{ 'labels.inputs.Note' | translate }}</mat-label>
-              <textarea matInput formControlName="note" cdkTextareaAutosize cdkAutosizeMinRows="2"></textarea>
-            </mat-form-field>
-          }
-        }
-
-        @if (submitError) {
-          <p class="pcd__error" role="alert">
-            <fa-icon icon="times-circle" class="m-r-5"></fa-icon>
-            {{ submitError }}
-          </p>
-        }
-      </form>
-    }
-  </div>
-
-  <div mat-dialog-actions align="end" class="pcd__actions">
-    <button mat-button mat-dialog-close [disabled]="submitting" class="pcd__btn-cancel">
-      {{ 'labels.buttons.Cancel' | translate }}
-    </button>
-    <button
-      mat-raised-button
-      class="pcd__btn-submit"
-      [disabled]="!prematureCloseForm?.valid || submitting || loadFailed || loadingAmount"
-      (click)="submit()"
-    >
-      {{ submitting ? ('labels.buttons.Processing' | translate) : ('labels.buttons.Confirm' | translate) }}
-    </button>
-  </div>
-</div>

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.scss

@@ -1,468 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/**
- * Premature Close Dialog Styles
- * CBSNexora Core Banking System
- *
- * Same shape/spacing/typography as the Payment dialog (.pmt__*), in this Danger Zone action's own red
- * accent on the header and Confirm button, rather than Payment's blue -- an irreversible, usually
- * penalty-bearing action reads differently from a routine one, everywhere else stays identical so the
- * two dialogs feel like the same product.
- */
-
-.pcd {
-  display: flex;
-  flex-direction: column;
-  height: 100%;
-  max-height: 92vh;
-  box-sizing: border-box;
-  font-family:
-    'DM Sans',
-    system-ui,
-    -apple-system,
-    sans-serif;
-  color: #0f172a;
-  border-radius: 16px;
-  overflow: hidden;
-  box-shadow: 0 24px 48px -12px rgb(15 23 42 / 25%);
-}
-
-.pcd__header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 16px;
-  padding: 26px 30px;
-  background: linear-gradient(135deg, #7f1d1d 0%, #b91c1c 55%, #dc2626 100%);
-  color: #fff;
-  flex-shrink: 0;
-  position: relative;
-  overflow: hidden;
-
-  &::after {
-    content: '';
-    position: absolute;
-    inset: 0;
-    background: radial-gradient(circle at 88% -20%, rgb(255 255 255 / 22%), transparent 55%);
-    pointer-events: none;
-  }
-
-  &-left {
-    display: flex;
-    align-items: center;
-    gap: 16px;
-    position: relative;
-    z-index: 1;
-  }
-
-  &-ico {
-    width: 48px;
-    height: 48px;
-    border-radius: 14px;
-    background: rgb(255 255 255 / 16%);
-    border: 1px solid rgb(255 255 255 / 25%);
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 20px;
-    color: #fff;
-    flex-shrink: 0;
-  }
-
-  &-text {
-    display: flex;
-    flex-direction: column;
-  }
-
-  &-close {
-    position: relative;
-    z-index: 1;
-    background: rgb(255 255 255 / 14%);
-    border: none;
-    color: #fff;
-    width: 34px;
-    height: 34px;
-    border-radius: 50%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    cursor: pointer;
-    transition: all 0.2s ease;
-    flex-shrink: 0;
-
-    &:hover:not(:disabled) {
-      background: rgb(255 255 255 / 28%);
-      transform: rotate(90deg);
-    }
-
-    &:disabled {
-      opacity: 0.5;
-      cursor: not-allowed;
-    }
-  }
-}
-
-.pcd__title {
-  margin: 0;
-  font-size: 20px;
-  font-weight: 800;
-  color: #fff;
-  line-height: 1.25;
-  letter-spacing: -0.01em;
-}
-
-.pcd__subtitle {
-  margin: 5px 0 0;
-  font-size: 13px;
-  color: rgb(255 255 255 / 88%);
-  line-height: 1.4;
-}
-
-.pcd__content {
-  padding: 26px 30px !important;
-  overflow-y: auto;
-  flex: 1 1 auto;
-  background: #fbfcfe;
-
-  mat-form-field {
-    width: 100%;
-  }
-}
-
-.pcd__loading {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  color: #64748b;
-  font-size: 13px;
-  padding: 14px 0 18px;
-}
-
-.pcd__preview {
-  display: flex;
-  flex-direction: column;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 14px;
-  padding: 4px 18px;
-  margin: 0 0 18px;
-
-  &-row {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 12px;
-    padding: 11px 0;
-    border-bottom: 1px solid #f1f5f9;
-
-    &:last-child {
-      border-bottom: none;
-    }
-
-    &--highlight {
-      .pcd__preview-value {
-        color: #b91c1c;
-        font-weight: 800;
-      }
-    }
-
-    &--total {
-      margin: 0 -18px;
-      padding: 14px 18px;
-      background: linear-gradient(135deg, #fef2f2 0%, #fee2e2 100%);
-      border-bottom: none;
-      border-radius: 0 0 12px 12px;
-
-      .pcd__preview-label {
-        color: #b91c1c;
-        font-weight: 700;
-      }
-
-      .pcd__preview-value {
-        color: #0f172a;
-        font-size: 18px;
-        font-weight: 800;
-      }
-    }
-  }
-
-  &-label {
-    font-size: 12.5px;
-    color: #64748b;
-    font-weight: 600;
-  }
-
-  &-value {
-    font-family: 'JetBrains Mono', 'DM Sans', monospace;
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-  }
-
-  &-sub {
-    font-family: 'DM Sans', sans-serif;
-    font-size: 11px;
-    font-weight: 500;
-    color: #94a3b8;
-    margin-left: 4px;
-  }
-}
-
-.pcd__preview--tenure {
-  margin-bottom: 14px;
-}
-
-.pcd__preview-row--waived {
-  .pcd__preview-label {
-    color: #16a34a;
-  }
-}
-
-.pcd__penalty-waived-tag {
-  font-family: 'DM Sans', sans-serif;
-  font-size: 11px;
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 0.04em;
-  color: #15803d;
-  background: #dcfce7;
-  border: 1px solid #86efac;
-  border-radius: 999px;
-  padding: 3px 10px;
-}
-
-.pcd__waive-checkbox {
-  display: flex;
-  align-items: flex-start;
-  background: #fff;
-  border: 1px solid #e2e8f0;
-  border-radius: 12px;
-  padding: 14px 16px;
-  margin: 0 0 18px;
-  font-size: 13px;
-  font-weight: 600;
-  color: #0f172a;
-
-  ::ng-deep .mdc-form-field {
-    align-items: flex-start;
-  }
-
-  ::ng-deep .mdc-checkbox {
-    margin-top: -9px;
-  }
-}
-
-.pcd__waive-locked {
-  display: flex;
-  align-items: flex-start;
-  gap: 10px;
-  background: #f0fdf4;
-  border: 1px solid #bbf7d0;
-  border-left: 4px solid #16a34a;
-  border-radius: 10px;
-  color: #15803d;
-  font-size: 13px;
-  line-height: 1.5;
-  padding: 12px 16px;
-  margin: 0 0 18px;
-
-  strong {
-    color: #166534;
-  }
-}
-
-.pcd__waive-hint {
-  display: block;
-  font-size: 12px;
-  font-weight: 500;
-  color: #64748b;
-  margin-top: 3px;
-  line-height: 1.4;
-}
-
-.pcd__section-label {
-  font-size: 12px;
-  font-weight: 700;
-  text-transform: uppercase;
-  letter-spacing: 0.06em;
-  color: #475569;
-  margin: 10px 0 12px;
-}
-
-/* Action Options Grid - 2 Equal Columns */
-.pcd__options {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 14px;
-  margin-bottom: 18px;
-
-  @media (width <= 560px) {
-    grid-template-columns: 1fr;
-  }
-}
-
-.pcd__option {
-  display: flex;
-  align-items: flex-start;
-  gap: 14px;
-  text-align: left;
-  background: #fff;
-  border: 1.5px solid #e2e8f0;
-  border-radius: 14px;
-  padding: 16px;
-  cursor: pointer;
-  font: inherit;
-  transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
-  position: relative;
-
-  &:hover {
-    border-color: #fca5a5;
-    background: #f8fafc;
-    box-shadow: 0 6px 16px rgb(15 23 42 / 6%);
-    transform: translateY(-1px);
-  }
-
-  &--active {
-    border-color: #dc2626;
-    background: #fef2f2;
-    box-shadow: 0 0 0 1.5px #dc2626;
-
-    .pcd__option-ico {
-      background: #dc2626;
-      color: #fff;
-      border-color: #dc2626;
-    }
-  }
-
-  &-ico {
-    width: 38px;
-    height: 38px;
-    min-width: 38px;
-    border-radius: 10px;
-    background: #f1f5f9;
-    border: 1px solid #e2e8f0;
-    color: #dc2626;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    font-size: 15px;
-    flex-shrink: 0;
-    transition: all 0.2s ease;
-  }
-
-  &-text {
-    display: flex;
-    flex-direction: column;
-    gap: 4px;
-    flex: 1;
-  }
-
-  &-title {
-    font-size: 14px;
-    font-weight: 700;
-    color: #0f172a;
-    line-height: 1.3;
-  }
-
-  &-desc {
-    font-size: 12px;
-    color: #64748b;
-    line-height: 1.4;
-  }
-
-  &-check {
-    color: #dc2626;
-    font-size: 17px;
-    position: absolute;
-    top: 14px;
-    right: 14px;
-  }
-}
-
-.pcd__option-error {
-  color: #b91c1c;
-  font-size: 12px;
-  font-weight: 600;
-  margin: -10px 0 14px;
-}
-
-.pcd__hint {
-  display: flex;
-  align-items: flex-start;
-  gap: 10px;
-  background: #f0f9ff;
-  border: 1px solid #bae6fd;
-  border-left: 4px solid #0284c7;
-  border-radius: 10px;
-  color: #0369a1;
-  font-size: 13px;
-  line-height: 1.5;
-  padding: 12px 16px;
-  margin: 0 0 18px;
-
-  &--warn {
-    background: #fffbeb;
-    border-color: #fde68a;
-    border-left-color: #d97706;
-    color: #b45309;
-  }
-}
-
-.pcd__error {
-  display: flex;
-  align-items: flex-start;
-  gap: 10px;
-  background: #fef2f2;
-  border: 1px solid #fecaca;
-  border-left: 4px solid #ef4444;
-  border-radius: 10px;
-  color: #b91c1c;
-  font-size: 13px;
-  padding: 12px 16px;
-  margin: 10px 0;
-}
-
-.pcd__actions {
-  padding: 18px 30px !important;
-  border-top: 1px solid #e2e8f0;
-  background: #fff;
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  gap: 14px;
-  flex-shrink: 0;
-
-  .pcd__btn-cancel {
-    border-radius: 10px;
-    font-weight: 600;
-    color: #475569;
-  }
-
-  .pcd__btn-submit {
-    border-radius: 10px;
-    font-weight: 700;
-    padding: 0 26px;
-    height: 42px;
-    background: linear-gradient(135deg, #b91c1c 0%, #dc2626 100%);
-    color: #fff;
-    box-shadow: 0 8px 20px rgb(220 38 38 / 30%);
-    transition: all 0.2s ease;
-
-    &:hover:not(:disabled) {
-      box-shadow: 0 10px 24px rgb(220 38 38 / 40%);
-      transform: translateY(-1px);
-    }
-
-    &:disabled {
-      background: #cbd5e1;
-      box-shadow: none;
-      color: #64748b;
-    }
-  }
-}

src/app/deposits/fixed-deposits/fixed-deposit-account-view/custom-dialogs/premature-close-dialog/premature-close-dialog.component.ts

@@ -1,446 +0,0 @@
-/**
- * Copyright since 2025 Mifos Initiative
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-/** Angular Imports */
-import { Component, OnInit, inject } from '@angular/core';
-import {
-  MAT_DIALOG_DATA,
-  MatDialogRef,
-  MatDialogContent,
-  MatDialogActions,
-  MatDialogClose
-} from '@angular/material/dialog';
-import { CdkScrollable } from '@angular/cdk/scrolling';
-import { CdkTextareaAutosize } from '@angular/cdk/text-field';
-import { FaIconComponent } from '@fortawesome/angular-fontawesome';
-import { UntypedFormBuilder, UntypedFormGroup, UntypedFormControl, Validators } from '@angular/forms';
-
-/** Custom Services */
-import { FixedDepositsService } from '../../../fixed-deposits.service';
-import { SettingsService } from 'app/settings/settings.service';
-import { AccountingService } from 'app/accounting/accounting.service';
-import { AlertService } from 'app/core/alert/alert.service';
-import { Dates } from 'app/core/utils/dates';
-import { FormatNumberPipe } from '../../../../../pipes/format-number.pipe';
-import { GlAccountSelectorComponent } from 'app/shared/accounting/gl-account-selector/gl-account-selector.component';
-import { GLAccount } from 'app/shared/models/general.model';
-import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
-
-/**
- * "Premature Close" dialog -- Active-only, no reinvest option (the deposit hasn't matured, so there's
- * nothing to renew): transfer the pre-maturity balance to a savings account, or post it to a GL account.
- * There is deliberately no cash payout -- the backend does not offer or accept one for a premature
- * closure, so the proceeds always stay traceable to an account. Same
- * `.pcd__*` visual language as the Payment dialog ({@link PaymentDialogComponent}), in this Danger Zone
- * action's own red accent rather than Payment's blue, since it's an irreversible, usually
- * penalty-bearing action rather than a routine one.
- * <p>
- * The premature amount is date-dependent (unlike Payment's one-shot template load): every change to
- * Closed On Date re-calls `calculatePrematureAmount`, same as the full-page form this replaces did.
- */
-@Component({
-  selector: 'mifosx-premature-close-dialog',
-  templateUrl: './premature-close-dialog.component.html',
-  styleUrls: ['./premature-close-dialog.component.scss'],
-  imports: [
-    ...STANDALONE_SHARED_IMPORTS,
-    CdkScrollable,
-    MatDialogContent,
-    MatDialogActions,
-    MatDialogClose,
-    CdkTextareaAutosize,
-    FaIconComponent,
-    FormatNumberPipe,
-    GlAccountSelectorComponent
-  ]
-})
-export class PrematureCloseDialogComponent implements OnInit {
-  /** The `onAccountClosureId` codes Premature Close can offer -- same codes Payment/Close use. */
-  private static readonly WITHDRAW_DEPOSIT_ID = 100;
-  private static readonly TRANSFER_TO_SAVINGS_ID = 200;
-  private static readonly TRANSFER_TO_GL_ID = 600;
-
-  private static readonly ACTION_ICONS: Record<number, string> = {
-    [PrematureCloseDialogComponent.WITHDRAW_DEPOSIT_ID]: 'money-bill-wave',
-    [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'wallet',
-    [PrematureCloseDialogComponent.TRANSFER_TO_GL_ID]: 'book'
-  };
-
-  private static readonly ACTION_DESCRIPTIONS: Record<number, string> = {
-    [PrematureCloseDialogComponent.WITHDRAW_DEPOSIT_ID]: 'Pay out the full balance in cash',
-    [PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID]: 'Move the full balance to another savings account',
-    [PrematureCloseDialogComponent.TRANSFER_TO_GL_ID]: 'Post the full balance to a GL account'
-  };
-
-  /**
-   * Mirrors the backend's PrematureClosureReasonType values exactly -- see that enum for why these
-   * four (everything but Normal) always waive the penalty by RBI policy rather than at the maker's
-   * discretion. `gatedBy` is the product-facility flag (from `data`) that must be true for the option
-   * to even be offered; `null` means always offered. Deceased Settlement / Nominee-Legal Heir Closure
-   * are gated because they are the product's own opt-in facilities (see SavingsProduct
-   * deceasedSettlement/noPenaltyNomineeHeirClosure) -- a product that never enabled one shouldn't let
-   * a maker pick it to bypass a penalty that product's terms don't actually exempt.
-   */
-  private static readonly NORMAL_REASON_ID = 100;
-  private static readonly ALL_CLOSURE_REASONS: {
-    id: number;
-    label: string;
-    autoWaived: boolean;
-    gatedBy: 'deceasedSettlement' | 'noPenaltyNomineeHeirClosure' | null;
-  }[] = [
-    { id: 100, label: 'Normal Premature Closure', autoWaived: false, gatedBy: null },
-    { id: 200, label: 'Premature Extension / Renewal', autoWaived: true, gatedBy: null },
-    { id: 300, label: 'Conversion to Another Term Deposit', autoWaived: true, gatedBy: null },
-    { id: 400, label: 'Deceased Settlement', autoWaived: true, gatedBy: 'deceasedSettlement' },
-    { id: 500, label: 'Nominee / Legal Heir Closure', autoWaived: true, gatedBy: 'noPenaltyNomineeHeirClosure' }
-  ];
-
-  dialogRef = inject<MatDialogRef<PrematureCloseDialogComponent>>(MatDialogRef);
-  data: {
-    accountId: number | string;
-    accountNo?: string;
-    depositAmount?: number;
-    nominalAnnualInterestRate?: number;
-    preClosurePenalApplicable?: boolean;
-    preClosurePenalInterest?: number;
-    preClosurePenalInterestOnType?: { value: string };
-    deceasedSettlement?: boolean;
-    noPenaltyNomineeHeirClosure?: boolean;
-    activatedOnDate?: any;
-    maturityDate?: any;
-    currentBalance?: number;
-  } = inject(MAT_DIALOG_DATA);
-  private formBuilder = inject(UntypedFormBuilder);
-  private fixedDepositsService = inject(FixedDepositsService);
-  private settingsService = inject(SettingsService);
-  private accountingService = inject(AccountingService);
-  private alertService = inject(AlertService);
-  private dateUtils = inject(Dates);
-
-  prematureCloseForm: UntypedFormGroup;
-  onAccountClosureOptions: any[] = [];
-  savingsAccountsData: any[] = [];
-  /** Postable GL accounts, loaded once -- only read when the GL action is chosen. */
-  glAccountsData: GLAccount[] = [];
-  maturityAmount: number = null;
-  /** The rate actually resolved for THIS preview by the backend (actual-period vs contracted,
-   *  penalty-deducted or not) -- distinct from data.nominalAnnualInterestRate, which is always the
-   *  account's unmodified contracted rate. Read fresh on every recalculation. */
-  effectiveInterestRate: number = null;
-  loadingAmount = true;
-  loadFailed = false;
-  submitting = false;
-  submitError: string = null;
-  minDate = new Date(2000, 0, 1);
-  maxDate: Date;
-
-  ngOnInit(): void {
-    this.maxDate = this.settingsService.businessDate;
-    this.prematureCloseForm = this.formBuilder.group({
-      closedOnDate: [
-        this.maxDate,
-        Validators.required
-      ],
-      // Both always present (not added conditionally like onAccountClosureId below) so submit()
-      // always carries a value, even for a product with no penalty configured at all -- the backend
-      // ignores them there anyway, since there is nothing to waive.
-      prematureClosureReasonId: [PrematureCloseDialogComponent.NORMAL_REASON_ID],
-      waivePreClosurePenalty: [false]
-    });
-
-    this.prematureCloseForm
-      .get('closedOnDate')
-      .valueChanges.subscribe((date: Date) => this.calculatePrematureAmount(date));
-    // Waiving/un-waiving recalculates the preview the same way changing the date does -- the maker
-    // should see the actual amount they're about to confirm, not the penalty-applied one, the moment
-    // they tick the box.
-    this.prematureCloseForm
-      .get('waivePreClosurePenalty')
-      .valueChanges.subscribe(() => this.calculatePrematureAmount(this.prematureCloseForm.get('closedOnDate').value));
-    // Picking an RBI-mandated waiver reason forces the checkbox on (see onClosureReasonChange) and,
-    // like it, recalculates the preview so the amount shown always matches the reason selected.
-    this.prematureCloseForm
-      .get('prematureClosureReasonId')
-      .valueChanges.subscribe((id: number) => this.onClosureReasonChange(id));
-    // Same date the form already starts with -- without this the amount/options never load unless the
-    // maker happens to touch the date picker, which the full-page form this replaces required too.
-    this.calculatePrematureAmount(this.maxDate);
-  }
-
-  /** The reason list this account's product actually allows -- see ALL_CLOSURE_REASONS' `gatedBy`. */
-  get closureReasonOptions(): { id: number; label: string; autoWaived: boolean }[] {
-    return PrematureCloseDialogComponent.ALL_CLOSURE_REASONS.filter(
-      (reason) => !reason.gatedBy || this.data[reason.gatedBy]
-    );
-  }
-
-  /** True when the selected reason waives the penalty by policy, not maker choice -- the checkbox is
-   *  hidden in favour of a plain statement of that fact when this is true (see the template). */
-  get isAutoWaivedReason(): boolean {
-    return !!this.selectedReason?.autoWaived;
-  }
-
-  get selectedReasonLabel(): string {
-    return this.selectedReason?.label ?? '';
-  }
-
-  private get selectedReason(): { id: number; label: string; autoWaived: boolean } | undefined {
-    const id = this.prematureCloseForm?.get('prematureClosureReasonId')?.value;
-    return PrematureCloseDialogComponent.ALL_CLOSURE_REASONS.find((reason) => reason.id === id);
-  }
-
-  private onClosureReasonChange(reasonId: number): void {
-    const reason = PrematureCloseDialogComponent.ALL_CLOSURE_REASONS.find((r) => r.id === reasonId);
-    if (reason?.autoWaived) {
-      // emitEvent: false -- the explicit calculatePrematureAmount call below already covers this
-      // change; without it, this setValue would also fire waivePreClosurePenalty's own subscription
-      // and the amount would be calculated twice for one reason change.
-      this.prematureCloseForm.get('waivePreClosurePenalty').setValue(true, { emitEvent: false });
-    }
-    this.calculatePrematureAmount(this.prematureCloseForm.get('closedOnDate').value);
-  }
-
-  private calculatePrematureAmount(date: Date): void {
-    this.loadingAmount = true;
-    this.loadFailed = false;
-    const locale = this.settingsService.language.code;
-    const dateFormat = this.settingsService.dateFormat;
-    const data = {
-      closedOnDate: this.dateUtils.formatDate(date, dateFormat),
-      dateFormat,
-      locale,
-      prematureClosureReasonId: this.prematureCloseForm.get('prematureClosureReasonId')?.value,
-      waivePreClosurePenalty: !!this.prematureCloseForm.get('waivePreClosurePenalty')?.value
-    };
-    this.fixedDepositsService
-      .executeFixedDepositsAccountCommand(this.data.accountId as string, 'calculatePrematureAmount', data)
-      .subscribe({
-        next: (response: any) => {
-          this.savingsAccountsData = response.savingsAccounts ?? [];
-          this.onAccountClosureOptions = response.onAccountClosureOptions ?? [];
-          this.maturityAmount = response.maturityAmount;
-          this.effectiveInterestRate = response.nominalAnnualInterestRate ?? null;
-          this.loadingAmount = false;
-          if (!this.prematureCloseForm.contains('onAccountClosureId')) {
-            this.prematureCloseForm.addControl('onAccountClosureId', new UntypedFormControl('', Validators.required));
-            this.prematureCloseForm.addControl('note', new UntypedFormControl(''));
-            this.prematureCloseForm
-              .get('onAccountClosureId')
-              .valueChanges.subscribe((id: number) => this.onClosureTypeChange(id));
-          }
-        },
-        // Without this the spinner would run forever on a failed load, leaving Cancel as the only way out.
-        error: () => {
-          this.loadingAmount = false;
-          this.loadFailed = true;
-        }
-      });
-  }
-
-  /** Adds/removes the destination control to match what the chosen type needs. */
-  private onClosureTypeChange(id: number): void {
-    const toSavings = id === PrematureCloseDialogComponent.TRANSFER_TO_SAVINGS_ID;
-    const toGl = id === PrematureCloseDialogComponent.TRANSFER_TO_GL_ID;
-
-    if (toSavings && !this.prematureCloseForm.contains('toSavingsAccountId')) {
-      this.prematureCloseForm.addControl('toSavingsAccountId', new UntypedFormControl('', Validators.required));
-    } else if (!toSavings) {
-      this.prematureCloseForm.removeControl('toSavingsAccountId');
-    }
-
-    if (toGl) {
-      if (!this.prematureCloseForm.contains('toGlAccountId')) {
-        this.prematureCloseForm.addControl('toGlAccountId', new UntypedFormControl('', Validators.required));
-      }
-      this.loadGlAccounts();
-    } else {
-      this.prematureCloseForm.removeControl('toGlAccountId');
-    }
-
-    // Both destinations carry the description through -- to the account transfer, or to the narration on
-    // the journal entry that credits the GL account.
-    if ((toSavings || toGl) && !this.prematureCloseForm.contains('transferDescription')) {
-      this.prematureCloseForm.addControl('transferDescription', new UntypedFormControl(''));
-    } else if (!toSavings && !toGl) {
-      this.prematureCloseForm.removeControl('transferDescription');
-    }
-  }
-
-  /** Fetched on first use rather than with the dialog, since most closures never pick the GL action. */
-  private loadGlAccounts(): void {
-    if (this.glAccountsData.length) {
-      return;
-    }
-    this.accountingService.getGlAccounts().subscribe((accounts: GLAccount[]) => {
-      this.glAccountsData = accounts ?? [];
-    });
-  }
-
-  /** The GL selector takes a control instance, not a control name. */
-  get toGlAccountControl(): UntypedFormControl {
-    return this.prematureCloseForm.get('toGlAccountId') as UntypedFormControl;
-  }
-
-  /** The gap between the deposit and the computed maturity amount -- the actual interest this premature
-   *  closure earns, at whatever rate (contracted, or the lower pre-closure-penalty one below) applied. */
-  get interestEarned(): number | null {
-    if (this.maturityAmount === null || this.maturityAmount === undefined || !this.data.depositAmount) {
-      return null;
-    }
-    return Number(this.maturityAmount) - Number(this.data.depositAmount);
-  }
-
-  get activatedOnDateDisplay(): string {
-    return this.formatFullDate(this.data.activatedOnDate);
-  }
-
-  get maturityDateDisplay(): string {
-    return this.formatFullDate(this.data.maturityDate);
-  }
-
-  /**
-   * The date every "as of" figure in this dialog is measured against -- the maker's own chosen Premature
-   * Close Date, falling back to Fineract's configured Business Date. Deliberately NOT the real-world
-   * clock (`new Date()`): Fineract's business date can lag behind the calendar (a bank's own admin
-   * advances it), and the backend's interest calculation is measured from THIS date, not today's actual
-   * date. Using the real clock here previously showed a "days elapsed" figure that disagreed with the
-   * interest the backend actually computed for the same closure -- both must read off the same clock.
-   */
-  private get referenceDate(): Date {
-    const picked = this.prematureCloseForm?.get('closedOnDate')?.value;
-    return picked instanceof Date ? picked : this.maxDate;
-  }
-
-  /** Days from the current term's start to the chosen closure date -- 0 if the date is missing or the
-   *  closure date is somehow before it, rather than a negative. */
-  get daysElapsed(): number | null {
-    const start = this.data.activatedOnDate ? this.dateUtils.parseDate(this.data.activatedOnDate) : null;
-    if (!start) {
-      return null;
-    }
-    return Math.max(0, this.dateUtils.calculateDiff(start, this.referenceDate));
-  }
-
-  /** Days from the chosen closure date to the scheduled maturity date -- 0 once matured/overdue rather
-   *  than negative, since this dialog is for a still-Active account closing early, not a matured one. */
-  get daysRemainingToMaturity(): number | null {
-    const maturity = this.data.maturityDate ? this.dateUtils.parseDate(this.data.maturityDate) : null;
-    if (!maturity) {
-      return null;
-    }
-    return Math.max(0, this.dateUtils.calculateDiff(this.referenceDate, maturity));
-  }
-
-  /** Elapsed tenure as Years/Months/Days, the way a real passbook states it, rather than a raw day
-   *  count that is hard to read for a multi-year FD. */
-  get tenureElapsedDisplay(): string {
-    const start = this.data.activatedOnDate ? this.dateUtils.parseDate(this.data.activatedOnDate) : null;
-    if (!start) {
-      return '—';
-    }
-    const { years, months, days } = PrematureCloseDialogComponent.yearsMonthsDaysBetween(start, this.referenceDate);
-    const parts: string[] = [];
-    if (years > 0) {
-      parts.push(`${years} yr${years === 1 ? '' : 's'}`);
-    }
-    if (months > 0) {
-      parts.push(`${months} mo${months === 1 ? '' : 's'}`);
-    }
-    if (days > 0 || parts.length === 0) {
-      parts.push(`${days} day${days === 1 ? '' : 's'}`);
-    }
-    return parts.join(', ');
-  }
-
-  private formatFullDate(value: any): string {
-    if (!value) {
-      return '—';
-    }
-    const parsed = this.dateUtils.parseDate(value);
-    // "28 September 2026" -- day/month-name/year, so this reads unambiguously regardless of the
-    // account's own configured short date format elsewhere in the app.
-    return this.dateUtils.formatDate(parsed, 'd MMMM y');
-  }
-
-  private static yearsMonthsDaysBetween(start: Date, end: Date): { years: number; months: number; days: number } {
-    let years = end.getFullYear() - start.getFullYear();
-    let months = end.getMonth() - start.getMonth();
-    let days = end.getDate() - start.getDate();
-    if (days < 0) {
-      months -= 1;
-      const daysInPreviousMonth = new Date(end.getFullYear(), end.getMonth(), 0).getDate();
-      days += daysInPreviousMonth;
-    }
-    if (months < 0) {
-      years -= 1;
-      months += 12;
-    }
-    return { years: Math.max(0, years), months: Math.max(0, months), days: Math.max(0, days) };
-  }
-
-  /** True when the chosen action needs a destination account but the customer has none to pick. */
-  get noDestinationAccounts(): boolean {
-    return (
-      !this.loadingAmount &&
-      this.prematureCloseForm?.contains('toSavingsAccountId') &&
-      this.savingsAccountsData.length === 0
-    );
-  }
-
-  iconFor(id: number): string {
-    return PrematureCloseDialogComponent.ACTION_ICONS[id] ?? 'circle';
-  }
-
-  descriptionFor(id: number): string {
-    return PrematureCloseDialogComponent.ACTION_DESCRIPTIONS[id] ?? '';
-  }
-
-  selectClosureType(id: number): void {
-    this.prematureCloseForm.get('onAccountClosureId').setValue(id);
-    this.prematureCloseForm.get('onAccountClosureId').markAsTouched();
-  }
-
-  submit(): void {
-    const formValue = { ...this.prematureCloseForm.value };
-    const locale = this.settingsService.language.code;
-    const dateFormat = this.settingsService.dateFormat;
-    if (formValue.closedOnDate instanceof Date) {
-      formValue.closedOnDate = this.dateUtils.formatDate(formValue.closedOnDate, dateFormat);
-    }
-    const data = { ...formValue, dateFormat, locale };
-    this.submitting = true;
-    this.submitError = null;
-    this.fixedDepositsService
-      .executeFixedDepositsAccountCommand(this.data.accountId as string, 'prematureClose', data)
-      .subscribe({
-        next: (response: any) => {
-          // A command on a maker-checker permission is parked in the Checker Inbox, not executed:
-          // the platform rolls its transaction back and still answers HTTP 200 with
-          // rollbackTransaction: true. Without saying so, the dialog closes and the account reloads
-          // unchanged -- which reads as "nothing happened" rather than "waiting for approval".
-          if (response?.rollbackTransaction) {
-            this.alertService.alert({
-              type: 'Success',
-              message:
-                'Premature closure has been submitted for approval. The deposit is unchanged until a checker approves it.'
-            });
-          }
-          this.dialogRef.close({ confirm: true });
-        },
-        // Keep the dialog open with the entered values and say what went wrong, rather than leaving a
-        // permanently disabled Confirm behind whatever modal the global interceptor threw up.
-        error: (error: any) => {
-          this.submitting = false;
-          this.submitError =
-            error?.error?.defaultUserMessage ??
-            error?.error?.errors?.[0]?.defaultUserMessage ??
-            'This account could not be prematurely closed. Please review the details and try again.';
-        }
-      });
-  }
-}

src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposit-account-view.component.ts

@@ -17,7 +17,6 @@ import { CalculateInterestDialogComponent } from './custom-dialogs/calculate-int
 import { PostInterestDialogComponent } from './custom-dialogs/post-interest-dialog/post-interest-dialog.component';
 import { ToggleWithholdTaxDialogComponent } from './custom-dialogs/toggle-withhold-tax-dialog/toggle-withhold-tax-dialog.component';
 import { PaymentDialogComponent } from './custom-dialogs/payment-dialog/payment-dialog.component';
-import { PrematureCloseDialogComponent } from './custom-dialogs/premature-close-dialog/premature-close-dialog.component';
 import { DepositCertificateDialogComponent } from 'app/shared/deposit-certificate-dialog/deposit-certificate-dialog.component';
 
 /** Custom Button Config. */
@@ -30,7 +29,6 @@ import { AccountsService } from 'app/accounts/accounts.service';
 import { Currency } from 'app/shared/models/general.model';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
-import { AlertService } from 'app/core/alert/alert.service';
 import { AuthenticationService } from '../../../core/authentication/authentication.service';
 import { MatTooltip } from '@angular/material/tooltip';
 import { NgClass, CurrencyPipe } from '@angular/common';
@@ -75,7 +73,6 @@ import { DormancyAlertPanelComponent } from 'app/shared/dormancy-alert-panel/dor
 export class FixedDepositAccountViewComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
-  private alertService = inject(AlertService);
   private fixedDepositsService = inject(FixedDepositsService);
   private savingsService = inject(SavingsService);
   private accountsService = inject(AccountsService);
@@ -241,6 +238,7 @@ export class FixedDepositAccountViewComponent implements OnInit {
       case 'Undo Activation':
       case 'Add Charge':
       case 'Withdrawn by Client':
+      case 'Premature Close':
       case 'Deposit':
       case 'Withdrawal':
         this.router.navigate([`actions/${name}`], { relativeTo: this.route });
@@ -269,21 +267,16 @@ export class FixedDepositAccountViewComponent implements OnInit {
       case 'Payment':
         this.openPaymentDialog();
         break;
-      case 'Premature Close':
-        this.openPrematureCloseDialog();
-        break;
     }
   }
 
   /**
-   * Opens the Payment action -- only offered once the FD has actually Matured (see
-   * FixedDepositsButtonsConfiguration), and the only place a Partial Reinvest can be done. Also the
-   * exact same dialog the FD Dashboard's Renew action opens (see fd-dashboard.component.ts's
-   * openRenewDialog), just without dashboardRenewal data, so its date picker stays visible.
+   * Opens the Payment action -- unlike Premature Close/Close, works whether the account is Active or
+   * Matured, and is the only place a Partial Reinvest can be done.
    */
   private openPaymentDialog(): void {
     const paymentDialogRef = this.dialog.open(PaymentDialogComponent, {
-      width: '720px',
+      width: '640px',
       maxWidth: '95vw',
       data: {
         accountId: this.fixedDepositsAccountData.id,
@@ -300,60 +293,6 @@ export class FixedDepositAccountViewComponent implements OnInit {
     });
   }
 
-  /**
-   * The start date of the term currently running -- the last entry in renewalHistory, which is ordered
-   * oldest-first (see RenewalHistoryTabComponent). Falls back to the account's own activation date for
-   * an FD that has never been renewed (or whose renewalHistory hasn't loaded), which is the same date
-   * in that case anyway.
-   */
-  private get currentTermStartDate(): any {
-    const history = this.fixedDepositsAccountData?.renewalHistory;
-    const latestTerm = Array.isArray(history) && history.length > 0 ? history[history.length - 1] : null;
-    return latestTerm?.activatedondate ?? this.fixedDepositsAccountData?.timeline?.activatedOnDate;
-  }
-
-  /**
-   * Opens the Premature Close action -- Active-only, no reinvest option, since the deposit hasn't
-   * matured yet.
-   */
-  private openPrematureCloseDialog(): void {
-    const prematureCloseDialogRef = this.dialog.open(PrematureCloseDialogComponent, {
-      width: '720px',
-      maxWidth: '95vw',
-      data: {
-        accountId: this.fixedDepositsAccountData.id,
-        accountNo: this.fixedDepositsAccountData.fdAccountNumber || this.fixedDepositsAccountData.accountNo,
-        // calculatePrematureAmount only ever returns the final maturityAmount, not how it was reached --
-        // these come from the account's own data (already loaded for this page) so the dialog can show
-        // the breakdown (deposit, contracted rate, penalty, interest earned) behind that one number.
-        depositAmount: this.fixedDepositsAccountData.depositAmount,
-        nominalAnnualInterestRate: this.fixedDepositsAccountData.nominalAnnualInterestRate,
-        preClosurePenalApplicable: this.fixedDepositsAccountData.preClosurePenalApplicable,
-        preClosurePenalInterest: this.fixedDepositsAccountData.preClosurePenalInterest,
-        preClosurePenalInterestOnType: this.fixedDepositsAccountData.preClosurePenalInterestOnType,
-        // Gate which RBI-mandated waiver reasons the dialog offers -- these two are the product's own
-        // facility toggles (Deceased Settlement / No Penalty Nominee-Heir Closure), off by default, so
-        // a product that never enabled them shouldn't offer a reason implying it did.
-        deceasedSettlement: this.fixedDepositsAccountData.deceasedSettlement,
-        noPenaltyNomineeHeirClosure: this.fixedDepositsAccountData.noPenaltyNomineeHeirClosure,
-        // Tenure context (current term's start date, maturity date, current balance) so the dialog can
-        // show how far into THIS term the account is and how much is actually sitting in it today, not
-        // just the penalty-adjusted amount calculatePrematureAmount returns. Deliberately the current
-        // term's own start (see currentTermStartDate), not the account's original activation -- a
-        // renewed FD's interest/tenure runs from the renewal, and showing the original activation date
-        // here would make an account renewed days ago look like it has been running for months.
-        activatedOnDate: this.currentTermStartDate,
-        maturityDate: this.fixedDepositsAccountData.maturityDate,
-        currentBalance: this.fixedDepositsAccountData.summary?.accountBalance
-      }
-    });
-    prematureCloseDialogRef.afterClosed().subscribe((response: any) => {
-      if (response?.confirm) {
-        this.reload();
-      }
-    });
-  }
-
   /**
    * Deletes Fixed Deposits Account.
    */
@@ -421,16 +360,7 @@ export class FixedDepositAccountViewComponent implements OnInit {
       if (response.confirm) {
         this.fixedDepositsService
           .executeFixedDepositsAccountCommand(this.fixedDepositsAccountData.id, 'postInterest', {})
-          .subscribe((commandResponse: any) => {
-            // Parked in the Checker Inbox rather than executed (HTTP 200 with
-            // rollbackTransaction: true), so the reload below shows no new interest posting.
-            if (commandResponse?.rollbackTransaction) {
-              this.alertService.alert({
-                type: 'Success',
-                message:
-                  'Interest posting has been sent for checker approval. No interest is posted until a checker approves it.'
-              });
-            }
+          .subscribe(() => {
             this.reload();
           });
       }

src/app/deposits/fixed-deposits/fixed-deposit-account-view/fixed-deposits-buttons.config.ts

@@ -57,12 +57,11 @@ export class FixedDepositsButtonsConfiguration {
         ];
         break;
       case 'Matured':
-        // 'Close' (the generic Fineract apply-maturity-instructions action) is deliberately left out
-        // here -- what happens to a matured FD is now handled either automatically by the nightly job
-        // (an account opened with an explicit instruction) or manually via the FD Dashboard's Renew
-        // action (an account left without one, backdated within grace / gap-interest after). Closing
-        // from here would go around both of those paths.
         this.buttonsArray = [
+          {
+            name: 'Close',
+            icon: 'fa fa-arrow-right'
+          },
           {
             name: 'Calculate Interest',
             icon: 'fa fa-table'
@@ -110,18 +109,7 @@ export class FixedDepositsButtonsConfiguration {
   setOptions(status: string) {
     switch (status) {
       case 'Active':
-        this.optionArray = [
-          {
-            name: 'Post Interest'
-          },
-          {
-            name: 'Add Charge'
-          }
-        ];
-        break;
       case 'Matured':
-        // Payment only makes sense once the deposit has actually matured -- an Active FD that needs
-        // closing early already has Premature Close for that.
         this.optionArray = [
           {
             name: 'Post Interest'

src/app/deposits/fixed-deposits/fixed-deposit-account-view/renewal-history-tab/renewal-history-tab.component.html

@@ -41,8 +41,8 @@
       ) {
         <div class="rh-node">
           <div class="rh-node__rail">
-            <span class="rh-node__dot" [class.rh-node__dot--active]="isTermActive(term, last)">
-              @if (isTermActive(term, last)) {
+            <span class="rh-node__dot" [class.rh-node__dot--active]="term.renewalstatus === 'ACTIVE'">
+              @if (term.renewalstatus === 'ACTIVE') {
                 <span class="rh-node__pulse"></span>
               }
             </span>
@@ -51,15 +51,15 @@
             }
           </div>
 
-          <div class="rh-card" [class.rh-card--active]="isTermActive(term, last)">
+          <div class="rh-card" [class.rh-card--active]="term.renewalstatus === 'ACTIVE'">
             <div class="rh-card__head">
               <div class="rh-card__title-group">
                 <h4 class="rh-card__title">
                   {{ term.renewalcycleno === 0 ? 'Original Term' : 'Renewal ' + term.renewalcycleno }}
                 </h4>
-                <span class="rh-badge" [class.rh-badge--active]="isTermActive(term, last)">
-                  <fa-icon [icon]="isTermActive(term, last) ? 'check-circle' : 'clock'"></fa-icon>
-                  {{ termStatusLabel(term, last) }}
+                <span class="rh-badge" [class.rh-badge--active]="term.renewalstatus === 'ACTIVE'">
+                  <fa-icon [icon]="term.renewalstatus === 'ACTIVE' ? 'check-circle' : 'clock'"></fa-icon>
+                  {{ term.renewalstatus === 'ACTIVE' ? 'Active' : 'Matured' }}
                 </span>
                 @if (renewalTypeLabel(term)) {
                   <span class="rh-tag">
@@ -95,7 +95,7 @@
               </div>
               <div class="rh-stat">
                 <span class="rh-stat__label">{{
-                  isTermActive(term, last) ? 'Interest So Far' : 'Interest Earned'
+                  term.renewalstatus === 'ACTIVE' ? 'Interest So Far' : 'Interest Earned'
                 }}</span>
                 <span class="rh-stat__value rh-stat__value--positive">
                   {{
@@ -106,7 +106,9 @@
                 </span>
               </div>
               <div class="rh-stat rh-stat--highlight">
-                <span class="rh-stat__label">{{ maturityLabel(term, last) }}</span>
+                <span class="rh-stat__label">{{
+                  term.maturedamount === null || term.maturedamount === undefined ? 'Projected Maturity' : 'Matured At'
+                }}</span>
                 <span class="rh-stat__value">
                   {{ maturityFor(term) | currency: currency.code : 'symbol-narrow' }}
                 </span>

src/app/deposits/fixed-deposits/fixed-deposit-account-view/renewal-history-tab/renewal-history-tab.component.ts

@@ -183,51 +183,6 @@ export class RenewalHistoryTabComponent implements OnInit {
     return term?.renewaltype === 'MANUAL' ? 'user-cog' : 'robot';
   }
 
-  /**
-   * Whether one term's card should show as "still running". `term.renewalstatus` only ever flips from
-   * ACTIVE to MATURED when a term rolls into its successor (see FixedDepositRenewalHistory#markMatured
-   * on the backend) -- a premature closure never touches that row, so the latest term's archived status
-   * would read ACTIVE forever even after the whole account has closed. For the LAST term only, this
-   * cross-checks the account's own live status instead of trusting the archived flag; every earlier
-   * term is reliably matured already (something renewed past it), so its own renewalstatus is
-   * trustworthy as-is and doesn't need the live account status at all.
-   */
-  isTermActive(term: any, isLast: boolean): boolean {
-    if (isLast && this.fixedDepositsAccountData?.status) {
-      return !!this.fixedDepositsAccountData.status.active;
-    }
-    return term?.renewalstatus === 'ACTIVE';
-  }
-
-  /** Badge text for one term's card -- see {@link isTermActive} for why the last term needs its own check. */
-  termStatusLabel(term: any, isLast: boolean): string {
-    if (this.isTermActive(term, isLast)) {
-      return 'Active';
-    }
-    if (isLast && this.fixedDepositsAccountData?.status?.prematureClosed) {
-      return 'Premature Closed';
-    }
-    return 'Matured';
-  }
-
-  /**
-   * Label for the maturity/value figure -- "Projected Maturity" only makes sense while the term is
-   * still genuinely running towards that projection. `term.maturedamount` (the archived settled value)
-   * is only ever written when a term rolls into its successor, same gap as {@link isTermActive}: a
-   * premature closure settles the account without ever touching that column, so the last term would
-   * keep reading as a live projection forever even though the figure showing is already the final,
-   * settled one (see {@link maturityFor}).
-   */
-  maturityLabel(term: any, isLast: boolean): string {
-    if (term?.maturedamount != null) {
-      return 'Matured At';
-    }
-    if (isLast && !this.isTermActive(term, isLast)) {
-      return 'Closed At';
-    }
-    return 'Projected Maturity';
-  }
-
   /**
    * The rate-by-tenure chart for one term of this FD's history, normalised to one shape regardless of source.
    *

src/app/deposits/fixed-deposits/fixed-deposit-account-view/transactions-tab/transactions-tab.component.html

@@ -130,6 +130,12 @@
                 <mat-icon><fa-icon icon="eye" size="sm"></fa-icon></mat-icon>
                 <span>{{ 'labels.text.View Transaction' | translate }}</span>
               </button>
+              @if (!isFirstTransaction(idx)) {
+                <button mat-menu-item (click)="undoTransaction(transaction)">
+                  <mat-icon><fa-icon icon="undo" size="sm"></fa-icon></mat-icon>
+                  <span>{{ 'tooltips.Undo Transaction' | translate }}</span>
+                </button>
+              }
               <button
                 mat-menu-item
                 (click)="routeEdit($event)"

src/app/deposits/fixed-deposits/fixed-deposit-account-view/view-transaction/view-transaction.component.html

@@ -6,7 +6,20 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<div class="container m-b-20 align-end-center gap-2percent"></div>
+<div class="container m-b-20 align-end-center gap-2percent">
+  @if (allowUndo()) {
+    <span>
+      <button
+        mat-raised-button
+        color="warn"
+        *mifosxHasPermission="'UNDOTRANSACTION_SAVINGSACCOUNT'"
+        (click)="undoTransaction()"
+      >
+        <fa-icon icon="undo" class="m-r-10"></fa-icon>Undo
+      </button>
+    </span>
+  }
+</div>
 <div class="container">
   <mat-card>
     <mat-card-content>

src/app/deposits/fixed-deposits/fixed-deposits-account-actions/approve-fixed-deposits-account/approve-fixed-deposits-account.component.ts

@@ -11,7 +11,6 @@ import { Component, OnInit, inject } from '@angular/core';
 import { UntypedFormGroup, UntypedFormBuilder, Validators, ReactiveFormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 import { Dates } from 'app/core/utils/dates';
-import { AlertService } from 'app/core/alert/alert.service';
 
 /** Custom Services */
 import { FixedDepositsService } from 'app/deposits/fixed-deposits/fixed-deposits.service';
@@ -38,7 +37,6 @@ export class ApproveFixedDepositsAccountComponent implements OnInit {
   private route = inject(ActivatedRoute);
   private router = inject(Router);
   private settingsService = inject(SettingsService);
-  private alertService = inject(AlertService);
 
   /** Minimum date allowed. */
   minDate = new Date(2000, 0, 1);
@@ -100,31 +98,17 @@ export class ApproveFixedDepositsAccountComponent implements OnInit {
       dateFormat,
       locale
     };
-    this.fixedDepositsService
-      .executeFixedDepositsAccountCommand(this.accountId, 'approve', data)
-      .subscribe((response: any) => {
-        // Parked in the Checker Inbox rather than executed (HTTP 200 with rollbackTransaction: true).
-        // The account is therefore still pending, so chaining activation onto it would be applied to an
-        // unapproved account -- stop here and say what is actually waiting.
-        if (response?.rollbackTransaction) {
-          this.alertService.alert({
-            type: 'Success',
-            message:
-              'This approval has been sent for checker approval. The account stays pending until a checker approves it.'
-          });
+    this.fixedDepositsService.executeFixedDepositsAccountCommand(this.accountId, 'approve', data).subscribe(() => {
+      const activationData = {
+        activatedOnDate: approveFixedDepositsAccountFormData.approvedOnDate,
+        dateFormat,
+        locale
+      };
+      this.fixedDepositsService
+        .executeFixedDepositsAccountCommand(this.accountId, 'activate', activationData)
+        .subscribe(() => {
           this.router.navigate(['../../'], { relativeTo: this.route });
-          return;
-        }
-        const activationData = {
-          activatedOnDate: approveFixedDepositsAccountFormData.approvedOnDate,
-          dateFormat,
-          locale
-        };
-        this.fixedDepositsService
-          .executeFixedDepositsAccountCommand(this.accountId, 'activate', activationData)
-          .subscribe(() => {
-            this.router.navigate(['../../'], { relativeTo: this.route });
-          });
-      });
+        });
+    });
   }
 }