diff --git a/src/app/features/quotes/pages/quote-list/quote-list.component.ts b/src/app/features/quotes/pages/quote-list/quote-list.component.ts
index 34db129b..91c0f28e 100644
--- a/src/app/features/quotes/pages/quote-list/quote-list.component.ts
+++ b/src/app/features/quotes/pages/quote-list/quote-list.component.ts
@@ -16,6 +16,7 @@ import { QuoteDetailsModalComponent } from 'src/app/shared/quote-details-modal/q
 import { ChatModalComponent } from 'src/app/shared/chat-modal/chat-modal.component';
 import { AttachmentModalComponent } from 'src/app/shared/attachment-modal/attachment-modal.component';
 import { LoginInfo } from 'src/app/models/interfaces';
+import { QUOTE_STATUSES, TAILORED_STATUSES_LABELS_CUSTOMER, TAILORED_STATUSES_LABELS_PROVIDER } from 'src/app/models/quote.constants';
 import { environment } from 'src/environments/environment';
 
 @Component({
@@ -91,11 +92,11 @@ import { environment } from 'src/environments/environment';
             class="form-select rounded-md border-gray-300 dark:bg-gray-700 dark:border-gray-800 dark:text-white shadow-sm focus:border-indigo-500 focus:ring-indigo-500"
           >
             <option value="">All Statuses</option>
-            <option value="pending">Pending</option>
-            <option value="inProgress">In Progress</option>
-            <option value="approved">Approved</option>
-            <option value="cancelled">Cancelled</option>
-            <option value="accepted">Accepted</option>
+            <option [value]="QUOTE_STATUSES.PENDING">Pending</option>
+            <option [value]="QUOTE_STATUSES.IN_PROGRESS">In Progress</option>
+            <option [value]="QUOTE_STATUSES.APPROVED">Approved</option>
+            <option [value]="QUOTE_STATUSES.CANCELLED">Cancelled</option>
+            <option [value]="QUOTE_STATUSES.ACCEPTED">Accepted</option>
           </select>
         </div>
       </div>
@@ -169,7 +170,7 @@ import { environment } from 'src/environments/environment';
             <div class="col-span-1">
               <span class="status-badge px-2 inline-flex text-xs leading-5 font-semibold rounded-full"
                     [ngClass]="getStateClass(getPrimaryState(quote))">
-                {{ getPrimaryState(quote) }}
+                {{ getStatusLabel(quote) }}
               </span>
             </div>
 
@@ -412,7 +413,17 @@ export class QuoteListComponent implements OnInit {
   showStateUpdate = false;
   quoteToUpdate: Quote | null = null;
   selectedState: QuoteStateType | null = null;
-  availableStates: QuoteStateType[] = ['pending', 'inProgress', 'approved', 'rejected', 'cancelled', 'accepted'];
+  availableStates: QuoteStateType[] = [
+    QUOTE_STATUSES.PENDING,
+    QUOTE_STATUSES.IN_PROGRESS,
+    QUOTE_STATUSES.APPROVED,
+    QUOTE_STATUSES.REJECTED,
+    QUOTE_STATUSES.CANCELLED,
+    QUOTE_STATUSES.ACCEPTED
+  ];
+
+  // Expose constants to template
+  readonly QUOTE_STATUSES = QUOTE_STATUSES;
 
   // Role management
   selectedRole: 'customer' | 'seller' = 'customer';
@@ -469,13 +480,6 @@ export class QuoteListComponent implements OnInit {
       next: (quotes) => {
         this.quotes = quotes;
 
-        // Debug: Log quote states and product info
-        console.log('Loaded quotes:', quotes.length);
-        quotes.forEach(quote => {
-          console.log(`Quote ${this.extractShortId(quote.id)}: main state = "${quote.state}", primary state = "${this.getPrimaryState(quote)}"`);
-          const productOffering = quote.quoteItem?.[0]?.productOffering;
-          console.log(`  - productOffering:`, productOffering);
-        });
 
         // Enrich quote data with organization and product names
         this.enrichQuoteData(quotes);
@@ -653,10 +657,10 @@ export class QuoteListComponent implements OnInit {
 
     // If the current user is a provider (seller) and the quote is in progress,
     // automatically update the status to 'approved' after successful PDF upload
-    if (this.selectedRole === 'seller' && this.getPrimaryState(updatedQuote) === 'inProgress') {
+    if (this.selectedRole === 'seller' && this.getPrimaryState(updatedQuote) === QUOTE_STATUSES.IN_PROGRESS) {
       console.log('Provider uploaded PDF, updating quote status to approved:', updatedQuote.id);
-      
-      this.quoteService.updateQuoteStatus(updatedQuote.id!, 'approved').subscribe({
+
+      this.quoteService.updateQuoteStatus(updatedQuote.id!, QUOTE_STATUSES.APPROVED).subscribe({
         next: (approvedQuote) => {
           // Update the quote again with the new status
           const approvedIndex = this.quotes.findIndex(q => q.id === approvedQuote.id);
@@ -761,7 +765,7 @@ export class QuoteListComponent implements OnInit {
     this.acceptConfirmCallback = () => {
       console.log('Accepting quote request:', quote.id);
 
-      this.quoteService.updateQuoteStatus(quote.id!, 'inProgress').subscribe({
+      this.quoteService.updateQuoteStatus(quote.id!, QUOTE_STATUSES.IN_PROGRESS).subscribe({
         next: (updatedQuote) => {
           const index = this.quotes.findIndex(q => q.id === updatedQuote.id);
           if (index !== -1) {
@@ -787,7 +791,7 @@ export class QuoteListComponent implements OnInit {
     this.acceptConfirmCallback = () => {
       console.log('Customer accepting quotation:', quote.id);
 
-      this.quoteService.updateQuoteStatus(quote.id!, 'accepted').subscribe({
+      this.quoteService.updateQuoteStatus(quote.id!, QUOTE_STATUSES.ACCEPTED).subscribe({
         next: (updatedQuote) => {
           const index = this.quotes.findIndex(q => q.id === updatedQuote.id);
           if (index !== -1) {
@@ -881,7 +885,7 @@ export class QuoteListComponent implements OnInit {
     this.cancelConfirmCallback = () => {
       console.log('Cancelling quote:', quote.id);
 
-      this.quoteService.updateQuoteStatus(quote.id!, 'cancelled').subscribe({
+      this.quoteService.updateQuoteStatus(quote.id!, QUOTE_STATUSES.CANCELLED).subscribe({
         next: (updatedQuote) => {
           const index = this.quotes.findIndex(q => q.id === updatedQuote.id);
           if (index !== -1) {
@@ -989,38 +993,58 @@ export class QuoteListComponent implements OnInit {
     if (Array.isArray(quote.quoteItem) && quote.quoteItem.length > 0) {
       return quote.quoteItem[0].state || 'unknown';
     }
-    
+
     // Fallback to main quote state if quoteItem state is not available
     if (quote.state) {
       return quote.state;
     }
-    
+
     return 'unknown';
   }
 
+  /**
+   * Get user-friendly status label for a quote based on role
+   */
+  getStatusLabel(quote: Quote): string {
+    const state = this.getPrimaryState(quote);
+
+    // Use appropriate label based on user role
+    const labels = this.selectedRole === 'customer'
+      ? TAILORED_STATUSES_LABELS_CUSTOMER
+      : TAILORED_STATUSES_LABELS_PROVIDER;
+
+    // Map status to label
+    switch (state) {
+      case QUOTE_STATUSES.PENDING:
+        return labels.PENDING;
+      case QUOTE_STATUSES.IN_PROGRESS:
+        return labels.IN_PROGRESS;
+      case QUOTE_STATUSES.APPROVED:
+        return labels.APPROVED;
+      case QUOTE_STATUSES.ACCEPTED:
+        return labels.ACCEPTED;
+      case QUOTE_STATUSES.CANCELLED:
+        return labels.CANCELLED;
+      case QUOTE_STATUSES.REJECTED:
+        return labels.REJECTED;
+      default:
+        return state;
+    }
+  }
+
   hasAttachment(quote: Quote): boolean {
     return Array.isArray(quote.quoteItem) && 
            quote.quoteItem.some(qi => qi.attachment && qi.attachment.length > 0);
   }
 
   isQuoteCancelled(quote: Quote): boolean {
-    // Check quoteItem state first (this is where the actual state is stored)
-    if (quote.quoteItem?.some(item => item.state === 'cancelled')) {
-      return true;
-    }
-    
-    // Fallback to main quote state
-    return quote.state === 'cancelled';
+    // Only check quoteItem state (this is the source of truth)
+    return quote.quoteItem?.some(item => item.state === QUOTE_STATUSES.CANCELLED) || false;
   }
 
   isQuoteAccepted(quote: Quote): boolean {
-    // Check quoteItem state first (this is where the actual state is stored)
-    if (quote.quoteItem?.some(item => item.state === 'accepted')) {
-      return true;
-    }
-    
-    // Fallback to main quote state
-    return quote.state === 'accepted';
+    // Only check quoteItem state (this is the source of truth)
+    return quote.quoteItem?.some(item => item.state === QUOTE_STATUSES.ACCEPTED) || false;
   }
 
   isQuoteFinalized(quote: Quote): boolean {
@@ -1093,32 +1117,32 @@ export class QuoteListComponent implements OnInit {
 
   getStateDisplay(state: QuoteStateType | undefined): string {
     if (!state) return 'Unknown';
-    
+
     const stateMap: Record<QuoteStateType, string> = {
-      'pending': 'Pending',
-      'inProgress': 'In Progress',
-      'approved': 'Approved',
-      'rejected': 'Rejected',
-      'cancelled': 'Cancelled',
-      'accepted': 'Accepted'
+      [QUOTE_STATUSES.PENDING]: 'Pending',
+      [QUOTE_STATUSES.IN_PROGRESS]: 'In Progress',
+      [QUOTE_STATUSES.APPROVED]: 'Approved',
+      [QUOTE_STATUSES.REJECTED]: 'Rejected',
+      [QUOTE_STATUSES.CANCELLED]: 'Cancelled',
+      [QUOTE_STATUSES.ACCEPTED]: 'Accepted'
     };
-    
+
     return stateMap[state] || state;
   }
 
   getStateClass(state: string): string {
     switch (state) {
-      case 'pending':
+      case QUOTE_STATUSES.PENDING:
         return 'status-pending';
-      case 'inProgress':
+      case QUOTE_STATUSES.IN_PROGRESS:
         return 'status-inProgress';
-      case 'approved':
+      case QUOTE_STATUSES.APPROVED:
         return 'status-approved';
-      case 'rejected':
+      case QUOTE_STATUSES.REJECTED:
         return 'status-rejected';
-      case 'cancelled':
+      case QUOTE_STATUSES.CANCELLED:
         return 'status-cancelled';
-      case 'accepted':
+      case QUOTE_STATUSES.ACCEPTED:
         return 'status-accepted';
       default:
         return 'status-unknown';
@@ -1126,6 +1150,6 @@ export class QuoteListComponent implements OnInit {
   }
 
   canUpdateState(state: QuoteStateType | undefined): boolean {
-    return state !== 'cancelled' && state !== 'accepted';
+    return state !== QUOTE_STATUSES.CANCELLED && state !== QUOTE_STATUSES.ACCEPTED;
   }
 } 
\ No newline at end of file
diff --git a/src/app/features/quotes/services/quote.service.ts b/src/app/features/quotes/services/quote.service.ts
index 3a2eb091..b6263b41 100644
--- a/src/app/features/quotes/services/quote.service.ts
+++ b/src/app/features/quotes/services/quote.service.ts
@@ -4,6 +4,7 @@ import { Observable, map, forkJoin } from 'rxjs';
 import { Quote, Quote_Create, Quote_Update, QuoteStateType } from 'src/app/models/quote.model';
 import { Tender } from 'src/app/models/tender.model';
 import { ApiRole, API_ROLES } from 'src/app/models/roles.constants';
+import { QUOTE_STATUSES, QUOTE_CATEGORIES } from 'src/app/models/quote.constants';
 import { environment } from '../../../../environments/environment';
 
 @Injectable({
@@ -365,11 +366,11 @@ export class QuoteService {
   // Helper methods for quote status checking
   
   isQuoteCancelled(quote: Quote): boolean {
-    return quote.quoteItem?.some(item => item.state === 'cancelled') || false;
+    return quote.quoteItem?.some(item => item.state === QUOTE_STATUSES.CANCELLED) || false;
   }
 
   isQuoteAccepted(quote: Quote): boolean {
-    return quote.quoteItem?.some(item => item.state === 'accepted') || false;
+    return quote.quoteItem?.some(item => item.state === QUOTE_STATUSES.ACCEPTED) || false;
   }
 
   isQuoteFinalized(quote: Quote): boolean {
@@ -556,9 +557,9 @@ export class QuoteService {
 
     // Map quote category to tender category
     let category: 'coordinator' | 'tendering' = 'coordinator';
-    if (quote.category === 'tender') {
+    if (quote.category === QUOTE_CATEGORIES.TENDER) {
       category = 'tendering';
-    } else if (quote.category === 'coordinator') {
+    } else if (quote.category === QUOTE_CATEGORIES.COORDINATOR) {
       category = 'coordinator';
     }
 
@@ -578,18 +579,21 @@ export class QuoteService {
     // - approved → sent → 'launched'
     // - accepted/cancelled/rejected → closed → 'closed'
     let state: 'draft' | 'pre-launched' | 'pending' | 'sent' | 'closed' = 'draft';
-    if (quoteItemState === 'pending') state = 'draft';
-    else if (quoteItemState === 'inProgress') state = 'pre-launched';
-    else if (quoteItemState === 'approved') state = 'sent';
-    else if (quoteItemState === 'accepted') state = 'closed';
-    else if (quoteItemState === 'cancelled') state = 'closed';
-    else if (quoteItemState === 'rejected') state = 'closed';
-
-    // Extract external_id and provider from quote
+    if (quoteItemState === QUOTE_STATUSES.PENDING) state = 'draft';
+    else if (quoteItemState === QUOTE_STATUSES.IN_PROGRESS) state = 'pre-launched';
+    else if (quoteItemState === QUOTE_STATUSES.APPROVED) state = 'sent';
+    else if (quoteItemState === QUOTE_STATUSES.ACCEPTED) state = 'closed';
+    else if (quoteItemState === QUOTE_STATUSES.CANCELLED) state = 'closed';
+    else if (quoteItemState === QUOTE_STATUSES.REJECTED) state = 'closed';
+
+    // Extract external_id, provider and buyerPartyId from quote
     const external_id = quote.externalId;
     const provider = quote.relatedParty
       ?.find(party => party.role?.toLowerCase() === API_ROLES.SELLER.toLowerCase())
       ?.name;
+    const buyerPartyId = quote.relatedParty
+      ?.find(party => party.role?.toLowerCase() === API_ROLES.BUYER.toLowerCase())
+      ?.id;
 
     return {
       id: quote.id,
@@ -601,6 +605,7 @@ export class QuoteService {
       selectedProviders,
       external_id,
       provider,
+      buyerPartyId,
       createdAt: quote.quoteDate,
       updatedAt: quote.quoteDate,
       effectiveQuoteCompletionDate: quote.effectiveQuoteCompletionDate,
diff --git a/src/app/features/tenders/pages/tender-list/tender-list.component.ts b/src/app/features/tenders/pages/tender-list/tender-list.component.ts
index fb34824a..c7d34be7 100644
--- a/src/app/features/tenders/pages/tender-list/tender-list.component.ts
+++ b/src/app/features/tenders/pages/tender-list/tender-list.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, inject } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
@@ -7,6 +7,7 @@ import { switchMap } from 'rxjs/operators';
 import { QuoteService } from '../../../quotes/services/quote.service';
 import { LocalStorageService } from 'src/app/services/local-storage.service';
 import { NotificationService } from 'src/app/services/notification.service';
+import { AccountServiceService } from 'src/app/services/account-service.service';
 import { Tender, TenderAttachment } from 'src/app/models/tender.model';
 import { Quote, QuoteStateType } from 'src/app/models/quote.model';
 import { LoginInfo } from 'src/app/models/interfaces';
@@ -17,24 +18,24 @@ import { ChatModalComponent } from 'src/app/shared/chat-modal/chat-modal.compone
 import { AttachmentModalComponent } from 'src/app/shared/attachment-modal/attachment-modal.component';
 import { CreateTenderModalComponent } from 'src/app/shared/create-tender-modal/create-tender-modal.component';
 import { UI_ROLES, API_ROLES, UiRole, toApiRole } from 'src/app/models/roles.constants';
-import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.constants';
+import { QUOTE_CATEGORIES, QUOTE_STATUSES, TENDER_COORDINATOR_STATUSES_LABELS, TENDER_RELATED_QUOTES_LABELS_CUSTOMER, TENDER_RELATED_QUOTES_LABELS_PROVIDER } from 'src/app/models/quote.constants';
 
 @Component({
   selector: 'app-quote-list',
   standalone: true,
   imports: [
-    CommonModule, 
-    FormsModule, 
-    NotificationComponent, 
-    ConfirmDialogComponent, 
-    QuoteDetailsModalComponent, 
-    ChatModalComponent, 
+    CommonModule,
+    FormsModule,
+    NotificationComponent,
+    ConfirmDialogComponent,
+    QuoteDetailsModalComponent,
+    ChatModalComponent,
     AttachmentModalComponent,
     CreateTenderModalComponent
   ],
   template: `
     <app-notification></app-notification>
-    
+
     <div class="w-full mx-auto px-6 py-8">
       <div class="flex justify-between items-center mb-6">
         <div class="flex items-center gap-3">
@@ -120,12 +121,12 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
           </select>
         </div>
       </div>
-      
+
       <!-- Loading State -->
       <div *ngIf="loading" class="flex justify-center items-center py-8">
         <div class="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
       </div>
-      
+
       <!-- Error State -->
       <div *ngIf="error" class="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded relative mb-4">
         <div class="flex">
@@ -140,7 +141,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
           </div>
         </div>
       </div>
-      
+
       <!-- Quotes List -->
       <div *ngIf="!loading && !error" class="bg-white dark:bg-gray-700 shadow-md rounded-lg overflow-hidden">
         <div *ngIf="filteredQuotes.length === 0" class="text-center py-12">
@@ -150,7 +151,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
           <h3 class="mt-2 text-sm font-medium text-gray-900 dark:text-white">No tenders found</h3>
           <p class="mt-1 text-sm text-gray-500 dark:text-gray-400">No tender requests to display</p>
         </div>
-        
+
         <!-- Provider View Header (matches Quote layout) -->
         <div *ngIf="filteredQuotes.length > 0 && selectedRole === UI_ROLES.SELLER" class="bg-gray-50 dark:bg-gray-800 px-6 py-3">
           <div class="grid grid-cols-12 gap-4 text-xs font-medium text-gray-500 dark:text-gray-300 uppercase tracking-wider">
@@ -174,7 +175,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
             <div class="col-span-4">ACTIONS</div>
           </div>
         </div>
-        
+
         <!-- ==================== PROVIDER VIEW ROWS (matches Quote layout) ==================== -->
         <ng-container *ngIf="selectedRole === UI_ROLES.SELLER">
           <div *ngFor="let quote of filteredQuotes" class="quote-row">
@@ -204,7 +205,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
               <div class="col-span-1">
                 <span class="status-badge px-2 inline-flex text-xs leading-5 font-semibold rounded-full"
                       [ngClass]="getStateClass(getQuoteItemState(quote))">
-                  {{ getQuoteItemState(quote) }}
+                  {{ getStatusLabel(quote) }}
                 </span>
               </div>
 
@@ -274,7 +275,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
               <div class="col-span-2">
                 <span class="status-badge px-2 inline-flex text-xs leading-5 font-semibold rounded-full"
                       [ngClass]="getStateClass(getQuoteItemState(quote))">
-                  {{ getQuoteItemState(quote) }}
+                  {{ getStatusLabel(quote) }}
                 </span>
               </div>
 
@@ -340,7 +341,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
 
                 <!-- Test: Start Tender (for coordinator quotes in pre-launched status) -->
                 <button
-                  *ngIf="quote.category === QUOTE_CATEGORIES.COORDINATOR && getPrimaryState(quote) === 'inProgress'"
+                  *ngIf="quote.category === QUOTE_CATEGORIES.COORDINATOR && getPrimaryState(quote) === QUOTE_STATUSES.IN_PROGRESS"
                   (click)="simulateStartTender(quote)"
                   class="px-2 py-1 text-xs font-medium transition-colors rounded border text-orange-600 hover:text-orange-800 border-orange-200 hover:bg-orange-50 flex items-center gap-1"
                   title="[TEST] Start tender - updates status to 'launched'"
@@ -353,7 +354,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
 
                 <!-- Test: Close Tender (for coordinator quotes in launched status) -->
                 <button
-                  *ngIf="quote.category === QUOTE_CATEGORIES.COORDINATOR && getPrimaryState(quote) === 'approved'"
+                  *ngIf="quote.category === QUOTE_CATEGORIES.COORDINATOR && getPrimaryState(quote) === QUOTE_STATUSES.APPROVED"
                   (click)="simulateCloseTender(quote)"
                   class="px-2 py-1 text-xs font-medium transition-colors rounded border text-purple-600 hover:text-purple-800 border-purple-200 hover:bg-purple-50 flex items-center gap-1"
                   title="[TEST] Close tender - updates status to 'closed'"
@@ -370,7 +371,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
           <div *ngIf="isExpanded(quote.id)" class="px-6 py-4 bg-gray-50 dark:bg-gray-800 border-t border-gray-200 dark:border-gray-600">
             <div class="ml-8">
               <h4 class="text-sm font-semibold text-gray-700 dark:text-gray-300 mb-3">Related Provider Quotes</h4>
-              
+
               <!-- Loading State -->
               <div *ngIf="isLoadingRelatedQuotes(quote.id)" class="flex items-center justify-center py-4">
                 <div class="animate-spin rounded-full h-6 w-6 border-b-2 border-blue-600"></div>
@@ -405,7 +406,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
                     <div class="col-span-2">
                       <span class="status-badge px-2 py-0.5 inline-flex text-xs leading-5 font-semibold rounded-full"
                             [ngClass]="getStateClass(getQuoteItemState(relatedQuote))">
-                        {{ getQuoteItemState(relatedQuote) }}
+                        {{ getStatusLabel(relatedQuote) }}
                       </span>
                     </div>
 
@@ -423,7 +424,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
                         <span class="text-xs truncate max-w-[80px]">{{ getAttachmentName(relatedQuote) }}</span>
                       </button>
                     </div>
-                    
+
                     <!-- Actions (matching Quote layout: Chat + Details button) -->
                     <div class="col-span-3 flex items-center gap-2">
                       <!-- Chat -->
@@ -496,11 +497,11 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
           <h3 class="text-lg font-medium text-gray-900 mb-4">Update Quote State</h3>
           <div class="space-y-3">
             <div *ngFor="let state of availableStates" class="flex items-center">
-              <input 
-                [id]="'state-' + state" 
-                [(ngModel)]="selectedState" 
-                [value]="state" 
-                type="radio" 
+              <input
+                [id]="'state-' + state"
+                [(ngModel)]="selectedState"
+                [value]="state"
+                type="radio"
                 class="focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300"
               >
               <label [for]="'state-' + state" class="ml-3 block text-sm font-medium text-gray-700">
@@ -551,7 +552,7 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
       (close)="closeAttachmentModal()"
       (uploadSuccess)="onAttachmentUploaded($event)"
     ></app-attachment-modal>
-    
+
     <!-- Broadcast Message Modal -->
     <div *ngIf="showBroadcastModal" class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-50">
       <div class="relative top-20 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white">
@@ -596,31 +597,31 @@ import { QUOTE_CATEGORIES, TENDER_CATEGORIES } from 'src/app/models/quote.consta
     .status-badge {
       @apply inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium;
     }
-    
+
     .status-pending {
       @apply bg-yellow-100 text-yellow-800;
     }
-    
+
     .status-inProgress {
       @apply bg-blue-100 text-blue-800;
     }
-    
+
     .status-approved {
       @apply bg-green-100 text-green-800;
     }
-    
+
     .status-rejected {
       @apply bg-red-100 text-red-800;
     }
-    
+
     .status-cancelled {
       @apply bg-gray-100 text-gray-800;
     }
-    
+
     .status-accepted {
       @apply bg-emerald-100 text-emerald-800;
     }
-    
+
     .status-unknown {
       @apply bg-gray-100 text-gray-600;
     }
@@ -651,6 +652,7 @@ export class TenderListComponent implements OnInit {
   private quoteService = inject(QuoteService);
   private localStorage = inject(LocalStorageService);
   private notificationService = inject(NotificationService);
+  private accountService = inject(AccountServiceService);
 
   quotes: Quote[] = [];
   filteredQuotes: Quote[] = [];
@@ -669,10 +671,11 @@ export class TenderListComponent implements OnInit {
   // Role management
   selectedRole: UiRole = UI_ROLES.BUYER;
   currentUserId: string | null = null;
-  
+
   // Expose constants to template
   readonly UI_ROLES = UI_ROLES;
   readonly QUOTE_CATEGORIES = QUOTE_CATEGORIES;
+  readonly QUOTE_STATUSES = QUOTE_STATUSES;
 
   // Filtering
   statusFilter: string = '';
@@ -716,7 +719,10 @@ export class TenderListComponent implements OnInit {
   coordinatorQuoteStatesMap: Map<string, string> = new Map();
   loadingCoordinatorStates: Set<string> = new Set();
 
-  
+  // Data enrichment maps
+  organizationNames: Map<string, string> = new Map();
+
+
 
   ngOnInit() {
     // Get user ID from localStorage (BAE Frontend pattern)
@@ -746,28 +752,31 @@ export class TenderListComponent implements OnInit {
 
     // Use specific API endpoints based on role
     let quotesObservable: Observable<Quote[]>;
-    
+
     if (this.selectedRole === UI_ROLES.BUYER) {
       // Buyer view: Get coordinator quotes they created
       quotesObservable = this.quoteService.getCoordinatorQuotesByUser(this.currentUserId).pipe(
         map((tenders: Tender[]) => tenders.map((t: Tender) => this.mapTenderToQuote(t)))
       );
     } else {
-      // Seller/Provider view: Get tendering quotes they received  
+      // Seller/Provider view: Get tendering quotes they received
       quotesObservable = this.quoteService.getTenderingQuotesByUser(this.currentUserId, toApiRole(this.selectedRole)).pipe(
         map((tenders: Tender[]) => tenders.map((t: Tender) => this.mapTenderToQuote(t)))
       );
     }
-    
+
     quotesObservable.subscribe({
       next: (quotes: Quote[]) => {
         // Use quotes as-is to preserve quoteItem.state
         this.quotes = quotes;
-        
+
+        // Enrich with organisation trading names
+        this.enrichQuoteData(quotes);
+
         // Debug: Log quote states and externalId
         console.log(`Loaded ${this.quotes.length} quotes as ${this.selectedRole}`);
         console.log(`Current user ID: ${this.currentUserId}`);
-        
+
         this.quotes.forEach(quote => {
           console.log(`Quote ${this.extractShortId(quote.id)}:`, {
             category: quote.category,
@@ -777,16 +786,16 @@ export class TenderListComponent implements OnInit {
             id: quote.id,
             relatedParty: quote.relatedParty
           });
-          
+
           // For provider view, check if this quote is related to current user
           if (this.selectedRole === UI_ROLES.SELLER) {
-            const isRelatedToUser = quote.relatedParty?.some(party => 
+            const isRelatedToUser = quote.relatedParty?.some(party =>
               party.id === this.currentUserId && party.role?.toLowerCase() === UI_ROLES.SELLER
             );
             console.log(`  -> Quote ${this.extractShortId(quote.id)} related to current provider? ${isRelatedToUser}`);
           }
         });
-        
+
         // If in seller mode, load coordinator states for tendering quotes BEFORE filtering
         if (this.selectedRole === UI_ROLES.SELLER) {
           this.loadCoordinatorStatesForTenderingQuotes().subscribe({
@@ -817,7 +826,7 @@ export class TenderListComponent implements OnInit {
   private mapTenderToQuote(tender: Tender): Quote {
     // Build quoteItem with state and attachment (if exists)
     const quoteItem: any = { state: this.mapTenderStateToQuoteState(tender.state) };
-    
+
     // Include attachment if present in tender
     if (tender.attachment) {
       quoteItem.attachment = [{
@@ -827,7 +836,7 @@ export class TenderListComponent implements OnInit {
         size: tender.attachment.size ? { amount: tender.attachment.size, units: 'bytes' } : undefined
       }];
     }
-    
+
     return {
       id: tender.id,
       href: '',
@@ -837,14 +846,21 @@ export class TenderListComponent implements OnInit {
       expectedFulfillmentStartDate: tender.expectedFulfillmentStartDate,
       state: this.mapTenderStateToQuoteState(tender.state),
       // Map category back: 'tendering' -> 'tender', 'coordinator' -> 'coordinator'
-      category: tender.category === TENDER_CATEGORIES.TENDERING ? QUOTE_CATEGORIES.TENDER : tender.category,
+      category: tender.category === 'tendering' ? QUOTE_CATEGORIES.TENDER : QUOTE_CATEGORIES.COORDINATOR,
       externalId: tender.external_id,
-      relatedParty: tender.selectedProviders.map(id => ({
-        id,
-        role: 'Seller',
-        name: tender.provider,
-        '@referredType': 'Organization'
-      })),
+      relatedParty: [
+        ...tender.selectedProviders.map(id => ({
+          id,
+          role: 'Seller',
+          name: tender.provider,
+          '@referredType': 'Organization'
+        })),
+        ...(tender.buyerPartyId ? [{
+          id: tender.buyerPartyId,
+          role: 'Buyer',
+          '@referredType': 'Organization'
+        }] : [])
+      ],
       // Provide a minimal quoteItem array carrying the state and attachment
       quoteItem: [quoteItem],
       note: []
@@ -914,7 +930,7 @@ export class TenderListComponent implements OnInit {
         }
 
         // Filter out if coordinator is in 'pending' state (which maps to 'draft' in GUI)
-        const shouldShow = coordinatorState !== 'pending';
+        const shouldShow = coordinatorState !== QUOTE_STATUSES.PENDING;
         console.log(`[FILTER] Coordinator state is ${coordinatorState}, ${shouldShow ? 'SHOWING' : 'HIDING'} quote`);
         return shouldShow;
       });
@@ -950,7 +966,7 @@ export class TenderListComponent implements OnInit {
     const primaryState = this.getPrimaryState(quote) as QuoteStateType;
     const tender: Tender = {
       id: quote.id,
-      category: quote.category === QUOTE_CATEGORIES.COORDINATOR ? TENDER_CATEGORIES.COORDINATOR : TENDER_CATEGORIES.TENDERING,
+      category: quote.category === QUOTE_CATEGORIES.COORDINATOR ? 'coordinator' : 'tendering',
       state: this.mapQuoteStateToTenderState(primaryState),
       responseDeadline: quote.expectedFulfillmentStartDate || quote.effectiveQuoteCompletionDate || new Date().toISOString(),
       tenderNote: quote.description || '',
@@ -967,7 +983,7 @@ export class TenderListComponent implements OnInit {
 
   private mapQuoteStateToTenderState(quoteState: QuoteStateType | undefined): 'draft' | 'pre-launched' | 'pending' | 'sent' | 'closed' {
     if (!quoteState) return 'draft';
-    
+
     switch (quoteState) {
       case 'pending': return 'draft';  // pending → draft
       case 'inProgress': return 'pre-launched';  // inProgress → pre-launched
@@ -1158,10 +1174,10 @@ export class TenderListComponent implements OnInit {
 
     // If the current user is a provider (seller) and the quote is in progress,
     // automatically update the status to 'approved' after successful PDF upload
-    if (this.selectedRole === UI_ROLES.SELLER && this.getPrimaryState(updatedQuote) === 'inProgress') {
+    if (this.selectedRole === UI_ROLES.SELLER && this.getPrimaryState(updatedQuote) === QUOTE_STATUSES.IN_PROGRESS) {
       console.log('Provider uploaded PDF, updating quote status to approved:', updatedQuote.id);
-      
-      this.quoteService.updateQuoteStatus(updatedQuote.id!, 'approved').subscribe({
+
+      this.quoteService.updateQuoteStatus(updatedQuote.id!, QUOTE_STATUSES.APPROVED).subscribe({
         next: (approvedQuote: Quote) => {
           // Update the quote again with the new status
           const approvedIndex = this.quotes.findIndex(q => q.id === approvedQuote.id);
@@ -1169,7 +1185,7 @@ export class TenderListComponent implements OnInit {
             this.quotes[approvedIndex] = approvedQuote;
             this.filterQuotesByStatus();
           }
-          
+
           const shortId = this.extractShortId(updatedQuote.id);
           console.log('Quote status automatically updated to approved after PDF upload');
           this.notificationService.showSuccess(`Quote ${shortId} has been approved after PDF upload.`);
@@ -1182,12 +1198,6 @@ export class TenderListComponent implements OnInit {
     }
   }
 
-
-
-
-
-
-
   updateQuoteState(quote: Quote) {
     this.quoteToUpdate = quote;
     this.selectedState = quote.state || null;
@@ -1502,7 +1512,7 @@ export class TenderListComponent implements OnInit {
           const siblings = (this.relatedQuotesMap.get(coordinatorKey) || []).filter(q => q.id !== quote.id);
           const toReject = siblings.filter(sib => {
             const state = this.getPrimaryState(sib);
-            return state !== 'accepted' && state !== 'cancelled' && state !== 'rejected';
+            return state !== QUOTE_STATUSES.ACCEPTED && state !== QUOTE_STATUSES.CANCELLED && state !== QUOTE_STATUSES.REJECTED;
           });
 
           if (toReject.length > 0) {
@@ -1622,18 +1632,18 @@ export class TenderListComponent implements OnInit {
     if (Array.isArray(quote.quoteItem) && quote.quoteItem.length > 0) {
       return quote.quoteItem[0].state || 'unknown';
     }
-    
+
     // Fallback to main quote state if quoteItem state is not available
     if (quote.state) {
       return quote.state;
     }
-    
+
     return 'unknown';
   }
 
   getQuoteItemState(quote: Quote): string {
     let state = 'unknown';
-    
+
     if (Array.isArray(quote.quoteItem) && quote.quoteItem.length > 0) {
       // Scan all items and pick the first defined state
       for (const item of quote.quoteItem) {
@@ -1643,15 +1653,56 @@ export class TenderListComponent implements OnInit {
         }
       }
     }
-    
+
     // Apply mapping only for coordinator quotes
     if (quote.category === QUOTE_CATEGORIES.COORDINATOR) {
       return this.mapCoordinatorStatusToGUI(state);
     }
-    
+
     return state;
   }
 
+  /**
+   * Get user-friendly status label for a quote based on category and role
+   */
+  getStatusLabel(quote: Quote): string {
+    const state = this.getPrimaryState(quote);
+
+    // Determine which label set to use based on category and role
+    let labels: any;
+
+    if (quote.category === QUOTE_CATEGORIES.COORDINATOR) {
+      // Coordinator quotes use their own label set
+      labels = TENDER_COORDINATOR_STATUSES_LABELS;
+    } else if (quote.category === QUOTE_CATEGORIES.TENDER) {
+      // Tender child quotes use labels based on user role
+      labels = this.selectedRole === UI_ROLES.BUYER
+        ? TENDER_RELATED_QUOTES_LABELS_CUSTOMER
+        : TENDER_RELATED_QUOTES_LABELS_PROVIDER;
+    } else {
+      // Shouldn't happen in tender list, but fallback to empty labels
+      return state;
+    }
+
+    // Map status to label
+    switch (state) {
+      case QUOTE_STATUSES.PENDING:
+        return labels.PENDING;
+      case QUOTE_STATUSES.IN_PROGRESS:
+        return labels.IN_PROGRESS;
+      case QUOTE_STATUSES.APPROVED:
+        return labels.APPROVED;
+      case QUOTE_STATUSES.ACCEPTED:
+        return labels.ACCEPTED;
+      case QUOTE_STATUSES.CANCELLED:
+        return labels.CANCELLED;
+      case QUOTE_STATUSES.REJECTED:
+        return labels.REJECTED;
+      default:
+        return state;
+    }
+  }
+
   /**
    * Map coordinator quote status from backend (TMF) to frontend (GUI) display
    * Only for coordinator quotes
@@ -1669,7 +1720,7 @@ export class TenderListComponent implements OnInit {
   }
 
   hasAttachment(quote: Quote): boolean {
-    return Array.isArray(quote.quoteItem) && 
+    return Array.isArray(quote.quoteItem) &&
            quote.quoteItem.some(qi => qi.attachment && qi.attachment.length > 0);
   }
 
@@ -1677,34 +1728,34 @@ export class TenderListComponent implements OnInit {
     if (!Array.isArray(quote.quoteItem)) {
       return '';
     }
-    
+
     for (const item of quote.quoteItem) {
       if (item.attachment && item.attachment.length > 0) {
         return item.attachment[0].name || 'attachment.pdf';
       }
     }
-    
+
     return '';
   }
 
   isQuoteCancelled(quote: Quote): boolean {
     // Check quoteItem state first (this is where the actual state is stored)
-    if (quote.quoteItem?.some(item => item.state === 'cancelled')) {
+    if (quote.quoteItem?.some(item => item.state === QUOTE_STATUSES.CANCELLED)) {
       return true;
     }
-    
+
     // Fallback to main quote state
-    return quote.state === 'cancelled';
+    return quote.state === QUOTE_STATUSES.CANCELLED;
   }
 
   isQuoteAccepted(quote: Quote): boolean {
     // Check quoteItem state first (this is where the actual state is stored)
-    if (quote.quoteItem?.some(item => item.state === 'accepted')) {
+    if (quote.quoteItem?.some(item => item.state === QUOTE_STATUSES.ACCEPTED)) {
       return true;
     }
-    
+
     // Fallback to main quote state
-    return quote.state === 'accepted';
+    return quote.state === QUOTE_STATUSES.ACCEPTED;
   }
 
   isQuoteFinalized(quote: Quote): boolean {
@@ -1748,7 +1799,7 @@ export class TenderListComponent implements OnInit {
 
   getButtonClass(quote: Quote, actionType: string): string {
     const baseClass = 'px-2 py-1 text-xs font-medium transition-colors rounded border';
-    
+
     if (this.isActionDisabled(quote, actionType)) {
       return `${baseClass} text-gray-400 cursor-not-allowed border-gray-200`;
     }
@@ -1763,11 +1814,11 @@ export class TenderListComponent implements OnInit {
 
   getIconButtonClass(quote: Quote, actionType: string, normalColor: string): string {
     const baseClass = 'p-1.5 text-xs cursor-pointer rounded hover:bg-gray-100 transition-colors';
-    
+
     if (this.isActionDisabled(quote, actionType)) {
       return `${baseClass} text-gray-400 cursor-not-allowed hover:bg-transparent`;
     }
-    
+
     return `${baseClass} ${normalColor}`;
   }
 
@@ -1781,7 +1832,7 @@ export class TenderListComponent implements OnInit {
 
   getStateDisplay(state: QuoteStateType | undefined): string {
     if (!state) return 'Unknown';
-    
+
     const stateMap: Record<QuoteStateType, string> = {
       'pending': 'Pending',
       'inProgress': 'In Progress',
@@ -1790,7 +1841,7 @@ export class TenderListComponent implements OnInit {
       'cancelled': 'Cancelled',
       'accepted': 'Accepted'
     };
-    
+
     return stateMap[state] || state;
   }
 
@@ -1823,7 +1874,7 @@ export class TenderListComponent implements OnInit {
   }
 
   canUpdateState(state: QuoteStateType | undefined): boolean {
-    return state !== 'cancelled' && state !== 'accepted';
+    return state !== QUOTE_STATUSES.CANCELLED && state !== QUOTE_STATUSES.ACCEPTED;
   }
 
   // ========================================
@@ -1838,12 +1889,12 @@ export class TenderListComponent implements OnInit {
     if (quote.category !== QUOTE_CATEGORIES.COORDINATOR) {
       return false;
     }
-    
+
     const state = this.getPrimaryState(quote);
-    
+
     // Expandable if NOT pending (backend state "pending" = GUI display "draft")
     // All other states (inProgress/pre-launched, approved/launched, etc.) are expandable
-    return state !== 'pending';
+    return state !== QUOTE_STATUSES.PENDING;
   }
 
   /**
@@ -1869,7 +1920,7 @@ export class TenderListComponent implements OnInit {
       // Expand - fetch related quotes if not already loaded
       console.log(`Expanding quote ${this.extractShortId(quote.id)}, externalId: ${quote.externalId}`);
       this.expandedQuoteIds.add(quote.id);
-      
+
       if (!this.relatedQuotesMap.has(quote.id)) {
         console.log('Fetching related quotes...');
         this.loadRelatedQuotes(quote);
@@ -1913,6 +1964,8 @@ export class TenderListComponent implements OnInit {
       next: (relatedQuotes: Quote[]) => {
         this.relatedQuotesMap.set(coordinatorQuote.id!, relatedQuotes);
         this.loadingRelatedQuotes.delete(coordinatorQuote.id!);
+        // Enrich provider names from the raw Quote objects (relatedParty has real org IDs)
+        this.enrichQuoteData(relatedQuotes);
         console.log(`✅ Successfully loaded ${relatedQuotes.length} related quotes for coordinator ${this.extractShortId(coordinatorQuote.id)}`);
         if (relatedQuotes.length > 0) {
           console.log('Related quotes:', relatedQuotes.map(q => ({
@@ -1923,7 +1976,7 @@ export class TenderListComponent implements OnInit {
         }
       },
       error: (error: Error) => {
-        console.error('❌ Failed to load related quotes:', error);
+        console.error('⌠Failed to load related quotes:', error);
         this.loadingRelatedQuotes.delete(coordinatorQuote.id!);
         this.notificationService.showError('Failed to load related quotes');
       }
@@ -1945,31 +1998,61 @@ export class TenderListComponent implements OnInit {
     return quoteId ? this.loadingRelatedQuotes.has(quoteId) : false;
   }
 
+  private isOrganizationId(id: string): boolean {
+    return id.startsWith('urn:ngsi-ld:organization:');
+  }
+
+  /**
+   * Fetch tradingNames for every org URN found in relatedParty across the given quotes.
+   * Populates organizationNames map and triggers change detection on completion.
+   */
+  private enrichQuoteData(quotes: Quote[]): void {
+    const orgIds = new Set<string>();
+
+    quotes.forEach(quote => {
+      quote.relatedParty?.forEach(party => {
+        if (party.id && !this.organizationNames.has(party.id) && this.isOrganizationId(party.id)) {
+          orgIds.add(party.id);
+        }
+      });
+    });
+
+    if (orgIds.size === 0) return;
+
+    const orgRequests = Array.from(orgIds).map(id =>
+      this.accountService.getOrgInfo(id).then(
+        (org: any) => ({ id, name: org?.tradingName || org?.name || id }),
+        () => ({ id, name: id })
+      )
+    );
+
+    Promise.all(orgRequests).then(results => {
+      results.forEach(({ id, name }) => this.organizationNames.set(id, name));
+      // Trigger change detection
+      this.filteredQuotes = [...this.filteredQuotes];
+    });
+  }
+
   /**
    * Get provider name from related party
    */
   getProviderName(quote: Quote): string {
-    console.log('Getting provider name for quote:', quote.id);
-    console.log('RelatedParty array:', quote.relatedParty);
-    
     if (!quote.relatedParty || quote.relatedParty.length === 0) {
-      console.warn('No relatedParty found in quote:', quote.id);
       return 'Unknown Provider';
     }
-    
-    // Log all parties to see what roles exist
-    quote.relatedParty.forEach(party => {
-      console.log('Party:', party.id, 'Role:', party.role, 'Name:', party.name);
-    });
-    
-    const provider = quote.relatedParty?.find(party => party.role?.toLowerCase() === 'seller');
-    
-    if (!provider) {
-      console.warn('No seller found in relatedParty for quote:', quote.id);
-      console.log('Available roles:', quote.relatedParty.map(p => p.role).join(', '));
+
+    const provider = quote.relatedParty.find(party => party.role?.toLowerCase() === 'seller');
+
+    if (!provider?.id) {
+      return 'Unknown Provider';
     }
-    
-    return provider?.name || provider?.id || 'Unknown Provider';
+
+    const enrichedName = this.organizationNames.get(provider.id);
+    if (enrichedName && enrichedName !== provider.id) {
+      return enrichedName;
+    }
+
+    return 'Loading...';
   }
 
   /**
@@ -1980,8 +2063,18 @@ export class TenderListComponent implements OnInit {
       return 'Unknown Customer';
     }
 
-    const buyer = quote.relatedParty?.find(party => party.role?.toLowerCase() === 'buyer');
-    return buyer?.name || buyer?.id || 'Unknown Customer';
+    const buyer = quote.relatedParty.find(party => party.role?.toLowerCase() === 'buyer');
+
+    if (!buyer?.id) {
+      return 'Unknown Customer';
+    }
+
+    const enrichedName = this.organizationNames.get(buyer.id);
+    if (enrichedName && enrichedName !== buyer.id) {
+      return enrichedName;
+    }
+
+    return 'Loading...';
   }
 
   /**
@@ -1996,7 +2089,7 @@ export class TenderListComponent implements OnInit {
 
     // Check if we have the coordinator state cached
     const coordinatorState = this.coordinatorQuoteStatesMap.get(tenderingQuote.externalId);
-    
+
     if (!coordinatorState) {
       // State not loaded yet, load it
       this.loadCoordinatorQuoteState(tenderingQuote.externalId);
@@ -2004,7 +2097,7 @@ export class TenderListComponent implements OnInit {
     }
 
     // Allow accept only if coordinator is in 'inProgress' state
-    return coordinatorState === 'inProgress';
+    return coordinatorState === QUOTE_STATUSES.IN_PROGRESS;
   }
 
   /**
@@ -2019,7 +2112,7 @@ export class TenderListComponent implements OnInit {
 
     // Check if we have the coordinator state cached
     const coordinatorState = this.coordinatorQuoteStatesMap.get(tenderingQuote.externalId);
-    
+
     if (!coordinatorState) {
       // State not loaded yet, load it
       this.loadCoordinatorQuoteState(tenderingQuote.externalId);
@@ -2027,7 +2120,7 @@ export class TenderListComponent implements OnInit {
     }
 
     // Allow add attachment only if coordinator is in 'approved' state
-    return coordinatorState === 'approved';
+    return coordinatorState === QUOTE_STATUSES.APPROVED;
   }
 
   /**
@@ -2132,5 +2225,4 @@ export class TenderListComponent implements OnInit {
     }
     return title;
   }
-} 
-
+}
diff --git a/src/app/models/quote.constants.ts b/src/app/models/quote.constants.ts
index 65717951..db0a1766 100644
--- a/src/app/models/quote.constants.ts
+++ b/src/app/models/quote.constants.ts
@@ -1,6 +1,7 @@
 /**
  * Quote status constants and messages used throughout the application
  *
+ *
  */
 
 /**
@@ -15,13 +16,89 @@ export const QUOTE_CATEGORIES = {
 export type QuoteCategoryType = typeof QUOTE_CATEGORIES[keyof typeof QUOTE_CATEGORIES];
 
 /**
- * Backend Tender category constants (backend/Tender model)
+ * Quote status constants (stored in quote.quoteItem[0].state)
  */
-export const TENDER_CATEGORIES = {
-  TENDERING: 'tendering',
-  COORDINATOR: 'coordinator'
+export const QUOTE_STATUSES = {
+  PENDING: 'pending',
+  IN_PROGRESS: 'inProgress',
+  APPROVED: 'approved',
+  ACCEPTED: 'accepted',
+  CANCELLED: 'cancelled',
+  REJECTED: 'rejected'
+} as const;
+
+export type QuoteStatus = typeof QUOTE_STATUSES[keyof typeof QUOTE_STATUSES];
+
+/**
+ * Tender status constants (frontend display states)
+ */
+export const TENDER_COORDINATOR_STATUSES_LABELS = {
+  PENDING: 'not-yet-submitted',
+  IN_PROGRESS: 'invites-sent-waiting-acceptance',
+  APPROVED: 'tender-started',
+  ACCEPTED: 'tender-closed',
+  CANCELLED: 'cancelled',
+  REJECTED: 'rejected'
 } as const;
 
+export type TenderCoordinatorStatusesLabel = typeof TENDER_COORDINATOR_STATUSES_LABELS[keyof typeof TENDER_COORDINATOR_STATUSES_LABELS];
+
+/**
+ * Tender status constants (frontend display states)
+ */
+export const TENDER_RELATED_QUOTES_LABELS_CUSTOMER = {
+  PENDING: 'invite-sent',
+  IN_PROGRESS: 'invite-accepted-by-provider',
+  APPROVED: 'offer-submitted-by-provider',
+  ACCEPTED: 'offering-accepted',
+  CANCELLED: 'request-canceled',
+  REJECTED: 'offering-rejected'
+} as const;
+
+export type TenderRelatedQuotesLabelsCustomer = typeof TENDER_RELATED_QUOTES_LABELS_CUSTOMER[keyof typeof TENDER_RELATED_QUOTES_LABELS_CUSTOMER];
+
+/**
+ * Tender status constants (frontend display states)
+ */
+export const TENDER_RELATED_QUOTES_LABELS_PROVIDER = {
+  PENDING: 'invite-received-to-tender',
+  IN_PROGRESS: 'invitation-accepted',
+  APPROVED: 'offering-submitted',
+  ACCEPTED: 'offering-accepted-by-customer',
+  CANCELLED: 'request-canceled',
+  REJECTED: 'offering-rejected'
+} as const;
+
+export type TenderRelatedQuotesLabelsProvider = typeof TENDER_RELATED_QUOTES_LABELS_PROVIDER[keyof typeof TENDER_RELATED_QUOTES_LABELS_PROVIDER];
+
+/**
+ * Tender status constants (frontend display states)
+ */
+export const TAILORED_STATUSES_LABELS_CUSTOMER = {
+  PENDING: 'request-sent-awaiting-feedback',
+  IN_PROGRESS: 'request-accepted-and-being-worked-on',
+  APPROVED: 'offering-submitted-by-provider',
+  ACCEPTED: 'offering-accepted',
+  CANCELLED: 'request-canceled',
+  REJECTED: 'rejected'
+} as const;
+
+export type TailoredStatusesLabelsCustomer = typeof TAILORED_STATUSES_LABELS_CUSTOMER[keyof typeof TAILORED_STATUSES_LABELS_CUSTOMER];
+
+/**
+ * Tender status constants (frontend display states)
+ */
+export const TAILORED_STATUSES_LABELS_PROVIDER = {
+  PENDING: 'request-received-pending-feedback',
+  IN_PROGRESS: 'request-accepted',
+  APPROVED: 'offering-submitted',
+  ACCEPTED: 'offering-accepted-by-customer',
+  CANCELLED: 'request-canceled',
+  REJECTED: 'rejected'
+} as const;
+
+export type TailoredStatusesLabelsProvider = typeof TAILORED_STATUSES_LABELS_PROVIDER[keyof typeof TAILORED_STATUSES_LABELS_PROVIDER];
+
 export interface StatusInfo {
   explanation: string;
   availableActions: string;
@@ -33,6 +110,7 @@ export interface StatusMessages {
 }
 
 /**
+ * Quote status explanation messages for each state and role (for TAILORED quotes)
  * Quote status explanation messages for each state and role (for TAILORED quotes)
  */
 export const QUOTE_STATUS_MESSAGES: Record<string, StatusMessages> = {
diff --git a/src/app/models/tender.model.ts b/src/app/models/tender.model.ts
index 1dc774a2..7e96a849 100644
--- a/src/app/models/tender.model.ts
+++ b/src/app/models/tender.model.ts
@@ -11,8 +11,9 @@ export interface Tender {
   tenderNote?: string;
   attachment?: TenderAttachment;
   selectedProviders: string[];
-  external_id?: string;  // ID of parent tender (for child tenders)
-  provider?: string;      // Provider name (for child tenders)
+  external_id?: string;   // ID of parent tender (for child tenders)
+  provider?: string;       // Provider name (for child tenders)
+  buyerPartyId?: string;   // Buyer org URN (for child tenders, used in provider view)
   createdAt?: string;
   updatedAt?: string;
   
diff --git a/src/app/shared/quote-details-modal/quote-details-modal.component.ts b/src/app/shared/quote-details-modal/quote-details-modal.component.ts
index 9f6cf77e..7faf7755 100644
--- a/src/app/shared/quote-details-modal/quote-details-modal.component.ts
+++ b/src/app/shared/quote-details-modal/quote-details-modal.component.ts
@@ -9,7 +9,7 @@ import { NotificationService } from '../../services/notification.service';
 import { AccountServiceService } from '../../services/account-service.service';
 import { ApiServiceService } from '../../services/product-service.service';
 import { Quote } from '../../models/quote.model';
-import { QUOTE_STATUS_MESSAGES, TENDERING_STATUS_MESSAGES, COORDINATOR_STATUS_MESSAGES, QUOTE_CHAT_MESSAGES, QUOTE_ACTION_BUTTON_TEXTS, QUOTE_CATEGORIES } from '../../models/quote.constants';
+import { QUOTE_STATUS_MESSAGES, TENDERING_STATUS_MESSAGES, COORDINATOR_STATUS_MESSAGES, QUOTE_CHAT_MESSAGES, QUOTE_ACTION_BUTTON_TEXTS, QUOTE_CATEGORIES, QUOTE_STATUSES, TAILORED_STATUSES_LABELS_CUSTOMER, TAILORED_STATUSES_LABELS_PROVIDER, TENDER_COORDINATOR_STATUSES_LABELS, TENDER_RELATED_QUOTES_LABELS_CUSTOMER, TENDER_RELATED_QUOTES_LABELS_PROVIDER } from '../../models/quote.constants';
 import { API_ROLES } from '../../models/roles.constants';
 import { NotificationComponent } from '../notification/notification.component';
 import { ChatModalComponent } from '../chat-modal/chat-modal.component';
@@ -161,7 +161,7 @@ import { environment } from 'src/environments/environment';
               <p class="text-sm text-gray-700 dark:text-gray-300">The quote is in status:</p>
               <span class="px-3 py-1 text-sm font-semibold rounded-full"
                     [ngClass]="getStatusBadgeClass()">
-                {{ getPrimaryState() }}
+                {{ getStatusLabel() }}
               </span>
             </div>
             <p class="text-sm text-gray-600 dark:text-gray-400 mb-2">{{ getStatusExplanation() }}</p>
@@ -223,7 +223,7 @@ import { environment } from 'src/environments/environment';
           <div *ngIf="hasActionButtons() && getQuoteCategory() !== QUOTE_CATEGORIES.COORDINATOR" class="border-t dark:border-gray-700 pt-4">
             <div class="space-y-3">
               <!-- Provider: Accept Tender Invite (when pending, only while coordinator is in inProgress) -->
-              <div *ngIf="currentUserRole === 'seller' && getPrimaryState() === 'pending' && (getQuoteCategory() !== QUOTE_CATEGORIES.TENDER || getCoordinatorState() === 'inProgress')" class="flex items-center justify-between">
+              <div *ngIf="currentUserRole === 'seller' && getPrimaryState() === QUOTE_STATUSES.PENDING && (getQuoteCategory() !== QUOTE_CATEGORIES.TENDER || getCoordinatorState() === QUOTE_STATUSES.IN_PROGRESS)" class="flex items-center justify-between">
                 <p class="text-sm text-gray-600 dark:text-gray-400">
                   {{ getQuoteCategory() === QUOTE_CATEGORIES.TENDER ? ACTION_TEXTS.ACCEPT_TENDER_INVITE : ACTION_TEXTS.ACCEPT_QUOTE_PROVIDER }}
                 </p>
@@ -241,7 +241,7 @@ import { environment } from 'src/environments/environment';
               </div>
 
               <!-- Customer: Accept Proposal (tailored: when approved; tender: only when coordinator is 'accepted'/closed) -->
-              <div *ngIf="currentUserRole === 'customer' && getPrimaryState() === 'approved' && (getQuoteCategory() !== QUOTE_CATEGORIES.TENDER || getCoordinatorState() === 'accepted')" class="flex items-center justify-between">
+              <div *ngIf="currentUserRole === 'customer' && getPrimaryState() === QUOTE_STATUSES.APPROVED && (getQuoteCategory() !== QUOTE_CATEGORIES.TENDER || getCoordinatorState() === QUOTE_STATUSES.ACCEPTED)" class="flex items-center justify-between">
                 <p class="text-sm text-gray-600 dark:text-gray-400">{{ ACTION_TEXTS.ACCEPT_PROPOSAL_CUSTOMER }}</p>
                 <button
                   (click)="acceptProposal()"
@@ -261,7 +261,7 @@ import { environment } from 'src/environments/environment';
           <div *ngIf="getQuoteCategory() === QUOTE_CATEGORIES.COORDINATOR" class="border-t dark:border-gray-700 pt-4">
             <div class="space-y-3">
               <!-- Broadcast Message Button (hidden while tender is still in pending/draft) -->
-              <div *ngIf="currentUserRole === 'customer' && getPrimaryState() !== 'pending'" class="flex items-center justify-between">
+              <div *ngIf="currentUserRole === 'customer' && getPrimaryState() !== QUOTE_STATUSES.PENDING" class="flex items-center justify-between">
                 <p class="text-sm text-gray-600 dark:text-gray-400">Send a message to all invited providers in this tender</p>
                 <button
                   (click)="openBroadcastMessage()"
@@ -278,10 +278,10 @@ import { environment } from 'src/environments/environment';
           </div>
 
           <!-- Cancel Quote (Always Available except when Accepted) -->
-          <div *ngIf="getPrimaryState() !== 'accepted' && getPrimaryState() !== 'cancelled'" class="border-t dark:border-gray-700 pt-4">
+          <div *ngIf="getPrimaryState() !== QUOTE_STATUSES.ACCEPTED && getPrimaryState() !== QUOTE_STATUSES.CANCELLED" class="border-t dark:border-gray-700 pt-4">
             <div class="flex items-center justify-between">
               <p class="text-sm text-gray-600 dark:text-gray-400">
-                {{ getQuoteCategory() === QUOTE_CATEGORIES.COORDINATOR ? 'Cancel this tender and all the related quotes / invites' : (getQuoteCategory() === QUOTE_CATEGORIES.TENDER && currentUserRole === 'seller' && getPrimaryState() === 'pending' ? ACTION_TEXTS.DECLINE_TENDER_INVITE : ACTION_TEXTS.CANCEL_QUOTE_PROVIDER) }}
+                {{ getQuoteCategory() === QUOTE_CATEGORIES.COORDINATOR ? 'Cancel this tender and all the related quotes / invites' : (getQuoteCategory() === QUOTE_CATEGORIES.TENDER && currentUserRole === 'seller' && getPrimaryState() === QUOTE_STATUSES.PENDING ? ACTION_TEXTS.DECLINE_TENDER_INVITE : ACTION_TEXTS.CANCEL_QUOTE_PROVIDER) }}
               </p>
               <button
                 (click)="cancelQuote()"
@@ -297,7 +297,7 @@ import { environment } from 'src/environments/environment';
           </div>
 
           <!-- Create Offer Button (Provider only, when quote is accepted) -->
-          <div *ngIf="currentUserRole === 'seller' && getPrimaryState() === 'accepted'" class="border-t dark:border-gray-700 pt-4">
+          <div *ngIf="currentUserRole === 'seller' && getPrimaryState() === QUOTE_STATUSES.ACCEPTED" class="border-t dark:border-gray-700 pt-4">
             <div class="flex items-center justify-between">
               <p class="text-sm text-gray-600 dark:text-gray-400">{{ ACTION_TEXTS.CREATE_OFFER }}</p>
               <button
@@ -461,6 +461,7 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
   // Expose constants to template
   readonly ACTION_TEXTS = QUOTE_ACTION_BUTTON_TEXTS;
   readonly QUOTE_CATEGORIES = QUOTE_CATEGORIES;
+  readonly QUOTE_STATUSES = QUOTE_STATUSES;
 
   // Services
   private quoteService = inject(QuoteService);
@@ -657,6 +658,50 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
     return this.quote.state || 'unknown';
   }
 
+  /**
+   * Get user-friendly status label based on quote category and user role
+   */
+  getStatusLabel(): string {
+    const state = this.getPrimaryState();
+    if (!this.quote) return state;
+
+    // Determine which label set to use based on category and role
+    let labels: any;
+
+    if (this.getQuoteCategory() === QUOTE_CATEGORIES.COORDINATOR) {
+      // Coordinator quotes use their own label set
+      labels = TENDER_COORDINATOR_STATUSES_LABELS;
+    } else if (this.getQuoteCategory() === QUOTE_CATEGORIES.TENDER) {
+      // Tender child quotes use labels based on user role
+      labels = this.currentUserRole === 'customer'
+        ? TENDER_RELATED_QUOTES_LABELS_CUSTOMER
+        : TENDER_RELATED_QUOTES_LABELS_PROVIDER;
+    } else {
+      // Tailored quotes use labels based on user role
+      labels = this.currentUserRole === 'customer'
+        ? TAILORED_STATUSES_LABELS_CUSTOMER
+        : TAILORED_STATUSES_LABELS_PROVIDER;
+    }
+
+    // Map status to label
+    switch (state) {
+      case QUOTE_STATUSES.PENDING:
+        return labels.PENDING;
+      case QUOTE_STATUSES.IN_PROGRESS:
+        return labels.IN_PROGRESS;
+      case QUOTE_STATUSES.APPROVED:
+        return labels.APPROVED;
+      case QUOTE_STATUSES.ACCEPTED:
+        return labels.ACCEPTED;
+      case QUOTE_STATUSES.CANCELLED:
+        return labels.CANCELLED;
+      case QUOTE_STATUSES.REJECTED:
+        return labels.REJECTED;
+      default:
+        return state;
+    }
+  }
+
   // Returns the state of the coordinator quote (for tendering quotes)
   getCoordinatorState(): string | null {
     if (!this.coordinatorQuote) return null;
@@ -669,12 +714,12 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
   getStatusBadgeClass(): string {
     const state = this.getPrimaryState();
     const classes: Record<string, string> = {
-      pending: 'bg-yellow-100 text-yellow-800',
-      inProgress: 'bg-blue-100 text-blue-800',
-      approved: 'bg-green-100 text-green-800',
-      accepted: 'bg-emerald-100 text-emerald-800',
-      rejected: 'bg-red-100 text-red-800',
-      cancelled: 'bg-gray-100 text-gray-800'
+      [QUOTE_STATUSES.PENDING]: 'bg-yellow-100 text-yellow-800',
+      [QUOTE_STATUSES.IN_PROGRESS]: 'bg-blue-100 text-blue-800',
+      [QUOTE_STATUSES.APPROVED]: 'bg-green-100 text-green-800',
+      [QUOTE_STATUSES.ACCEPTED]: 'bg-emerald-100 text-emerald-800',
+      [QUOTE_STATUSES.REJECTED]: 'bg-red-100 text-red-800',
+      [QUOTE_STATUSES.CANCELLED]: 'bg-gray-100 text-gray-800'
     };
     return classes[state] || 'bg-gray-100 text-gray-600';
   }
@@ -724,7 +769,7 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
 
   isQuoteFinalized(): boolean {
     const state = this.getPrimaryState();
-    return state === 'cancelled' || state === 'accepted' || state === 'rejected';
+    return state === QUOTE_STATUSES.CANCELLED || state === QUOTE_STATUSES.ACCEPTED || state === QUOTE_STATUSES.REJECTED;
   }
 
   hasAttachment(): boolean {
@@ -773,26 +818,26 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
     if (this.currentUserRole !== 'seller') return false;
     // For tendering quotes, only allow upload when the coordinator is in 'approved' (launched) state
     if (this.getQuoteCategory() === QUOTE_CATEGORIES.TENDER) {
-      return this.getCoordinatorState() === 'approved';
+      return this.getCoordinatorState() === QUOTE_STATUSES.APPROVED;
     }
     const state = this.getPrimaryState();
-    return state === 'inProgress' || state === 'approved';
+    return state === QUOTE_STATUSES.IN_PROGRESS || state === QUOTE_STATUSES.APPROVED;
   }
 
   canEditExpectedDate(): boolean {
     if (this.currentUserRole !== 'seller') return false;
     const state = this.getPrimaryState();
-    return !this.isQuoteFinalized() && (state === 'pending' || state === 'inProgress' || state === 'approved');
+    return !this.isQuoteFinalized() && (state === QUOTE_STATUSES.PENDING || state === QUOTE_STATUSES.IN_PROGRESS || state === QUOTE_STATUSES.APPROVED);
   }
 
   canRejectOrCancel(): boolean {
     const state = this.getPrimaryState();
     if (this.currentUserRole === 'seller') {
       // Sellers can cancel quotes in pending, inProgress, or approved states
-      return state === 'pending' || state === 'inProgress' || state === 'approved';
+      return state === QUOTE_STATUSES.PENDING || state === QUOTE_STATUSES.IN_PROGRESS || state === QUOTE_STATUSES.APPROVED;
     } else {
       // Customers can reject quotes only in approved state
-      return state === 'approved';
+      return state === QUOTE_STATUSES.APPROVED;
     }
   }
 
@@ -816,12 +861,12 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
     const state = this.getPrimaryState();
 
     // Provider: Accept Quote (when pending)
-    if (this.currentUserRole === 'seller' && state === 'pending') {
+    if (this.currentUserRole === 'seller' && state === QUOTE_STATUSES.PENDING) {
       return true;
     }
 
     // Customer: Accept Proposal (when approved)
-    if (this.currentUserRole === 'customer' && state === 'approved') {
+    if (this.currentUserRole === 'customer' && state === QUOTE_STATUSES.APPROVED) {
       return true;
     }
 
@@ -876,11 +921,11 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
         return this.quoteService.addNoteToQuote(quoteId, QUOTE_CHAT_MESSAGES.ATTACHMENT_UPLOADED(fileName), this.currentUserId).pipe(
           switchMap(() => {
             // Auto-approve if in progress
-            if (this.getPrimaryState() === 'inProgress') {
-              return this.quoteService.updateQuoteStatus(quoteId, 'approved').pipe(
+            if (this.getPrimaryState() === QUOTE_STATUSES.IN_PROGRESS) {
+              return this.quoteService.updateQuoteStatus(quoteId, QUOTE_STATUSES.APPROVED).pipe(
                 switchMap((approvedQuote) => {
                   this.quote = approvedQuote;
-                  return this.quoteService.addNoteToQuote(quoteId, QUOTE_CHAT_MESSAGES.STATUS_CHANGE('approved'), this.currentUserId);
+                  return this.quoteService.addNoteToQuote(quoteId, QUOTE_CHAT_MESSAGES.STATUS_CHANGE(QUOTE_STATUSES.APPROVED), this.currentUserId);
                 })
               );
             }
@@ -892,7 +937,7 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
       next: () => {
         this.isUploading = false;
         this.notificationService.showSuccess('Attachment uploaded successfully');
-        if (this.getPrimaryState() === 'approved') {
+        if (this.getPrimaryState() === QUOTE_STATUSES.APPROVED) {
           this.notificationService.showSuccess('Quote has been approved and sent to customer');
         }
         this.quoteUpdated.emit(this.quote!);
@@ -915,10 +960,10 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
       this.isProcessing = true;
       const quoteId = this.quote!.id!;
 
-      this.quoteService.updateQuoteStatus(quoteId, 'inProgress').pipe(
+      this.quoteService.updateQuoteStatus(quoteId, QUOTE_STATUSES.IN_PROGRESS).pipe(
         switchMap((updatedQuote) => {
           this.quote = updatedQuote;
-          return this.quoteService.addNoteToQuote(quoteId, QUOTE_CHAT_MESSAGES.STATUS_CHANGE('inProgress'), this.currentUserId);
+          return this.quoteService.addNoteToQuote(quoteId, QUOTE_CHAT_MESSAGES.STATUS_CHANGE(QUOTE_STATUSES.IN_PROGRESS), this.currentUserId);
         })
       ).subscribe({
         next: () => {
@@ -947,10 +992,10 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
       this.isProcessing = true;
       const quoteId = this.quote!.id!;
 
-      this.quoteService.updateQuoteStatus(quoteId, 'accepted').pipe(
+      this.quoteService.updateQuoteStatus(quoteId, QUOTE_STATUSES.ACCEPTED).pipe(
         switchMap((updatedQuote) => {
           this.quote = updatedQuote;
-          return this.quoteService.addNoteToQuote(quoteId, QUOTE_CHAT_MESSAGES.STATUS_CHANGE('accepted'), this.currentUserId);
+          return this.quoteService.addNoteToQuote(quoteId, QUOTE_CHAT_MESSAGES.STATUS_CHANGE(QUOTE_STATUSES.ACCEPTED), this.currentUserId);
         })
       ).subscribe({
         next: () => {
@@ -993,7 +1038,7 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
   }
 
   private cancelSingleQuote(quoteId: string) {
-    const newStatus = 'cancelled';
+    const newStatus = QUOTE_STATUSES.CANCELLED;
     this.quoteService.updateQuoteStatus(quoteId, newStatus).pipe(
       switchMap((updatedQuote) => {
         this.quote = updatedQuote;
@@ -1015,7 +1060,7 @@ export class QuoteDetailsModalComponent implements OnInit, OnChanges {
 
   private cancelCoordinatorWithCascade() {
     const coordinatorId = this.quote!.id!;
-    const newStatus = 'cancelled';
+    const newStatus = QUOTE_STATUSES.CANCELLED;
 
     // Step 1: Fetch all related tendering quotes for this coordinator
     this.quoteService.getTenderingQuotesByExternalId(this.currentUserId, coordinatorId, API_ROLES.BUYER).subscribe({