fix: restore content silently dropped from the dev merge (KYC exception, TDS reports, Form 121)

The demo-backup merge's git 3-way auto-resolve dropped several hunks without flagging conflicts, wherever demo had independently touched adjacent lines: the KYC Exception feature (client-kyc-step, kyc-tab, create-client, clients.service — checkbox, derivation logic, banners, contact-log endpoints), TDS report routes/menu links (reports-routing, shell), the Form 121 client tab (clients-routing, clients-view), the kyc-management exceptions dashboard, and the Form 121/15G-H register's real-data view integration. Restored by diffing demo-backup against dev per file and re-applying each genuine gap while preserving demo-backup's own independent work (Approval Center tab style, Loan Origination/Investment menus, form-97-98/risk-review report routes).
2026-08-06 15:12:06 +05:30
parent 7e69468995
commit 89bb76455e
17 changed files with 2136 additions and 316 deletions
@@ -966,6 +966,38 @@ export class ClientGeneralStepComponent implements OnInit, OnDestroy, OnChanges

    this.linkMonthlyAnnual('monthlyIncome', 'annualIncome');
    this.linkMonthlyAnnual('monthlyTurnover', 'annualTurnover');
+    this.linkIncomeToTurnover();
+  }
+
+  /**
+   * Auto-calculates turnover based on income (doubling monthly income for monthly turnover,
+   * and annual income for annual/yearly turnover).
+   */
+  private linkIncomeToTurnover(): void {
+    const monthlyIncome = this.createClientForm.get('monthlyIncome');
+    const monthlyTurnover = this.createClientForm.get('monthlyTurnover');
+    const annualIncome = this.createClientForm.get('annualIncome');
+    const annualTurnover = this.createClientForm.get('annualTurnover');
+
+    if (monthlyIncome && monthlyTurnover) {
+      monthlyIncome.valueChanges.subscribe((value) => {
+        if (this.suppressMonthlyAnnualLink) {
+          return;
+        }
+        const num = parseFloat(value);
+        monthlyTurnover.setValue(!isNaN(num) && num >= 0 ? this.round2(num * 2) : '', { emitEvent: true });
+      });
+    }
+
+    if (annualIncome && annualTurnover) {
+      annualIncome.valueChanges.subscribe((value) => {
+        if (this.suppressMonthlyAnnualLink) {
+          return;
+        }
+        const num = parseFloat(value);
+        annualTurnover.setValue(!isNaN(num) && num >= 0 ? this.round2(num * 2) : '', { emitEvent: true });
+      });
+    }
  }

  /**
@@ -723,6 +723,53 @@
        <span>PAN verification requires client to be created first. Complete General tab and click Next to save.</span>
      </div>
    }
+
+    <!-- KYC Exception Flag -->
+    <div
+      class="exception-flag-box"
+      style="
+        margin-top: 20px;
+        padding: 16px;
+        border: 1px solid #f59e0b;
+        background: #fffbeb;
+        border-radius: 8px;
+        clear: both;
+      "
+    >
+      <h5
+        style="
+          margin: 0 0 12px 0;
+          font-size: 14px;
+          font-weight: 600;
+          color: #b45309;
+          display: flex;
+          align-items: center;
+          gap: 8px;
+        "
+      >
+        <fa-icon icon="exclamation-triangle"></fa-icon>
+        KYC Exception Flag
+      </h5>
+      <div style="display: flex; align-items: center; gap: 20px; flex-wrap: wrap">
+        <mat-checkbox formControlName="isException">Mark as KYC Exception</mat-checkbox>
+
+        @if (kycForm.get('isException')?.value) {
+          <mat-form-field appearance="outline" style="flex: 1; min-width: 280px; margin-bottom: -1.25em">
+            <mat-label>Exception Reasons</mat-label>
+            <mat-select formControlName="exceptionReason" multiple>
+              @if (!isNonIndividual) {
+                <mat-option value="PAN Card Verification Failed">PAN Card Verification Failed</mat-option>
+                <mat-option value="Aadhaar Verification Failed">Aadhaar Verification Failed</mat-option>
+              } @else {
+                <mat-option value="Enterprise PAN Verification Failed">Enterprise PAN Verification Failed</mat-option>
+                <mat-option value="GSTIN Verification Failed">GSTIN Verification Failed</mat-option>
+                <mat-option value="CIN Verification Failed">CIN Verification Failed</mat-option>
+              }
+            </mat-select>
+          </mat-form-field>
+        }
+      </div>
+    </div>
  </div>

  <!-- ═══ SECTION: KYC Document Management ═══ -->
@@ -29,6 +29,7 @@ import { ClientsService } from '../../clients.service';
 import { SettingsService } from 'app/settings/settings.service';
 import { Dates } from 'app/core/utils/dates';
 import { ProofType, normalizeProofType, groupProofsByCategory } from '../../shared/kyc-proof-types';
+import { deriveKycExceptionFields } from '../../kyc-exception.util';
 import { KycUploadHelperService } from '../../shared/kyc-upload-helper.service';
 import { CaptureImageDialogComponent } from '../../clients-view/custom-dialogs/capture-image-dialog/capture-image-dialog.component';
 import { DrawSignatureDialogComponent } from '../../clients-view/custom-dialogs/draw-signature-dialog/draw-signature-dialog.component';
@@ -152,7 +153,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
    kycDocumentName: 'KYC Document Type',
    kycDocumentNumber: 'KYC Document Number',
    amlCheckStatus: 'AML Check Status',
-    bannedEntityMatch: 'Banned Entity List Match'
+    bannedEntityMatch: 'Banned Entity List Match',
+    remarks: 'Reason for Re-edit'
  };

  /** Names every currently-invalid `kycForm` control (required-but-empty, or an entered value
@@ -274,6 +276,14 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
  riskCalculationReason = '';
  showRiskRulesTable = false;

+  /**
+   * Exception state as last read back from the server. Needed to tell "this client never had an
+   * exception" from "this client had one and has now cleared it" — only the latter should be
+   * stamped resolved and surface in the Resolved tab.
+   */
+  persistedIsException = false;
+  persistedExceptionReason: string | null = null;
+
  /** PAN verification */
  panVerifyStatus: 'NONE' | 'VERIFIED' | 'FAILED' = 'NONE';
  panVerifying = false;
