diff --git a/REMEMBER.txt b/REMEMBER.txt
index f9a298e..e65eae3 100644
--- a/REMEMBER.txt
+++ b/REMEMBER.txt
@@ -52,7 +52,7 @@ ionic generate page addbank
 
 
 ionic generate service user-wallet
-
+ionic generate service waiting-interest
 
 ionic generate component tracking
 
diff --git a/src/app/pages/familymember/familymember.page.html b/src/app/pages/familymember/familymember.page.html
index 99d24df..2784b8c 100644
--- a/src/app/pages/familymember/familymember.page.html
+++ b/src/app/pages/familymember/familymember.page.html
@@ -55,15 +55,17 @@
     </div>
 
     <ion-segment class="common_segment" [(ngModel)]="tabs">
-      <ion-segment-button value="about">
+        <ion-segment-button value="lesson">
+        <ion-label>Wallet</ion-label>
+        </ion-segment-button>
+
+        <ion-segment-button value="about">
         <ion-label>Task</ion-label>
-      </ion-segment-button>
-      <ion-segment-button value="lesson">
-        <ion-label>Account</ion-label>
-      </ion-segment-button>
-      <ion-segment-button value="profile">
+        </ion-segment-button>
+
+        <ion-segment-button value="profile">
         <ion-label>Profile</ion-label>
-      </ion-segment-button>
+</ion-segment-button>
     </ion-segment>
 
     <div *ngIf="tabs =='about'" class="lesson">
diff --git a/src/app/pages/familymember/familymember.page.ts b/src/app/pages/familymember/familymember.page.ts
index 5daddd5..e2c6faf 100644
--- a/src/app/pages/familymember/familymember.page.ts
+++ b/src/app/pages/familymember/familymember.page.ts
@@ -15,7 +15,7 @@ export class FamilymemberPage implements OnInit {
   @ViewChild('description') description;
 
   familyMemberData: any;
-  tabs = 'about';
+  tabs = 'lesson';
   member_firstname:string='';
   member_lastname:string='';
 
diff --git a/src/app/pages/marketdetail/marketdetail.page.html b/src/app/pages/marketdetail/marketdetail.page.html
index 312f884..2b212fb 100644
--- a/src/app/pages/marketdetail/marketdetail.page.html
+++ b/src/app/pages/marketdetail/marketdetail.page.html
@@ -10,7 +10,7 @@
       <!--        <ion-icon name="ellipsis-horizontal-circle-outline"></ion-icon>-->
       <!--      </ion-button>-->
     </ion-buttons>
-    <ion-title>{{jobData.title}}</ion-title>
+    <ion-title>{{jobData?.title}}</ion-title>
   </ion-toolbar>
 </ion-header>
 <ion-content>
@@ -23,7 +23,7 @@
   <div class="ion-padding">
     <div class="boxed_contents">
       <div class="flex">
-        <ion-label class="bold_text">{{jobData.title}}</ion-label>
+        <ion-label class="bold_text">{{jobData?.title}}</ion-label>
 <!--        <ion-icon slot="end" name="bookmark-outline" color="primary"></ion-icon>-->
       </div>
 
@@ -49,12 +49,14 @@
       </div>
 
       <ion-segment class="common_segment" [(ngModel)]="tabs">
-        <ion-segment-button value="about">
-          <ion-label>Details</ion-label>
-        </ion-segment-button>
         <ion-segment-button value="lesson">
           <ion-label>Show Interest</ion-label>
         </ion-segment-button>
+
+        <ion-segment-button value="about">
+          <ion-label>Details</ion-label>
+        </ion-segment-button>
+
         <ion-segment-button value="message">
           <ion-label>Message</ion-label>
         </ion-segment-button>
@@ -96,7 +98,7 @@
         <!--        <ion-label class="color">75 min</ion-label>-->
         <!--      </div>-->
 
-        <ion-card>
+        <ion-card *ngIf="interestStatus==false;">
           <ion-card-header>
             <ion-card-subtitle>Interested in the task?</ion-card-subtitle>
           </ion-card-header>
@@ -106,10 +108,21 @@
             <ion-label class="description">{{interest_status}}
             </ion-label>
           </ion-card-content>
-
-
         </ion-card>
 
+        <ion-card *ngIf="interestStatus==true;">
+          <img alt="Silhouette of mountains" src="https://www.wrenchboard.com/assets/images/apps/waiting-task.jpg" />
+          <ion-card-header>
+            <ion-card-title>Waiting for feedback</ion-card-title>
+            <ion-card-subtitle>Sent:  10-10-2021</ion-card-subtitle>
+          </ion-card-header>
+
+          <ion-card-content>
+            Here's a small text description for the card content. Nothing more, nothing less.
+          </ion-card-content>
+        </ion-card>
+
+
 
 
         <!--      <div class="video">-->
diff --git a/src/app/pages/marketdetail/marketdetail.page.ts b/src/app/pages/marketdetail/marketdetail.page.ts
index bde2176..2f68f04 100644
--- a/src/app/pages/marketdetail/marketdetail.page.ts
+++ b/src/app/pages/marketdetail/marketdetail.page.ts
@@ -3,6 +3,7 @@ import {NavController} from "@ionic/angular";
 import {Router} from "@angular/router";
 import { WrenchService } from 'src/app/services/wrench.service';
 import {SessionDataProviderService} from "../../store/session-data-provider.service";
+import {WaitingInterestService} from "../../store/waiting-interest.service";
 
 
 @Component({
@@ -12,7 +13,7 @@ import {SessionDataProviderService} from "../../store/session-data-provider.serv
 })
 export class MarketdetailPage implements OnInit {
   @ViewChild('yourmessage') yourmessage;
-  tabs = 'about';
+  tabs = 'lesson';
   session_image_server:string='';
   curr_session:string='';
 
@@ -21,19 +22,25 @@ export class MarketdetailPage implements OnInit {
       private navctr: NavController,
       private router: Router,
       public sessionDataProviderService: SessionDataProviderService,
-      private wrenchService: WrenchService
+      private wrenchService: WrenchService,
+      private waitingInterestService:WaitingInterestService
   ) {
 
     this.jobData  =  this.router.getCurrentNavigation().extras.state;
     console.log("XXXXX 1",   this.router.getCurrentNavigation().extras);
     console.log("XXXXX 2",   this.router.getCurrentNavigation().extras.state);
     //console.log("XXXXX 3",   this.router.getCurrentNavigation().extras.state.ID);
+    if (this.jobData==undefined){
+      this.onBack();
+    }
   }
 
+  interestStatus: boolean= false;
 
   ngOnInit() {
     this.session_image_server = this.sessionDataProviderService.session_image_server;
     this.curr_session=this.sessionDataProviderService.session;
+    this.interestStatus = this.waitingInterestService.interestStatus(this.jobData, this.waitingInterestService.interestJobsData);
   }
 
 
@@ -72,6 +79,7 @@ export class MarketdetailPage implements OnInit {
           this.InterestReqResult = reqResult;
           console.log("jobManagerJobsTotalData  RETURN->", this.InterestReqResult);
           this.interest_status =  this.InterestReqResult?.status;
+          this.waitingInterestService.getInterestList();
         }
     );
 
@@ -98,6 +106,7 @@ export class MarketdetailPage implements OnInit {
           this.InterestReqResult = reqResult;
           console.log("jobManagerJobsTotalData  RETURN->", this.InterestReqResult);
           this.interest_msg_status =  this.InterestReqResult?.status;
+          this.waitingInterestService.getInterestList();
         }
     );
 
