diff --git a/resident-ui/src/app/app-config.service.ts b/resident-ui/src/app/app-config.service.ts index f41f1eb8..d0b9ecbf 100644 --- a/resident-ui/src/app/app-config.service.ts +++ b/resident-ui/src/app/app-config.service.ts @@ -6,10 +6,10 @@ import { HttpClient } from '@angular/common/http'; }) export class AppConfigService { appConfig: any; - constructor(public http: HttpClient) { } - + async loadAppConfig() { + localStorage.setItem("isDataLoaded", 'false') this.appConfig = await this.http.get('./assets/config.json').toPromise(); this.http.get(this.appConfig.baseUrl + '/proxy/config/ui-properties').subscribe( (response) => { @@ -67,6 +67,7 @@ export class AppConfigService { this.appConfig["mosip.kernel.rid.length"] = responseData["mosip.kernel.rid.length"]; this.appConfig["mosip.resident.transliteration.transliterate.id"] = responseData["mosip.resident.transliteration.transliterate.id"]; this.appConfig["resident.contact.details.update.id"] = responseData["resident.contact.details.update.id"] + localStorage.setItem("isDataLoaded", 'true') }, (error) => { console.log(error); diff --git a/resident-ui/src/app/app.component.ts b/resident-ui/src/app/app.component.ts index 9975ce2a..125878af 100644 --- a/resident-ui/src/app/app.component.ts +++ b/resident-ui/src/app/app.component.ts @@ -57,7 +57,9 @@ export class AppComponent { if(window.location.href.includes('error=invalid_transaction')){ this.router.navigate(['error']); }else{ - this.router.navigate(['dashboard']); + if (window.location.href.includes('uinservices')) { + this.router.navigate(['dashboard']); + } }; } }else{ diff --git a/resident-ui/src/app/feature/getuin/getuin/getuin.component.html b/resident-ui/src/app/feature/getuin/getuin/getuin.component.html index edba3b9d..5e6fcfa6 100644 --- a/resident-ui/src/app/feature/getuin/getuin/getuin.component.html +++ b/resident-ui/src/app/feature/getuin/getuin/getuin.component.html @@ -3,7 +3,10 @@ {{popupMessages.uinservices.home }}    >  {{popupMessages.uinservices.label}} - +
+ +
+