@@ -423,8 +433,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
    aadhaarNumber: [
      '',
      [
-        Validators.pattern(/^\d{12}$/),
-        Validators.maxLength(12)
+        Validators.pattern(/^(\d{12}|[X•*\s\d]{12,14})$/),
+        Validators.maxLength(14)
      ]
    ],
    panAadhaarSeedingStatus: [''],
@@ -468,6 +478,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
    allowRiskOverride: [false],
    allowAmlOverride: [false],
    remarks: [''],
+    isException: [false],
+    exceptionReason: [[]],
    amlCheckStatus: [
      'CLEAR',
      Validators.required
@@ -610,8 +622,12 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
      dormantFlag: 'ACTIVE',
      accountStatus: 'ACTIVE',
      form60Type: 'FORM_60',
-      form15Type: '15G'
+      form15Type: '15G',
+      isException: false,
+      exceptionReason: []
    });
+    this.persistedIsException = false;
+    this.persistedExceptionReason = null;
    this.kycId = '';
    this.kycLoaded = false;
    this.kycStatus = 0;
@@ -942,8 +958,18 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
            form60Date: parseDate(data.form60Date),
            form15Applicable: data.form15Applicable || false,
            form15Type: data.form15Type || '15G',
-            form15FY: data.form15FY || ''
+            form15FY: data.form15FY || '',
+            isException: data.isException || false,
+            exceptionReason: data.exceptionReason ? data.exceptionReason.split(', ') : []
          });
