diff --git a/client/translations/amneziavpn_ru.ts b/client/translations/amneziavpn_ru.ts index f94e0514..cfa33040 100644 --- a/client/translations/amneziavpn_ru.ts +++ b/client/translations/amneziavpn_ru.ts @@ -1332,7 +1332,7 @@ Already installed containers were found on the server. All installed containers Clear Amnezia cache - Очистить кэш Amnezia на сервере + Очистить кэш Amnezia diff --git a/client/ui/qml/Pages2/PageHome.qml b/client/ui/qml/Pages2/PageHome.qml index cc49e4f0..222f7764 100644 --- a/client/ui/qml/Pages2/PageHome.qml +++ b/client/ui/qml/Pages2/PageHome.qml @@ -32,7 +32,7 @@ PageType { function onRestorePageHomeState(isContainerInstalled) { buttonContent.state = "expanded" if (isContainerInstalled) { - containersDropDown.menuVisible = true + containersDropDown.rootButtonClickedFunction() } } function onForceCloseDrawer() { diff --git a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml index a223f646..c82ce855 100644 --- a/client/ui/qml/Pages2/PageSetupWizardInstalling.qml +++ b/client/ui/qml/Pages2/PageSetupWizardInstalling.qml @@ -28,17 +28,11 @@ PageType { ContainersModel.setDefaultContainer(ContainersModel.getCurrentlyProcessedContainerIndex()) } - PageController.goToStartPage() + PageController.closePage() // close installing page + PageController.closePage() // close protocol settings page + if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageHome)) { PageController.restorePageHomeState(true) - } else if (stackView.currentItem.objectName === PageController.getPagePath(PageEnum.PageSettings)) { - PageController.goToPage(PageEnum.PageSettingsServersList, false) - PageController.goToPage(PageEnum.PageSettingsServerInfo, false) - if (isServiceInstall) { - PageController.goToPageSettingsServerServices() - } - } else { - PageController.goToPage(PageEnum.PageHome) } PageController.showNotificationMessage(finishedMessage)