diff --git a/ui/src/app/components/qr/qr.component.html b/ui/src/app/components/qr/qr.component.html
index 5567c2cc3..ce8bda2cc 100644
--- a/ui/src/app/components/qr/qr.component.html
+++ b/ui/src/app/components/qr/qr.component.html
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/ui/src/app/pages/apps-routes/app-logs/app-logs.page.html b/ui/src/app/pages/apps-routes/app-logs/app-logs.page.html
index b6ca9e725..c0ac91722 100644
--- a/ui/src/app/pages/apps-routes/app-logs/app-logs.page.html
+++ b/ui/src/app/pages/apps-routes/app-logs/app-logs.page.html
@@ -6,7 +6,8 @@
Logs
-
+
+ Refresh
diff --git a/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html b/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
index 4b8368000..df3038dcb 100644
--- a/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
+++ b/ui/src/app/pages/marketplace-routes/marketplace-list/marketplace-list.page.html
@@ -50,7 +50,7 @@
-
+
diff --git a/ui/src/app/pages/server-routes/lan/lan.page.html b/ui/src/app/pages/server-routes/lan/lan.page.html
index ed3d7e4c9..d19f6234c 100644
--- a/ui/src/app/pages/server-routes/lan/lan.page.html
+++ b/ui/src/app/pages/server-routes/lan/lan.page.html
@@ -14,9 +14,13 @@
- Connecting to your Embassy over the Local Area Network (LAN) is great for achieving a faster experience, as well as a fallback in case Tor is experiencing issues.
- View instructions
+ Connecting to your Embassy over LAN is fast and a great fallback in case the Tor network is experiencing issues.
+ View instructions
+
+
+
+
@@ -24,20 +28,10 @@
Download Root CA
- Download and trust your Embassy's Root Certificate Authority to achieve a secure connection on the LAN.
+ Download and trust your Embassy's Root Certificate Authority to establish a secure connection on the LAN.
-
-
-
-
- Setup
-
-
-
-
-
diff --git a/ui/src/app/pages/server-routes/lan/lan.page.ts b/ui/src/app/pages/server-routes/lan/lan.page.ts
index 007729620..818c0ea36 100644
--- a/ui/src/app/pages/server-routes/lan/lan.page.ts
+++ b/ui/src/app/pages/server-routes/lan/lan.page.ts
@@ -1,10 +1,7 @@
import { Component } from '@angular/core'
-import { isPlatform, LoadingController, ToastController } from '@ionic/angular'
-import { copyToClipboard } from 'src/app/util/web.util'
+import { LoadingController, ToastController } from '@ionic/angular'
import { ConfigService } from 'src/app/services/config.service'
import { ApiService } from 'src/app/services/api/embassy-api.service'
-import { PatchDbService } from 'src/app/services/patch-db/patch-db.service'
-import { Subscription } from 'rxjs'
import { ErrorToastService } from 'src/app/services/error-toast.service'
@Component({
@@ -14,13 +11,7 @@ import { ErrorToastService } from 'src/app/services/error-toast.service'
})
export class LANPage {
lanAddress: string
- lanDisabled: LanSetupIssue
- readonly lanDisabledExplanation: { [k in LanSetupIssue]: string } = {
- NotDesktop: `You are using a mobile device. To setup LAN on a mobile device, please use the Start9 Setup App.`,
- NotTor: `For security reasons, you must setup LAN over a Tor connection. Please navigate to your Embassy Tor Address and try again.`,
- }
- readonly docsUrl = 'https://docs.start9.com/user-manual/general/lan-setup'
- subs: Subscription[] = []
+ lanDisabled: string
constructor (
private readonly toastCtrl: ToastController,
@@ -28,25 +19,16 @@ export class LANPage {
private readonly loadingCtrl: LoadingController,
private readonly errToast: ErrorToastService,
private readonly embassyApi: ApiService,
- private readonly patch: PatchDbService,
) { }
ngOnInit () {
- if (isPlatform('ios') || isPlatform('android')) {
- this.lanDisabled = LanSetupIssue.NOT_DESKTOP
- } else if (!this.config.isTor()) {
- this.lanDisabled = LanSetupIssue.NOT_TOR
+ if (!this.config.isTor()) {
+ this.lanDisabled = 'For security reasons, you must setup LAN over a Tor connection. Please navigate to your Embassy Tor Address and try again.'
}
- this.subs = [
- this.patch.watch$('server-info', 'lan-address')
- .subscribe(addr => {
- this.lanAddress = `https://${addr}`
- }),
- ]
}
- ngOnDestroy () {
- this.subs.forEach(sub => sub.unsubscribe())
+ installCert (): void {
+ document.getElementById('install-cert').click()
}
async refreshLAN (): Promise {
@@ -67,21 +49,6 @@ export class LANPage {
}
}
- async copyLAN (): Promise {
- const message = await copyToClipboard(this.lanAddress).then(success => success ? 'copied to clipboard!' : 'failed to copy')
-
- const toast = await this.toastCtrl.create({
- header: message,
- position: 'bottom',
- duration: 1000,
- })
- await toast.present()
- }
-
- installCert (): void {
- document.getElementById('install-cert').click()
- }
-
private async presentToastSuccess (): Promise {
const toast = await this.toastCtrl.create({
header: 'Success',
@@ -103,8 +70,3 @@ export class LANPage {
await toast.present()
}
}
-
-enum LanSetupIssue {
- NOT_TOR = 'NotTor',
- NOT_DESKTOP = 'NotDesktop',
-}
diff --git a/ui/src/app/pages/server-routes/server-logs/server-logs.page.html b/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
index dd90d13d2..91bac3a84 100644
--- a/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
+++ b/ui/src/app/pages/server-routes/server-logs/server-logs.page.html
@@ -6,7 +6,8 @@
Logs
-
+
+ Refresh
diff --git a/ui/src/app/pages/server-routes/wifi/wifi.page.html b/ui/src/app/pages/server-routes/wifi/wifi.page.html
index 77b03b542..440fa8dee 100644
--- a/ui/src/app/pages/server-routes/wifi/wifi.page.html
+++ b/ui/src/app/pages/server-routes/wifi/wifi.page.html
@@ -14,7 +14,8 @@
- Embassy will automatically connect to saved WiFi networks when they are available, allowing you to remove the Ethernet cable.
+ Adding WiFi credentials to your Embassy allows you to remove the Ethernet cable and move the device anywhere you want. Embassy will automatically connect to available networks.
+ View instructions