feat: account charges UI — current account, FD, RD stepper redesign

Redesigned create-account stepper UI for current accounts, fixed deposits,
and recurring deposits: updated layout, preview steps, interest rate chart
step, currency step, and detail step components. Savings preview styling
and currency step also updated.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

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

@@ -6,104 +6,143 @@
   file, You can obtain one at http://mozilla.org/MPL/2.0/.
 -->
 
-<div class="container">
-  <mat-stepper
-    orientation="vertical"
-    [linear]="false"
-    class="mat-elevation-z8"
-    labelPosition="bottom"
-    #currentAccountProductStepper
+<div class="cca-container">
+  <!-- Hero -->
+  <div class="cca-header">
+    <fa-icon icon="university" class="cca-header__icon"></fa-icon>
+    <div>
+      <h2 class="cca-header__title">Create Current Account</h2>
+      <div class="cca-header__sub">
+        Pick a product, confirm currency, set digital channels and review before submit.
+      </div>
+    </div>
+  </div>
+
+  <!-- Wizard tabs -->
+  <mat-tab-group
+    class="cca-tabs"
+    animationDuration="200ms"
+    [preserveContent]="true"
+    [(selectedIndex)]="selectedTabIndex"
   >
-    <ng-template matStepperIcon="number">
-      <fa-icon icon="pencil-alt" size="sm"></fa-icon>
-    </ng-template>
-
-    <ng-template matStepperIcon="edit">
-      <fa-icon icon="pencil-alt" size="sm"></fa-icon>
-    </ng-template>
-
-    <ng-template matStepperIcon="done">
-      <fa-icon icon="check" size="sm"></fa-icon>
-    </ng-template>
-
-    <ng-template matStepperIcon="error">
-      <fa-icon icon="exclamation-triangle" size="lg"></fa-icon>
-    </ng-template>
-
-    <ng-template matStepperIcon="preview">
-      <fa-icon icon="eye" size="sm"></fa-icon>
-    </ng-template>
-
-    <!-- Step 1: Details -->
-    <mat-step>
-      <ng-template matStepLabel>{{ 'labels.inputs.DETAILS' | translate }}</ng-template>
-
-      <mifosx-current-account-details-step
-        [currentAccountTemplate]="currentAccountTemplate"
-        (currentAccountProductTemplate)="setTemplate($event)"
-      >
-      </mifosx-current-account-details-step>
-    </mat-step>
-
-    @if (currentAccountProductTemplate) {
-      <!-- Step 2: Currency -->
-      <mat-step>
-        <ng-template matStepLabel>CURRENCY</ng-template>
-
-        <mifosx-current-account-currency-step
-          [currentAccountProductTemplate]="currentAccountProductTemplate"
-          [primaryClientId]="currentAccountTemplate?.clientId ?? null"
-        ></mifosx-current-account-currency-step>
-
-        <div class="layout-row align-center gap-2percent margin-t responsive-column">
-          <button mat-raised-button matStepperPrevious>
-            <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
-            {{ 'labels.buttons.Previous' | translate }}
-          </button>
-          <button mat-raised-button matStepperNext>
-            {{ 'labels.buttons.Next' | translate }}
-            <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
-          </button>
-        </div>
-      </mat-step>
-
-      <!-- Step 3: Digital -->
-      <mat-step>
-        <ng-template matStepLabel>DIGITAL</ng-template>
-
-        <mifosx-current-account-digital-step
-          [currentAccountProductTemplate]="currentAccountProductTemplate"
-        ></mifosx-current-account-digital-step>
-
-        <div class="layout-row align-center gap-2percent margin-t responsive-column">
-          <button mat-raised-button matStepperPrevious>
-            <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
-            {{ 'labels.buttons.Previous' | translate }}
-          </button>
-          <button mat-raised-button matStepperNext>
-            {{ 'labels.buttons.Next' | translate }}
-            <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
-          </button>
-        </div>
-      </mat-step>
-
-      <!-- Step 4: Preview -->
-      <mat-step completed>
-        <ng-template matStepLabel>{{ 'labels.inputs.PREVIEW' | translate }}</ng-template>
-        <mifosx-current-account-preview-step
-          [currentAccountProductTemplate]="currentAccountProductTemplate"
+    <!-- Tab 1: Product Classification + Details -->
+    <mat-tab>
+      <ng-template mat-tab-label>
+        <fa-icon icon="check-square" class="cca-tab__icon"></fa-icon>
+        Product
+      </ng-template>
+      <div class="cca-tab-body">
+        <mifosx-current-account-details-step
           [currentAccountTemplate]="currentAccountTemplate"
-          [currentAccountTermForm]="currentAccountTermForm"
-          [currentAccountSettingsForm]="currentAccountSettingsForm"
-          [currentAccountTermsForm]="currentAccountTermsForm"
-          [currentAccount]="currentAccount"
-          [currentAccountDigital]="currentAccountDigital"
-          [currentAccountNominees]="currentAccountCurrencyStep?.nominees ?? []"
-          [currentAccountCurrencyFlags]="currentAccountCurrencyFlags"
-          (submitEvent)="submit()"
+          [hideButtons]="true"
+          (currentAccountProductTemplate)="setTemplate($event)"
         >
-        </mifosx-current-account-preview-step>
-      </mat-step>
-    }
-  </mat-stepper>
+        </mifosx-current-account-details-step>
+
+        <div class="cca-actions">
+          <span class="cca-actions__spacer"></span>
+          <button mat-raised-button color="primary" [disabled]="!currentAccountProductTemplate" (click)="next()">
+            {{ 'labels.buttons.Next' | translate }}
+            <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
+          </button>
+        </div>
+      </div>
+    </mat-tab>
+
+    <!-- Tab 2: Currency -->
+    <mat-tab [disabled]="!currentAccountProductTemplate">
+      <ng-template mat-tab-label>
+        <fa-icon icon="dollar-sign" class="cca-tab__icon"></fa-icon>
+        Currency
+      </ng-template>
+      <div class="cca-tab-body">
+        @if (currentAccountProductTemplate) {
+          <mifosx-current-account-currency-step
+            [currentAccountProductTemplate]="currentAccountProductTemplate"
+            [primaryClientId]="currentAccountTemplate?.clientId ?? null"
+          ></mifosx-current-account-currency-step>
+        }
+
+        <div class="cca-actions">
+          <button mat-stroked-button (click)="prev()">
+            <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
+            {{ 'labels.buttons.Previous' | translate }}
+          </button>
+          <span class="cca-actions__spacer"></span>
+          <button mat-raised-button color="primary" (click)="next()">
+            {{ 'labels.buttons.Next' | translate }}
+            <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
+          </button>
+        </div>
+      </div>
+    </mat-tab>
+
+    <!-- Tab 3: Digital -->
+    <mat-tab [disabled]="!currentAccountProductTemplate">
+      <ng-template mat-tab-label>
+        <fa-icon icon="mobile-alt" class="cca-tab__icon"></fa-icon>
+        Digital
+      </ng-template>
+      <div class="cca-tab-body">
+        @if (currentAccountProductTemplate) {
+          <mifosx-current-account-digital-step
+            [currentAccountProductTemplate]="currentAccountProductTemplate"
+          ></mifosx-current-account-digital-step>
+        }
+
+        <div class="cca-actions">
+          <button mat-stroked-button (click)="prev()">
+            <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
+            {{ 'labels.buttons.Previous' | translate }}
+          </button>
+          <span class="cca-actions__spacer"></span>
+          <button mat-raised-button color="primary" (click)="next()">
+            {{ 'labels.buttons.Next' | translate }}
+            <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
+          </button>
+        </div>
+      </div>
+    </mat-tab>
+
+    <!-- Tab 4: Preview -->
+    <mat-tab [disabled]="!currentAccountProductTemplate">
+      <ng-template mat-tab-label>
+        <fa-icon icon="eye" class="cca-tab__icon"></fa-icon>
+        {{ 'labels.inputs.PREVIEW' | translate }}
+      </ng-template>
+      <div class="cca-tab-body">
+        @if (currentAccountProductTemplate) {
+          <mifosx-current-account-preview-step
+            [currentAccountProductTemplate]="currentAccountProductTemplate"
+            [currentAccountTemplate]="currentAccountTemplate"
+            [currentAccountTermForm]="currentAccountTermForm"
+            [currentAccountSettingsForm]="currentAccountSettingsForm"
+            [currentAccountTermsForm]="currentAccountTermsForm"
+            [currentAccount]="currentAccount"
+            [currentAccountDigital]="currentAccountDigital"
+            [currentAccountNominees]="currentAccountCurrencyStep?.nominees ?? []"
+            [currentAccountCurrencyFlags]="currentAccountCurrencyFlags"
+            [hideButtons]="true"
+            (submitEvent)="submit()"
+          >
+          </mifosx-current-account-preview-step>
+        }
+
+        <div class="cca-actions">
+          <button mat-stroked-button (click)="prev()">
+            <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
+            {{ 'labels.buttons.Previous' | translate }}
+          </button>
+          <span class="cca-actions__spacer"></span>
+          <button mat-stroked-button [routerLink]="['../..']">
+            {{ 'labels.buttons.Cancel' | translate }}
+          </button>
+          <button mat-raised-button color="primary" class="preview-submit-row__primary" (click)="submit()">
+            <fa-icon icon="check" class="m-r-10"></fa-icon>
+            {{ 'labels.buttons.Submit' | translate }}
+          </button>
+        </div>
+      </div>
+    </mat-tab>
+  </mat-tab-group>
 </div>