+          // Set remarks as required if KYC is verified
+          if (this.isKycVerified) {
+            this.kycForm.get('remarks')?.setValidators(Validators.required);
+            this.kycForm.get('remarks')?.updateValueAndValidity();
+            this.kycForm.get('remarks')?.markAsTouched(); // Force red underline so user knows it's blocking
+          }
+          this.persistedIsException = data.isException === true;
+          this.persistedExceptionReason = data.exceptionReason || null;
          // Sync chip-picker selection with the prefilled document name
          if (data.kycDocumentName) {
            this.selectedKycDoc = this.kycDocProofs.find((p) => p.name === data.kycDocumentName) || null;
@@ -1843,7 +1869,23 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
      form15Applicable: v.form15Applicable || false,
      form15Type: v.form15Type || null,
      form15FY: v.form15FY || null,
-      remarks: v.remarks || null
+      remarks: v.remarks || null,
+      // Exception state is DERIVED from verification status, not from a checkbox — an unverified
+      // or blank PAN/Aadhaar is an exception by definition, so the officer cannot forget to flag
+      // it. See deriveKycExceptionFields() for the raise / narrow / close rules.
+      ...deriveKycExceptionFields({
+        panVerified: this.isNonIndividual
+          ? this.entPanVerifyStatus === 'VERIFIED'
+          : this.panVerifyStatus === 'VERIFIED',
+        aadhaarVerified: this.aadhaarVerifyStatus === 'VERIFIED',
+        // Non-individual clients submit a dummy masked Aadhaar, so checking it would saddle every
+        // company with a permanent exception.
+        aadhaarApplicable: !this.isNonIndividual,
+        hadException: this.persistedIsException,
+        previousReason: this.persistedExceptionReason,
+        manualReasons: Array.isArray(v.exceptionReason) ? v.exceptionReason : [],
+        todayFormatted: this.dateUtils.formatDate(new Date(), dateFormat)
+      })
    };
  }

@@ -1856,7 +1898,8 @@ export class ClientKycStepComponent implements OnInit, OnChanges, OnDestroy {
      v.enterprisePan ||
      v.cinNumber ||
      v.kycDocumentName ||
-      v.form15Applicable
+      v.form15Applicable ||
+      v.isException
    );
  }

@@ -60,6 +60,7 @@ import { ClientCollateralResolver } from './common-resolvers/client-collateral.r
 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 { EntityClassificationTabComponent } from './clients-view/entity-classification-tab/entity-classification-tab.component';
 import { familyAllowedGuard, nomineeAllowedGuard } from './utils/family-nominee.guard';

@@ -193,6 +194,11 @@ const routes: Routes = [
              component: Form60TabComponent,
              data: { title: 'Form 97', breadcrumb: 'Form 97', routeParamBreadcrumb: false }
            },
