diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index 99d17c3..26666c0 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -23,6 +23,7 @@ import {IntervalRefreshService} from "../../store/interval-refresh.service";
 import {MarketDataService} from "../../store/market-data.service";
 import {TasksDataService} from "../../store/tasks-data.service";
 import {BannersDataService} from "../../store/banners-data.service";
+import {SocketToolsService} from "../../services/socket-tools.service";
 
 @Component({
   selector: 'app-login',
@@ -61,6 +62,7 @@ export class LoginPage implements OnInit {
     public userWalletService: UserWalletService,
     public intervalRefreshService: IntervalRefreshService,
     public platform: Platform,
+    private  socketToolsService: SocketToolsService,
     private loadingCtrl: LoadingController,
     public marketDataService:MarketDataService,
     public tasksDataService:TasksDataService,
@@ -156,6 +158,7 @@ getBlogData(){
             // this.getBlogData();
             // this.userWalletService.getWallet();
             this.startUpCalls();
+
             this.router.navigate(['tabs/tab1']);
         }
         else{
@@ -177,12 +180,13 @@ getBlogData(){
   }
 
   async startUpCalls(){
-      this.intervalRefreshService.startIntervalCalls(); // anything with interval call
+      await this.bannersDataService.getBannersData();
+      await this.joinLoginSockets();
+      await this.intervalRefreshService.startIntervalCalls(); // anything with interval call
       this.marketDataService.getJobsData();
       this.getBlogData();
-      this.tasksDataService.getJobsData();
-      this.userWalletService.getWalletData();
-      this.bannersDataService.getBannersData();
+      await this.tasksDataService.getJobsData();
+      await this.userWalletService.getWalletData();
   }
   onForgot() {
     this.router.navigate(['forgot']);
@@ -583,6 +587,13 @@ getBlogData(){
     this.router.navigate(['familylogin']);
   }
 
+  async joinLoginSockets(){
+        this.socketToolsService.stop();
+        setTimeout(()=>{
+            this.socketToolsService.setupSocket("NO-NEED-SEND");
+            this.socketToolsService.joinSocketRoom("full-market-jobs" );
+        }, 5000);
+  }
 /*
 const setName = async () => {
     await Preferences.set({
diff --git a/src/app/pages/ownersjob/ownersjob.page.ts b/src/app/pages/ownersjob/ownersjob.page.ts
index b03f511..1696b72 100644
--- a/src/app/pages/ownersjob/ownersjob.page.ts
+++ b/src/app/pages/ownersjob/ownersjob.page.ts
@@ -34,7 +34,7 @@ export class OwnersjobPage implements OnInit {
     if (this.jobData== undefined){
       this.onBack();
     }
-      this.socketToolsService.joinSocketRoom("full-market-jobs" );
+      //this.socketToolsService.joinSocketRoom("full-market-jobs" );
     //debugger;
   }
   onBack() {
diff --git a/src/app/services/socket-tools.service.ts b/src/app/services/socket-tools.service.ts
index bc3487b..da067b8 100644
--- a/src/app/services/socket-tools.service.ts
+++ b/src/app/services/socket-tools.service.ts
@@ -9,7 +9,7 @@ import { environment } from 'src/environments/environment';
 export class SocketToolsService {
 
   constructor() {
-    this.setup('NO-NEED-FOR-NOW');
+   // this.setup('NO-NEED-FOR-NOW');
   }
   private socket: Socket;
   private errorSubject: Subject<string>;
@@ -17,7 +17,7 @@ export class SocketToolsService {
 
   private connectionSubject: Subject<boolean>;
   connected$: Observable<boolean>;
-  setup(authToken: string): void {
+  setupSocket(authToken: string): void {
     // this.socket = io(environment.socketURL, {
     //   path: '/chat/',
     //   reconnection: true,
@@ -27,11 +27,34 @@ export class SocketToolsService {
     //   }
     // });
 
-    this.socket = io(environment.socketURL);
+
+    this.socket = io(environment.socketURL,{autoConnect: false ,reconnection: true});
     this.connected$ = this.monitorConnection();
     this.socket.connect();
+
+   // this.connected$ = this.monitorConnection();
+
+    this.socket.on('receive_message', () => {
+      console.log("app-taskactivities-refresh 001");
+      const event = new Event("app-taskactivities-refresh");
+      dispatchEvent(event);
+    });
+
+    this.socket.on('received_refreshmarket_jobs', (data) => {
+      console.log("received_refreshmarket_jobs 002");
+      debugger
+    });
+
+
   }
 
+//   useEffect(() => {
+//   this.socket.on("receive_message", (data) => {
+//   // setSocketMsgReceived(data.message);
+//   //dispatch(tableReload({type:'CHATMESSAGELIST'}))
+// });
+// }, [this.socket]);
+
   public joinSocketRoom(socketRoom){
     this.socket.emit("join_room", socketRoom);
   }
@@ -39,19 +62,25 @@ export class SocketToolsService {
     this.socket.emit(socketGroup, { message, socketRoom });
   }
   private monitorConnection(): Observable<boolean> {
+    console.log("*********************  MONITORING-SOCKETS      *******");
+
     this.connectionSubject = new BehaviorSubject<boolean>(false);
 
     this.socket.on('receive_message', () => {
+      console.log("app-taskactivities-refresh");
       const event = new Event("app-taskactivities-refresh");
       dispatchEvent(event);
     });
 
     this.socket.on('received_refreshmarket_jobs', (data) => {
-      debugger
+      console.log("received_refreshmarket_jobs");
+    //  debugger
     });
 
 
     this.socket.on('connect', () => {
+      console.log("*********************  MONITORING-SOCKETS ON CONNNECT    *******");
+   //   debugger;
       this.connectionSubject.next(true);
     });