diff --git a/jest-puppeteer.config.js b/jest-puppeteer.config.js index a798f5e91..283de1c85 100644 --- a/jest-puppeteer.config.js +++ b/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, diff --git a/package.json b/package.json index 198e339f7..c7854e97f 100644 --- a/package.json +++ b/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": { diff --git a/src/app/guards/login.guard.ts b/src/app/guards/login.guard.ts index 4d8724808..e191945c4 100644 --- a/src/app/guards/login.guard.ts +++ b/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')) { diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 2658cbf45..745e00f99 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -158,8 +158,10 @@ - + + + diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index 17d15b0c7..522d5fda5 100644 --- a/src/app/services/chat/message.service.ts +++ b/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'