+            {
+              path: 'form121',
+              component: Form121TabComponent,
+              data: { title: 'Form 121 / TDS', breadcrumb: 'Form 121 / TDS', routeParamBreadcrumb: false }
+            },
            {
              path: 'documents',
              component: DocumentsTabComponent,
@@ -545,6 +545,15 @@
      >
        <i class="fa fa-file-text cv-tab-icon"></i> {{ 'labels.inputs.Form 60' | translate }}
      </a>
+      <a
+        mat-tab-link
+        [routerLink]="['./form121']"
+        routerLinkActive
+        #form121="routerLinkActive"
+        [active]="form121.isActive"
+      >
+        <i class="fa fa-percent cv-tab-icon"></i> Form 121 / TDS
+      </a>
      <a
        mat-tab-link
        [routerLink]="['./documents']"
@@ -42,6 +42,32 @@

    <!-- KYC Summary (read-only when not in edit mode) -->
    @if (!isEditMode && kycData) {
+      @if (kycData.isException && !kycData.exceptionResolved) {
+        <div
+          class="kyc-exception-banner"
+          style="
+            background: #fef3c7;
+            border: 1px solid #f59e0b;
+            border-radius: 8px;
+            padding: 16px;
+            margin-bottom: 20px;
+            display: flex;
+            align-items: flex-start;
+            gap: 12px;
+          "
+        >
+          <mat-icon style="color: #d97706; margin-top: 2px">warning</mat-icon>
+          <div>
+            <strong style="color: #92400e; font-size: 14px">KYC Exception Active</strong>
+            <p style="color: #b45309; font-size: 13px; margin: 4px 0 0 0">
+              Account is open under a temporary KYC Exception. Reason:
+              <strong>{{ kycData.exceptionReason || 'Other' }}</strong
+              >. Please contact the customer and complete verification as soon as possible.
+            </p>
+          </div>
+        </div>
+      }
+
      <!-- Verification Table -->
      <div class="kv-table">
        <div class="kv-table__header">
@@ -740,6 +766,32 @@
                </mat-select>
              </mat-form-field>

+              <!-- KYC Exception Flag -->
+              <div
+                class="full-span exception-controls-row"
+                style="display: flex; align-items: center; gap: 20px; margin-bottom: 12px; flex-wrap: wrap"
+              >
+                <mat-checkbox formControlName="isException" style="margin-top: 8px">Mark as KYC Exception</mat-checkbox>
+
+                @if (kycForm.get('isException')?.value) {
+                  <mat-form-field appearance="outline" style="flex: 1; min-width: 250px">
+                    <mat-label>Exception Reasons</mat-label>
+                    <mat-select formControlName="exceptionReason" multiple>
+                      @if (!isNonIndividual) {
+                        <mat-option value="PAN Card Verification Failed">PAN Card Verification Failed</mat-option>
+                        <mat-option value="Aadhaar Verification Failed">Aadhaar Verification Failed</mat-option>
+                      } @else {
+                        <mat-option value="Enterprise PAN Verification Failed"
+                          >Enterprise PAN Verification Failed</mat-option
+                        >
+                        <mat-option value="GSTIN Verification Failed">GSTIN Verification Failed</mat-option>
+                        <mat-option value="CIN Verification Failed">CIN Verification Failed</mat-option>
+                      }
+                    </mat-select>
+                  </mat-form-field>
+                }
+              </div>
+
              <!-- Remarks -->
              <mat-form-field appearance="outline" class="full-span">
                <mat-label>{{ 'labels.inputs.Remarks' | translate }}</mat-label>
@@ -14,6 +14,7 @@ import { catchError, of, Subject, takeUntil } from 'rxjs';

 /** Custom Services */
 import { ClientsService } from '../../clients.service';
+import { deriveKycExceptionFields } from '../../kyc-exception.util';
 import { Dates } from 'app/core/utils/dates';
 import { jsPDF } from 'jspdf';
 import { MatIcon } from '@angular/material/icon';
@@ -121,7 +122,9 @@ export class KycTabComponent implements OnInit, OnDestroy {
      '',
      [Validators.pattern(/^[0-9]{2}[A-Z]{5}[0-9]{4}[A-Z]{1}[1-9A-Z]{1}Z[0-9A-Z]{1}$/)]
    ],
-    remarks: ['']
+    remarks: [''],
+    isException: [false],
+    exceptionReason: [[]]
  });

  ngOnInit(): void {
@@ -157,7 +160,9 @@ export class KycTabComponent implements OnInit, OnDestroy {
            // the full 12-digit number to re-verify, so don't pre-fill.
            aadhaarNumber: '',
            gstinNumber: data.gstinNumber || '',
-            remarks: data.remarks || ''
+            remarks: data.remarks || '',
+            isException: data.isException || false,
+            exceptionReason: data.exceptionReason ? data.exceptionReason.split(', ') : []
          });
        }
      });
@@ -195,6 +200,28 @@ export class KycTabComponent implements OnInit, OnDestroy {
    }
  }