src/app/current-accounts/create-current-account/create-current-account.component.scss

@@ -6,75 +6,165 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-// Container styling with proper spacing and margins
-.container {
-  margin: 1.5rem auto;
-  max-width: 75rem;
-  width: 100%;
-  padding: 0 1.5rem;
-  box-sizing: border-box;
+$navy: #0d1b2a;
+$blue: #1e88e5;
+$blue-d: #1e40af;
+$indigo: #4f46e5;
+$border: #e2e8f0;
+
+.cca-container {
+  max-width: 1180px;
+  margin: 0 auto;
+  padding: 20px 24px;
 }
 
-// Material Stepper styling with proper spacing
-:host ::ng-deep mat-stepper {
-  background: transparent;
+/* ─── Hero header (matches Nexora pages) ────────────────────────────── */
+.cca-header {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-bottom: 16px;
 
-  .mat-step-header {
-    padding: 1rem 1.5rem;
-    margin-bottom: 0.5rem;
+  &__icon {
+    width: 44px;
+    height: 44px;
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 12px;
+    background: linear-gradient(135deg, $blue 0%, $indigo 100%);
+    color: #fff;
+    font-size: 18px;
+    box-shadow: 0 2px 8px rgb(29 78 216 / 25%);
+    flex-shrink: 0;
   }
 
-  .mat-step-content {
-    padding: 1.5rem;
-    margin: 1rem 0;
-    overflow: visible !important;
+  &__title {
+    margin: 0;
+    font-size: 20px;
+    font-weight: 800;
+    color: $navy;
+    line-height: 1.1;
+    letter-spacing: 0.02em;
+  }
+
+  &__sub {
+    margin-top: 2px;
+    font-size: 12.5px;
+    color: #64748b;
   }
 }
 
-// Form field spacing within steps
-:host ::ng-deep mat-step-content {
-  overflow: visible !important;
+/* ─── Wizard tab strip ──────────────────────────────────────────────── */
+.cca-tabs {
+  background: #fff;
+  border: 1px solid $border;
+  border-radius: 14px;
+  box-shadow: 0 1px 3px rgb(15 23 42 / 4%);
+  overflow: hidden;
 
-  mat-form-field {
-    margin-bottom: 1rem;
-    width: 100%;
-  }
-
-  .layout-row-wrap {
-    gap: 1rem;
-    margin-bottom: 1rem;
-  }
-}
-
-// Responsive design
-@media (width <= 768px) {
-  .container {
-    padding: 0 1rem;
-    margin: 1rem auto;
-  }
-
-  :host ::ng-deep mat-stepper {
-    .mat-step-content {
-      padding: 1rem;
-      margin: 0.75rem 0;
+  ::ng-deep {
+    .mat-mdc-tab-header {
+      background: #f8fafc;
+      border-bottom: 1px solid $border;
     }
 
-    .mat-step-header {
-      padding: 0.75rem 1rem;
+    .mat-mdc-tab {
+      min-width: 140px;
+      height: 50px;
+      padding: 0 22px;
+      font-size: 13px !important;
+      font-weight: 600 !important;
+      letter-spacing: 0.01em;
+      color: #475569 !important;
+      opacity: 1 !important;
+    }
+
+    .mat-mdc-tab:hover:not(.mdc-tab--active, .mat-mdc-tab-disabled) {
+      background: rgb(30 64 175 / 5%);
+      color: $navy !important;
+    }
+
+    .mat-mdc-tab.mdc-tab--active {
+      .mdc-tab__text-label {
+        color: $blue-d !important;
+        font-weight: 700 !important;
+      }
+    }
+
+    /* Active-tab underline indicator — slightly bolder than Material's default. */
+    .mdc-tab-indicator__content--underline {
+      border-color: $blue-d !important;
+      border-top-width: 3px !important;
+    }
+
+    .mat-mdc-tab.mat-mdc-tab-disabled {
+      opacity: 0.45 !important;
+      cursor: not-allowed;
+    }
+
+    .mat-mdc-tab-body-wrapper {
+      min-height: 320px;
+    }
+
+    .mat-mdc-tab-body,
+    .mat-mdc-tab-body-content {
+      overflow: visible !important;
     }
   }
 }
 
-@media (width <= 480px) {
-  .container {
-    padding: 0 0.75rem;
-    margin: 0.75rem auto;
-  }
+.cca-tab__icon {
+  margin-right: 8px;
+  font-size: 13px;
+}
 
-  :host ::ng-deep mat-stepper {
-    .mat-step-content {
-      padding: 0.75rem;
-      margin: 0.5rem 0;
-    }
+/* ─── Tab body + action bar ─────────────────────────────────────────── */
+.cca-tab-body {
+  padding: 24px;
+
+  @media (width <= 768px) {
+    padding: 16px;
   }
 }
+
+.cca-actions {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-top: 24px;
+  padding-top: 16px;
+  border-top: 1px solid #f1f5f9;
+
+  &__spacer {
+    flex: 1;
+  }
+
+  button {
+    height: 40px !important;
+    border-radius: 10px !important;
+    font-weight: 600 !important;
+    padding: 0 18px !important;
+  }
+}
+
+/* Utility helpers preserved from the prior stepper template. */
+.m-l-10 {
+  margin-left: 8px;
+}
+
+.m-r-10 {
+  margin-right: 8px;
+}
+
+button.preview-submit-row__primary,
+.mat-mdc-raised-button.mat-primary.preview-submit-row__primary,
+.preview-submit-row__primary {
+  background: linear-gradient(135deg, #10b981 0%, #047857 100%) !important;
+
+  --mdc-protected-button-container-color: transparent !important;
+  --mdc-filled-button-container-color: transparent !important;
+
+  color: #fff !important;
+  box-shadow: 0 4px 12px -2px rgb(4 120 87 / 35%) !important;
+}

src/app/current-accounts/create-current-account/create-current-account.component.ts

@@ -20,14 +20,7 @@ import { CurrentAccountsService } from '../current-accounts.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { AlertService } from 'app/core/alert/alert.service';
-import {
-  MatStepper,
-  MatStepperIcon,
-  MatStep,
-  MatStepLabel,
-  MatStepperNext,
-  MatStepperPrevious
-} from '@angular/material/stepper';
+import { MatTabsModule } from '@angular/material/tabs';
 import { FaIconComponent } from '@fortawesome/angular-fontawesome';
 import { CurrentAccountPreviewStepComponent } from '../current-account-stepper/current-account-preview-step/current-account-preview-step.component';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
@@ -42,13 +35,8 @@ import { FormGroup } from '@angular/forms';
   styleUrls: ['./create-current-account.component.scss'],
   imports: [
     ...STANDALONE_SHARED_IMPORTS,
-    MatStepper,
-    MatStepperIcon,
-    MatStepperNext,
-    MatStepperPrevious,
+    MatTabsModule,
     FaIconComponent,
-    MatStep,
-    MatStepLabel,
     CurrentAccountDetailsStepComponent,
     CurrentAccountCurrencyStepComponent,
     CurrentAccountDigitalStepComponent,
@@ -67,6 +55,10 @@ export class CreateCurrentAccountComponent {
   currentAccountTemplate: any;
   /** Current Account Product Template */
   currentAccountProductTemplate: any;
+  /** Currently visible wizard tab (0-indexed). */
+  selectedTabIndex = 0;
+  /** Total wizard tabs — Product, Currency, Digital, Preview. */
+  private readonly totalTabs = 4;
 
   @ViewChild(CurrentAccountDetailsStepComponent, { static: true })
   currentAccountDetailsStep: CurrentAccountDetailsStepComponent;
@@ -90,6 +82,18 @@ export class CreateCurrentAccountComponent {
     this.currentAccountProductTemplate = $event;
   }
 
+  next(): void {
+    if (this.selectedTabIndex < this.totalTabs - 1) {
+      this.selectedTabIndex += 1;
+    }
+  }
+
+  prev(): void {
+    if (this.selectedTabIndex > 0) {
+      this.selectedTabIndex -= 1;
+    }
+  }
+
   /**
    * Retrieves current account details form.
    */

src/app/current-accounts/current-account-stepper/current-account-currency-step/current-account-currency-step.component.ts

@@ -76,6 +76,13 @@ export class CurrentAccountCurrencyStepComponent implements OnChanges {
       this.nomineeError = 'This person is already added as a nominee.';
       return;
     }
+    const relationshipLower = data.relationshipName?.toLowerCase();
+    if (relationshipLower === 'father' || relationshipLower === 'mother' || relationshipLower === 'wife') {
+      if (this.nominees.some((n) => n.relationshipName?.toLowerCase() === relationshipLower)) {
+        this.nomineeError = `Only one ${data.relationshipName} can be added as a nominee.`;
+        return;
+      }
+    }
     const newTotal = this.totalShare + (+data.percentageShare || 0);
     if (newTotal > 100) {
       this.nomineeError = `Total share cannot exceed 100%. Remaining: ${this.remainingShare}%`;

src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.html

@@ -933,14 +933,16 @@
     </div>
   }
 
-  <div class="layout-row align-center gap-2percent margin-t responsive-column">
-    <button mat-raised-button matStepperPrevious disabled>
-      <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
-      {{ 'labels.buttons.Previous' | translate }}
-    </button>
-    <button mat-raised-button matStepperNext [disabled]="currentAccountDetailsForm.invalid">
-      {{ 'labels.buttons.Next' | translate }}
-      <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
-    </button>
-  </div>
+  @if (!hideButtons) {
+    <div class="layout-row align-center gap-2percent margin-t responsive-column">
+      <button mat-raised-button matStepperPrevious disabled>
+        <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
+        {{ 'labels.buttons.Previous' | translate }}
+      </button>
+      <button mat-raised-button matStepperNext [disabled]="currentAccountDetailsForm.invalid">
+        {{ 'labels.buttons.Next' | translate }}
+        <fa-icon icon="arrow-right" class="m-l-10"></fa-icon>
+      </button>
+    </div>
+  }
 </form>

src/app/current-accounts/current-account-stepper/current-account-details-step/current-account-details-step.component.ts

@@ -52,6 +52,7 @@ export class CurrentAccountDetailsStepComponent implements OnInit {
   private cdr = inject(ChangeDetectorRef);
 
   @Input() currentAccountTemplate: any;
+  @Input() hideButtons = false;
 
   minDate = new Date(2000, 0, 1);
   maxDate = new Date();

src/app/current-accounts/current-account-stepper/current-account-preview-step/current-account-preview-step.component.html

@@ -643,15 +643,18 @@
   }
 </div>
 
-<div class="layout-row responsive-column align-center gap-2px margin-t">
-  <button mat-raised-button matStepperPrevious>
-    <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
-    {{ 'labels.buttons.Previous' | translate }}
-  </button>
-  <button mat-raised-button [routerLink]="['../..']">
-    {{ 'labels.buttons.Cancel' | translate }}
-  </button>
-  <button mat-raised-button color="primary" (click)="submitEvent.emit()">
-    {{ 'labels.buttons.Submit' | translate }}
-  </button>
-</div>
+@if (!hideButtons) {
+  <div class="layout-row responsive-column align-center gap-2px margin-t">
+    <button mat-raised-button matStepperPrevious>
+      <fa-icon icon="arrow-left" class="m-r-10"></fa-icon>
+      {{ 'labels.buttons.Previous' | translate }}
+    </button>
+    <button mat-raised-button [routerLink]="['../..']">
+      {{ 'labels.buttons.Cancel' | translate }}
+    </button>
+    <button mat-raised-button color="primary" class="preview-submit-row__primary" (click)="submitEvent.emit()">
+      <fa-icon icon="check" class="m-r-10"></fa-icon>
+      {{ 'labels.buttons.Submit' | translate }}
+    </button>
+  </div>
+}

src/app/current-accounts/current-account-stepper/current-account-preview-step/current-account-preview-step.component.scss

@@ -459,3 +459,15 @@
   font-style: italic;
   margin: 0;
 }
+
+button.preview-submit-row__primary,
+.mat-mdc-raised-button.mat-primary.preview-submit-row__primary,
+.preview-submit-row__primary {
+  background: linear-gradient(135deg, #10b981 0%, #047857 100%) !important;
+
+  --mdc-protected-button-container-color: transparent !important;
+  --mdc-filled-button-container-color: transparent !important;
+
+  color: #fff !important;
+  box-shadow: 0 4px 12px -2px rgb(4 120 87 / 35%) !important;
+}

src/app/current-accounts/current-account-stepper/current-account-preview-step/current-account-preview-step.component.ts

@@ -85,6 +85,7 @@ export class CurrentAccountPreviewStepComponent implements OnChanges {
 
   @Input() currentAccountProductTemplate: any;
   @Input() currentAccountTemplate: any;
+  @Input() hideButtons = false;
   @Input() currentAccountTermsForm: any;
   @Input() currentAccountTermForm: any;
   @Input() currentAccountSettingsForm: any;