save

jest-puppeteer.config.js

@@ -10,7 +10,7 @@ module.exports = {
   server: {
     command: `http-server -a 127.0.0.1 --port ${port} ./www`,
     port: port,
-    launchTimeout: 5000
+    launchTimeout: 8000
   },
   launch: {
     dumpio: true,

package.json

@@ -11,7 +11,8 @@
     "e2e": "ng e2e",
     "test": "jest  --detectOpenHandles  --runInBand",
     "test:prof": "ionic build --configuration production && npm run test",
-    "dev:share": "lite-server --baseDir=share"
+    "dev:share": "lite-server --baseDir=share",
+    "install:chromium":"node node_modules/puppeteer/install.js"
   },
   "private": true,
   "dependencies": {

src/app/guards/login.guard.ts

@@ -26,7 +26,7 @@ export class LoginGuard implements CanActivate {
       } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && !this.platform.is('desktop') && !this.platform.is('mobileweb')) {
         SessionStore.forceToLoginWithForceToLogInWithPassword = false
         return true
-      } else if(SessionStore.exist && !SessionStore.hasPin && !this.platform.is('desktop') && !this.platform.is('mobileweb') ) {
+      } else if(SessionStore.exist && SessionStore.user.Inactivity &&  !SessionStore.hasPin && !this.platform.is('desktop') && !this.platform.is('mobileweb') ) {
         this.router.navigate(['/pin']);
         return false
       } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && !this.platform.is('desktop') && !this.platform.is('mobileweb')) {

src/app/pages/chat/messages/messages.page.html

@@ -158,8 +158,10 @@
                     </ion-label>
 
                     <ion-label class="float-status-all float-status" *ngIf="msg.u.username==sessionStore.user.UserName">
-
+                      
                       <ion-icon *ngIf="msg.messageSend == false" src="assets/images/clock-regular.svg"></ion-icon>
+                      
+                      <!-- <span *ngIf="msg.messageSend == false" >{{ msg.sendAttempt }}</span> -->
                       <ion-icon *ngIf="msg.messageSend == true && msg.received.length == 0" src="assets/images/check-solid.svg"></ion-icon>
                       <ion-icon *ngIf="msg.messageSend && msg.received.length >= 1 && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
                       <ion-icon *ngIf="msg.viewed.length >= 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>

src/app/services/chat/message.service.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { Message } from 'src/app/models/chatMethod';
-import { Storage } from '@ionic/storage';
 import { SessionStore } from 'src/app/store/session.service';
 import { capitalizeTxt } from 'src/plugin/text'
 import { NfService } from 'src/app/services/chat/nf.service'