+  /**
+   * Exception columns derived from verification status — see `deriveKycExceptionFields()`.
+   *
+   * A field counts as verified if it was verified in this session OR is already verified on the
+   * stored record; either way the customer has cleared that check. Verifying one of two
+   * outstanding items narrows the exception to the remaining one rather than closing it.
+   */
+  private buildExceptionFields() {
+    const panVerified = this.verificationStatus.pan === 'VERIFIED' || this.kycData?.panVerified === true;
+    const aadhaarVerified = this.verificationStatus.aadhaar === 'VERIFIED' || this.kycData?.aadhaarVerified === true;
+
+    return deriveKycExceptionFields({
+      panVerified,
+      aadhaarVerified,
+      aadhaarApplicable: !this.isNonIndividual,
+      hadException: this.kycData?.isException === true,
+      previousReason: this.kycData?.exceptionReason || null,
+      manualReasons: Array.isArray(this.kycForm.value.exceptionReason) ? this.kycForm.value.exceptionReason : [],
+      todayFormatted: this.dateUtils.formatDate(new Date(), 'dd MMMM yyyy')
+    });
+  }
+
  saveKyc(): void {
    if (this.kycForm.invalid) {
      return;
@@ -210,7 +237,10 @@ export class KycTabComponent implements OnInit, OnDestroy {
      panNumber: this.kycForm.value.panNumber || null,
      aadhaarNumberMasked: aadhaarMasked,
      gstinNumber: this.kycForm.value.gstinNumber || null,
-      remarks: this.kycForm.value.remarks || null
+      remarks: this.kycForm.value.remarks || null,
+      // dateFormat is required so the backend can parse exceptionResolvedOn when an exception closes.
+      dateFormat: 'dd MMMM yyyy',
+      ...this.buildExceptionFields()
    };

    if (!this.kycId) {
@@ -244,6 +274,38 @@ export class KycTabComponent implements OnInit, OnDestroy {
    });
  }

+  private saveKycBeforeVerify(callback: () => void, field: 'pan' | 'aadhaar' | 'gstin'): void {
+    if (this.isEditMode) {
+      const aadhaarRaw = this.kycForm.value.aadhaarNumber || '';
+      const aadhaarMasked = aadhaarRaw.length === 12 ? 'XXXXXXXX' + aadhaarRaw.slice(-4) : aadhaarRaw || null;
+      const payload: any = {
+        locale: 'en',
+        panNumber: this.kycForm.value.panNumber || null,
+        aadhaarNumberMasked: aadhaarMasked,
+        gstinNumber: this.kycForm.value.gstinNumber || null,
+        remarks: this.kycForm.value.remarks || null,
+        riskCategory: this.kycForm.value.riskCategory || 1,
+        dateFormat: 'dd MMMM yyyy',
+        ...this.buildExceptionFields()
+      };
+
+      this.clientsService.updateClientKyc(this.clientId, this.kycId, payload).subscribe({
+        next: () => {
+          this.loadKycData();
+          callback();
+        },
+        error: (err: any) => {
+          this.verifying[field] = false;
+          this.verificationStatus[field] = 'FAILED';
+          this.verificationError[field] =
+            err?.error?.defaultUserMessage || `Failed to update ${field.toUpperCase()} number before verification.`;
+        }
+      });
+    } else {
+      callback();
+    }
+  }
+
  verifyPAN(): void {
    if (!this.kycId) {
      this.verificationError.pan = 'KYC record not found. Save KYC details first.';
@@ -254,31 +316,33 @@ export class KycTabComponent implements OnInit, OnDestroy {
    this.verificationError.pan = null;
    this.verificationDetails.pan = null;

-    this.clientsService
-      .verifyPAN(this.clientId, this.kycId)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (response: any) => {
-          this.verifying.pan = false;
-          if (response?.changes?.panVerified) {
-            this.verificationStatus.pan = 'VERIFIED';
-            this.verificationDetails.pan = response.changes;
-            this.loadKycData();
-          } else {
+    this.saveKycBeforeVerify(() => {
+      this.clientsService
+        .verifyPAN(this.clientId, this.kycId)
+        .pipe(takeUntil(this.destroy$))
+        .subscribe({
+          next: (response: any) => {
+            this.verifying.pan = false;
+            if (response?.changes?.panVerified) {
+              this.verificationStatus.pan = 'VERIFIED';
+              this.verificationDetails.pan = response.changes;
+              this.loadKycData();
+            } else {
+              this.verificationStatus.pan = 'FAILED';
+              this.verificationError.pan = 'PAN verification failed.';
+            }
+          },
+          error: (err: any) => {
+            this.verifying.pan = false;
            this.verificationStatus.pan = 'FAILED';
-            this.verificationError.pan = 'PAN verification failed.';
+            this.verificationError.pan =
+              err?.error?.developerMessage ||
+              err?.error?.defaultUserMessage ||
+              err?.message ||
+              'PAN verification failed. Please try again.';
          }
-        },
-        error: (err: any) => {
-          this.verifying.pan = false;
-          this.verificationStatus.pan = 'FAILED';
-          this.verificationError.pan =
-            err?.error?.developerMessage ||
-            err?.error?.defaultUserMessage ||
-            err?.message ||
-            'PAN verification failed. Please try again.';
-        }
-      });
+        });
+    }, 'pan');
  }

  /** Show Aadhaar input in summary view for re-verification */
@@ -305,31 +369,33 @@ export class KycTabComponent implements OnInit, OnDestroy {
    this.aadhaarOtpSent = false;
    this.aadhaarOtp = '';

-    this.clientsService
-      .sendAadhaarOtp(this.clientId, this.kycId, aadhaar)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (response: any) => {
-          this.verifying.aadhaar = false;
-          const refNumber =
-            response?.changes?.aadhaarRefNumber ||
-            response?.aadhaarRefNumber ||
-            response?.changes?.referenceNumber ||
-            response?.resourceId;
-          this.aadhaarOtpSent = true;
-          this.aadhaarOtpReferenceId = refNumber || null;
-          this.verificationStatus.aadhaar = 'PENDING';
-        },
-        error: (err: any) => {
-          this.verifying.aadhaar = false;
-          this.verificationStatus.aadhaar = 'FAILED';
-          this.verificationError.aadhaar =
-            err?.error?.developerMessage ||
-            err?.error?.defaultUserMessage ||
-            err?.message ||
-            'Failed to send OTP. Please try again.';
-        }
-      });
+    this.saveKycBeforeVerify(() => {
+      this.clientsService
+        .sendAadhaarOtp(this.clientId, this.kycId, aadhaar)
+        .pipe(takeUntil(this.destroy$))
+        .subscribe({
+          next: (response: any) => {
+            this.verifying.aadhaar = false;
+            const refNumber =
+              response?.changes?.aadhaarRefNumber ||
+              response?.aadhaarRefNumber ||
+              response?.changes?.referenceNumber ||
+              response?.resourceId;
+            this.aadhaarOtpSent = true;
+            this.aadhaarOtpReferenceId = refNumber || null;
+            this.verificationStatus.aadhaar = 'PENDING';
+          },
+          error: (err: any) => {
+            this.verifying.aadhaar = false;
+            this.verificationStatus.aadhaar = 'FAILED';
+            this.verificationError.aadhaar =
+              err?.error?.developerMessage ||
+              err?.error?.defaultUserMessage ||
+              err?.message ||
+              'Failed to send OTP. Please try again.';
+          }
+        });
+    }, 'aadhaar');
  }

  /** Step 2: Verify OTP entered by user */