diff --git a/src/app/store/waiting-interest.service.spec.ts b/src/app/store/waiting-interest.service.spec.ts
new file mode 100644
index 0000000..0dd3eca
--- /dev/null
+++ b/src/app/store/waiting-interest.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { WaitingInterestService } from './waiting-interest.service';
+
+describe('WaitingInterestService', () => {
+  let service: WaitingInterestService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(WaitingInterestService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/store/waiting-interest.service.ts b/src/app/store/waiting-interest.service.ts
new file mode 100644
index 0000000..8e34ad6
--- /dev/null
+++ b/src/app/store/waiting-interest.service.ts
@@ -0,0 +1,65 @@
+import { Injectable } from '@angular/core';
+import {SessionDataProviderService} from "./session-data-provider.service";
+import {WrenchService} from "../services/wrench.service";
+
+@Injectable({
+  providedIn: 'root'
+})
+export class WaitingInterestService {
+
+  constructor(     public sessionDataProviderService: SessionDataProviderService,
+                   private wrenchService: WrenchService) {
+      console.log("*****  FIRST WaitingInterestService==> --- > ");
+      this.getInterestList();
+  }
+
+  usrData: {
+    action: number, member_id: number, uid: string, sessionid: string, limit: 20, page: 1, offset: 0
+  };
+
+  interestTotalData: any;
+  interestJobsData: [];
+  total_jobs: number = 0;
+
+  getInterestList() {
+      console.log("*****  ACTUAL WaitingInterestService==> --- > ");
+
+      this.usrData = {
+      action: 13005,
+      member_id: this.sessionDataProviderService.member_id,
+      uid: this.sessionDataProviderService.member_uid,
+      sessionid: this.sessionDataProviderService.session,
+      limit: 20, page: 1, offset: 0
+    }
+
+    this.wrenchService.getWaitingInterest(this.usrData).subscribe(
+        interestTotalData => {
+          this.interestTotalData = interestTotalData;
+          console.log("interestTotalData  RETURN->", this.interestTotalData);
+          this.interestJobsData = this.interestTotalData.result_list;
+          this.total_jobs = this.interestJobsData.length;
+          console.log("jobManagerJobsData RETURN DATA->", this.interestJobsData);
+        }
+    );
+  }
+
+    interestStatus(JobData, InterestLits:[]){
+
+        if ( InterestLits  == undefined){
+            return false;
+        }
+        for (var i = 0; i < InterestLits.length; i++)
+        {
+            console.log("GGGGG1----- ", InterestLits[i]);
+            console.log("GGGGG2----- ", InterestLits[i]["offer_code"]);
+            console.log("GGGGG3----- ",  JobData.offer_code);
+            if (InterestLits[i]["offer_code"] === JobData.offer_code)
+            {
+                debugger;
+                return true;
+            }
+        }
+
+        return false;
+    }
+}