diff --git a/gui/src/layout/AppRoot.vue b/gui/src/layout/AppRoot.vue
index 36c724f7..f9ee9aa2 100644
--- a/gui/src/layout/AppRoot.vue
+++ b/gui/src/layout/AppRoot.vue
@@ -103,7 +103,7 @@ const loaddata = (reload) => {
store.commit('account/setSelectedMesh', res[0]);
selectedMesh.value = res[0];
}
- if(!merged.value && playing.value && (res.length == 0 || true)){
+ if(!merged.value && playing.value && (res.length == 0)){
merged.value = true;
ztmService.mergePrivateKey(()=>{})
}
diff --git a/gui/src/service/ZtmService.js b/gui/src/service/ZtmService.js
index 7d64ebd1..344b9d5e 100755
--- a/gui/src/service/ZtmService.js
+++ b/gui/src/service/ZtmService.js
@@ -17,12 +17,15 @@ const VITE_APP_PUB_HUB_US = import.meta.env.VITE_APP_PUB_HUB_US;
export default class ZtmService {
getPubHub() {
const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone;
- if (timeZone === "Asia/Shanghai" || timeZone === "Asia/Chongqing" || timeZone === "Asia/Hong_Kong") {
+ if (timeZone === "Asia/Shanghai" || timeZone === "Asia/Chongqing") {
+ const pm = platform();
+ if(pm == 'ios'){
+ return '';
+ } else {
+ return VITE_APP_PUB_HUB_CN;
+ }
+ } else if (timeZone === "Asia/Hong_Kong") {
return VITE_APP_PUB_HUB_CN;
- } else if (timeZone === "Asia/Macau") {
- return VITE_APP_PUB_HUB_US;
- } else if (timeZone.startsWith("Asia")) {
- return VITE_APP_PUB_HUB_US;
} else {
return VITE_APP_PUB_HUB_US;
}
diff --git a/gui/src/views/mesh/Meshes.vue b/gui/src/views/mesh/Meshes.vue
index 83ba8739..4c00fe58 100644
--- a/gui/src/views/mesh/Meshes.vue
+++ b/gui/src/views/mesh/Meshes.vue
@@ -84,6 +84,11 @@ const openEditor = () => {
const emptyMsg = computed(()=>{
return `You haven't joined a mesh yet.`
});
+
+const hasPubHub = computed(()=>{
+ return !!ztmService.getPubHub()
+});
+
const selectedMesh = computed(() => {
return store.getters["account/selectedMesh"]
});
@@ -169,7 +174,7 @@ onMounted(() => {
-
+
@@ -197,7 +202,9 @@ onMounted(() => {
- visibleEditor = true"/>
+ visibleEditor = true"/>
+ visibleEditor = true"/>
+