@@ -380,31 +446,33 @@ export class KycTabComponent implements OnInit, OnDestroy {
    this.verificationError.gstin = null;
    this.verificationDetails.gstin = null;

-    this.clientsService
-      .verifyGSTIN(this.clientId, this.kycId)
-      .pipe(takeUntil(this.destroy$))
-      .subscribe({
-        next: (response: any) => {
-          this.verifying.gstin = false;
-          if (response?.changes?.gstinVerified) {
-            this.verificationStatus.gstin = 'VERIFIED';
-            this.verificationDetails.gstin = response.changes;
-            this.loadKycData();
-          } else {
+    this.saveKycBeforeVerify(() => {
+      this.clientsService
+        .verifyGSTIN(this.clientId, this.kycId)
+        .pipe(takeUntil(this.destroy$))
+        .subscribe({
+          next: (response: any) => {
+            this.verifying.gstin = false;
+            if (response?.changes?.gstinVerified) {
+              this.verificationStatus.gstin = 'VERIFIED';
+              this.verificationDetails.gstin = response.changes;
+              this.loadKycData();
+            } else {
+              this.verificationStatus.gstin = 'FAILED';
+              this.verificationError.gstin = 'GSTIN verification failed.';
+            }
+          },
+          error: (err: any) => {
+            this.verifying.gstin = false;
            this.verificationStatus.gstin = 'FAILED';
-            this.verificationError.gstin = 'GSTIN verification failed.';
+            this.verificationError.gstin =
+              err?.error?.developerMessage ||
+              err?.error?.defaultUserMessage ||
+              err?.message ||
+              'GSTIN verification failed. Please try again.';
          }
-        },
-        error: (err: any) => {
-          this.verifying.gstin = false;
-          this.verificationStatus.gstin = 'FAILED';
-          this.verificationError.gstin =
-            err?.error?.developerMessage ||
-            err?.error?.defaultUserMessage ||
-            err?.message ||
-            'GSTIN verification failed. Please try again.';
-        }
-      });
+        });
+    }, 'gstin');
  }

  formatDate(date: any): string {
@@ -123,6 +123,20 @@ export class ClientsService {
    return this.http.post(`/clients/${clientId}/edit/reject`, { rejectReason: rejectReason || '' });
  }

+  /** Fetches the exact email content (subject, body, sentAt, openedAt) for a given pending edit.
+   *  Only populated after the Checker has approved and the send succeeded. */
+  getClientEditEmailPreview(clientId: string | number, pendingEditId: string | number) {
+    return this.http.get<{
+      emailSubject: string | null;
+      emailBody: string | null;
+      emailSent: boolean;
+      emailSentAt: string | null;
+      emailOpenedAt: string | null;
+      emailFrom: string | null;
+      emailTo: string | null;
+    }>(`/clients/${clientId}/edit/${pendingEditId}/email-preview`);
+  }
+
  getClientDataAndTemplate(clientId: string) {
    const httpParams = new HttpParams().set('template', 'true').set('staffInSelectedOfficeOnly', 'true');
    return this.http.get(`/clients/${clientId}`, { params: httpParams });
@@ -958,4 +972,33 @@ export class ClientsService {
  dispatchWelcomeKit(clientId: string | number, data: any): Observable<any> {
    return this.http.post(`/clients/${clientId}/welcomekit`, data);
  }
+
+  updateWelcomeKitStatus(welcomeKitId: number, status: string): Observable<any> {
+    return this.http.put(`/welcomekit/${welcomeKitId}`, { status });
+  }
+
+  getKycExceptions(resolved = false): Observable<any[]> {
+    return this.http.get<any[]>(`/kyc/exceptions?resolved=${resolved}`);
+  }
+
+  /**
+   * Records a KYC-exception outreach attempt against a customer, and — for the SMS, EMAIL and
+   * WHATSAPP channels — actually transmits the notice.
+   *
+   * The destination is resolved server-side from the client record; it is deliberately not part of
+   * this payload, so a tampered request cannot redirect a KYC notice elsewhere.
+   *
+   * Resolves with HTTP 200 even when delivery fails — inspect `deliveryStatus` / `delivered` on the
+   * response rather than assuming success, since the log row is written either way.
+   */
+  saveKycContactLog(
+    clientId: string | number,
+    data: { channel: string; notes: string; officerName?: string }
+  ): Observable<any> {
+    return this.http.post(`/kyc/exceptions/${clientId}/contact-log`, data);
+  }
+
+  getKycContactLog(clientId: string | number): Observable<any[]> {
+    return this.http.get<any[]>(`/kyc/exceptions/${clientId}/contact-log`);
+  }
 }
@@ -430,8 +430,22 @@ export class CreateClientComponent {
      }
      this.validationError = '';
      // Save KYC
-      if (this.clientKycStep?.hasKycData && !this.clientKycStep.kycId) {
-        this.clientsService.saveClientKyc(clientId, this.clientKycStep.kycData).subscribe({ error: () => {} });
+      if (this.clientKycStep?.hasKycData) {
+        if (!this.clientKycStep.kycId) {
+          this.clientsService.saveClientKyc(clientId, this.clientKycStep.kycData).subscribe({
+            next: (res: any) => {
+              if (this.clientKycStep) {
+                this.clientKycStep.kycId = res?.resourceId?.toString() || res?.entityId?.toString() || '';
+              }
+            },
+            error: () => {}
+          });
+        } else {
+          const { kycType, ...updatePayload } = this.clientKycStep.kycData;
+          this.clientsService
+            .updateClientKyc(clientId, this.clientKycStep.kycId, updatePayload)
+            .subscribe({ error: () => {} });
+        }
      }
      // Upload photo & signature
      if (this.clientKycStep?.photographFile) {
@@ -696,12 +710,20 @@ export class CreateClientComponent {
    // Persist the KYC document picker selection + uploaded files as a client identifier
    this.saveKycDocProof(clientId);

-    // Save KYC only if it wasn't already created during the KYC step
-    if (this.clientKycStep?.hasKycData && !this.clientKycStep.kycId) {
-      this.clientsService.saveClientKyc(clientId, this.clientKycStep.kycData).subscribe({
-        next: () => navigateToClient(),
-        error: () => navigateToClient()
-      });
+    // Save/update KYC to ensure latest exception fields are persisted
+    if (this.clientKycStep?.hasKycData) {
+      if (!this.clientKycStep.kycId) {
+        this.clientsService.saveClientKyc(clientId, this.clientKycStep.kycData).subscribe({
+          next: () => navigateToClient(),
+          error: () => navigateToClient()
+        });
+      } else {
+        const { kycType, ...updatePayload } = this.clientKycStep.kycData;
+        this.clientsService.updateClientKyc(clientId, this.clientKycStep.kycId, updatePayload).subscribe({
+          next: () => navigateToClient(),
+          error: () => navigateToClient()
+        });
+      }
    } else {
      navigateToClient();
    }