From 65bd892d8f55bdc537d31a657359a5e26896d339 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 23 Aug 2021 20:09:45 +0200 Subject: [PATCH] better naming --- src/domain/login/LoginViewModel.js | 4 ++-- src/platform/web/ui/login/LoginView.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/domain/login/LoginViewModel.js b/src/domain/login/LoginViewModel.js index f2e9f0a5..9cdf9290 100644 --- a/src/domain/login/LoginViewModel.js +++ b/src/domain/login/LoginViewModel.js @@ -49,7 +49,7 @@ export class LoginViewModel extends ViewModel { get startSSOLoginViewModel() { return this._startSSOLoginViewModel; } get completeSSOLoginViewModel(){ return this._completeSSOLoginViewModel; } get homeserver() { return this._homeserver; } - get forwardedHomeserver() { return this._loginOptions?.homeserver; } + get resolvedHomeserver() { return this._loginOptions?.homeserver; } get errorMessage() { return this._errorMessage; } get showHomeserver() { return !this._hideHomeserver; } get loadViewModel() {return this._loadViewModel; } @@ -204,7 +204,7 @@ export class LoginViewModel extends ViewModel { this._abortQueryOperation = this.track(() => queryOperation.abort()); this.emitChange("isFetchingLoginOptions"); this._loginOptions = await queryOperation.result; - this.emitChange("forwardedHomeserver"); + this.emitChange("resolvedHomeserver"); } catch (e) { if (e.name === "AbortError") { diff --git a/src/platform/web/ui/login/LoginView.js b/src/platform/web/ui/login/LoginView.js index 8ed91357..aa89ccca 100644 --- a/src/platform/web/ui/login/LoginView.js +++ b/src/platform/web/ui/login/LoginView.js @@ -48,8 +48,8 @@ export class LoginView extends TemplateView { }), t.p({className: { LoginView_forwardInfo: true, - hidden: vm => !vm.forwardedHomeserver - }}, vm => vm.i18n`You will connect to ${vm.forwardedHomeserver}.`), + hidden: vm => !vm.resolvedHomeserver + }}, vm => vm.i18n`You will connect to ${vm.resolvedHomeserver}.`), t.if(vm => vm.errorMessage, (t, vm) => t.p({className: "error"}, vm.i18n(vm.errorMessage))), ] )),