From 08d013ebc419366a272fc2d8d4e5a4c55ed22107 Mon Sep 17 00:00:00 2001
From: mehmet-erim <bilgi@mehmeterim.com>
Date: Fri, 4 Oct 2019 14:22:08 +0300
Subject: [PATCH] fix(core): localizationInitialize function state selector
 error

---
 .../core/src/lib/services/rest.service.ts     |  3 ++-
 .../core/src/lib/utils/initial-utils.ts       |  2 +-
 .../packages/theme-shared/package.json        |  2 +-
 .../change-password.component.ts              | 20 +++++++++----------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts
index 5f402f896b..611b208b35 100644
--- a/npm/ng-packs/packages/core/src/lib/services/rest.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/rest.service.ts
@@ -5,6 +5,7 @@ import { Observable, throwError } from 'rxjs';
 import { catchError, take } from 'rxjs/operators';
 import { RestOccurError } from '../actions/rest.actions';
 import { Rest } from '../models/rest';
+import { ConfigState } from '../states/config.state';
 
 @Injectable({
   providedIn: 'root',
@@ -20,7 +21,7 @@ export class RestService {
 
   request<T, R>(request: HttpRequest<T> | Rest.Request<T>, config: Rest.Config = {}, api?: string): Observable<R> {
     const { observe = Rest.Observe.Body, skipHandleError } = config;
-    const url = api || this.store.selectSnapshot(state => state.ConfigState).environment.apis.default.url + request.url;
+    const url = api || this.store.selectSnapshot(ConfigState.getApiUrl()) + request.url;
     const { method, ...options } = request;
     return this.http.request<T>(method, url, { observe, ...options } as any).pipe(
       observe === Rest.Observe.Body ? take(1) : null,
diff --git a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
index d1e703165e..7cea3905dc 100644
--- a/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
+++ b/npm/ng-packs/packages/core/src/lib/utils/initial-utils.ts
@@ -18,7 +18,7 @@ export function localeInitializer(injector: Injector) {
   const fn = () => {
     const store: Store = injector.get(Store);
 
-    const lang = store.selectSnapshot(state => state.SessionState.getLanguage) || 'en';
+    const lang = store.selectSnapshot(state => state.SessionState.language) || 'en';
 
     return new Promise((resolve, reject) => {
       registerLocale(lang).then(() => resolve(), reject);
diff --git a/npm/ng-packs/packages/theme-shared/package.json b/npm/ng-packs/packages/theme-shared/package.json
index 818febc4a3..8ac5a60827 100644
--- a/npm/ng-packs/packages/theme-shared/package.json
+++ b/npm/ng-packs/packages/theme-shared/package.json
@@ -5,7 +5,7 @@
     "@abp/ng.core": "^0.9.0",
     "@angular/cdk": "^8.0.1",
     "@ng-bootstrap/ng-bootstrap": "^5.1.0",
-    "@ngx-validate/core": "^0.0.5",
+    "@ngx-validate/core": "^0.0.7",
     "bootstrap": "^4.3.1",
     "chart.js": "^2.8.0",
     "font-awesome": "^4.7.0",
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts b/npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts
index f030e61e9c..09c7a8da5d 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/components/change-password/change-password.component.ts
@@ -8,7 +8,7 @@ import {
   Output,
   SimpleChanges,
   TemplateRef,
-  ViewChild
+  ViewChild,
 } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { comparePasswords, Validation } from '@ngx-validate/core';
@@ -23,7 +23,7 @@ const PASSWORD_FIELDS = ['newPassword', 'repeatNewPassword'];
 
 @Component({
   selector: 'abp-change-password',
-  templateUrl: './change-password.component.html'
+  templateUrl: './change-password.component.html',
 })
 export class ChangePasswordComponent implements OnInit, OnChanges {
   protected _visible;
@@ -60,11 +60,11 @@ export class ChangePasswordComponent implements OnInit, OnChanges {
       {
         password: ['', required],
         newPassword: ['', required],
-        repeatNewPassword: ['', required]
+        repeatNewPassword: ['', required],
       },
       {
-        validators: [comparePasswords(PASSWORD_FIELDS)]
-      }
+        validators: [comparePasswords(PASSWORD_FIELDS)],
+      },
     );
   }
 
@@ -76,13 +76,13 @@ export class ChangePasswordComponent implements OnInit, OnChanges {
       .dispatch(
         new ChangePassword({
           currentPassword: this.form.get('password').value,
-          newPassword: this.form.get('newPassword').value
-        })
+          newPassword: this.form.get('newPassword').value,
+        }),
       )
       .pipe(
         finalize(() => {
           this.modalBusy = false;
-        })
+        }),
       )
       .subscribe({
         next: () => {
@@ -91,9 +91,9 @@ export class ChangePasswordComponent implements OnInit, OnChanges {
         },
         error: err => {
           this.toasterService.error(snq(() => err.error.error.message, 'AbpAccount::DefaultErrorMessage'), 'Error', {
-            life: 7000
+            life: 7000,
           });
-        }
+        },
       });
   }