From cf68b7f664ed3f16d7d6e878abd18689d1936cba Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Sun, 5 Mar 2023 15:08:25 +0800
Subject: [PATCH] :sparkles: fix
 https://github.com/siyuan-note/siyuan/issues/7576

---
 app/src/assets/scss/base.scss            |  3 ---
 app/src/assets/scss/mobile.scss          | 16 ----------------
 app/src/assets/template/mobile/index.tpl |  4 +++-
 app/src/mobile/util/initFramework.ts     |  8 +++-----
 app/src/mobile/util/onMessage.ts         |  2 +-
 app/src/protyle/wysiwyg/transaction.ts   |  2 +-
 6 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/app/src/assets/scss/base.scss b/app/src/assets/scss/base.scss
index 1274a0a58..9e5e5af4f 100644
--- a/app/src/assets/scss/base.scss
+++ b/app/src/assets/scss/base.scss
@@ -54,9 +54,6 @@ ctrl+p 搜索: 202
 // 需大于 .block__popover
 .b3-menu: 210
 
-// 需小于 .side-panel
-#transactionTip: 212
-
 // 需大于 mobile .status
 .keyboard: 222
 
diff --git a/app/src/assets/scss/mobile.scss b/app/src/assets/scss/mobile.scss
index 89977424d..e33f1bd92 100644
--- a/app/src/assets/scss/mobile.scss
+++ b/app/src/assets/scss/mobile.scss
@@ -293,22 +293,6 @@
   }
 }
 
-#transactionTip {
-  position: fixed;
-  top: 73px;
-  border-radius: 4px;
-  box-sizing: border-box;
-  background: var(--b3-theme-background);
-  padding: 4px;
-  box-shadow: var(--b3-point-shadow);
-  border: 1px solid var(--b3-theme-surface-lighter);
-  z-index: 1;
-  line-height: 28px;
-  left: 8px;
-  right: 8px;
-  text-align: center;
-}
-
 .svg {
   fill: currentColor;
   display: inline-block;
diff --git a/app/src/assets/template/mobile/index.tpl b/app/src/assets/template/mobile/index.tpl
index 8727094c3..0687d4641 100644
--- a/app/src/assets/template/mobile/index.tpl
+++ b/app/src/assets/template/mobile/index.tpl
@@ -15,6 +15,9 @@
         <use xlink:href="#iconMenu"></use>
     </svg>
     <input class="toolbar__title b3-text-field fn__hidden" id="toolbarName">
+    <svg id="toolbarSync" class="toolbar__icon fn__none">
+        <use xlink:href="#iconCloudSucc"></use>
+    </svg>
     <svg id="toolbarEdit" class="toolbar__icon fn__hidden">
         <use xlink:href="#iconEdit"></use>
     </svg>
@@ -56,6 +59,5 @@
 <div id="message" class="b3-snackbars"></div>
 <div id="status" class="status status--hide"></div>
 <div id="keyboardToolbar" class="keyboard"></div>
-<div id="transactionTip" class="fn__none"></div>
 </body>
 </html>
diff --git a/app/src/mobile/util/initFramework.ts b/app/src/mobile/util/initFramework.ts
index 3518806c5..6e5cd7fb0 100644
--- a/app/src/mobile/util/initFramework.ts
+++ b/app/src/mobile/util/initFramework.ts
@@ -112,6 +112,9 @@ export const initFramework = () => {
         window.siyuan.config.editor.readOnly = editIconElement.getAttribute("xlink:href") === "#iconEdit";
         fetchPost("/api/setting/setEditor", window.siyuan.config.editor);
     });
+    document.getElementById("toolbarSync").addEventListener(getEventName(), () => {
+        syncGuide();
+    });
     if (navigator.userAgent.indexOf("iPhone") > -1 && !window.siyuan.config.readonly && !window.siyuan.config.editor.readOnly) {
         // 不知道为什么 iPhone 中如果是编辑状态，点击文档后无法点击标题
         setTimeout(() => {
@@ -132,11 +135,6 @@ export const initFramework = () => {
     if (window.siyuan.config.openHelp) {
         mountHelp();
     }
-    const transactionTipElement = document.getElementById("transactionTip");
-    transactionTipElement.innerHTML = `${window.siyuan.languages.waitSync} <button class="b3-button">${window.siyuan.languages.syncNow}</button>`;
-    transactionTipElement.querySelector(".b3-button").addEventListener(getEventName(), () => {
-        syncGuide();
-    });
     if (getOpenNotebookCount() > 0) {
         if (window.JSAndroid) {
             if (window.openFileByURL(window.JSAndroid.getBlockURL())) {
diff --git a/app/src/mobile/util/onMessage.ts b/app/src/mobile/util/onMessage.ts
index e497e6dc2..657773291 100644
--- a/app/src/mobile/util/onMessage.ts
+++ b/app/src/mobile/util/onMessage.ts
@@ -27,7 +27,7 @@ export const onMessage = (data: IWebSocketData) => {
             case"syncing":
                 processSync(data);
                 if (data.code !== 0) {
-                    document.getElementById("transactionTip").classList.add("fn__none");
+                    document.getElementById("toolbarSync").classList.add("fn__none");
                 }
                 break;
             case "create":
diff --git a/app/src/protyle/wysiwyg/transaction.ts b/app/src/protyle/wysiwyg/transaction.ts
index 63b373876..a96717283 100644
--- a/app/src/protyle/wysiwyg/transaction.ts
+++ b/app/src/protyle/wysiwyg/transaction.ts
@@ -77,7 +77,7 @@ const promiseTransaction = () => {
         /// #if MOBILE
         if ((0 !== window.siyuan.config.sync.provider || (0 === window.siyuan.config.sync.provider && !needSubscribe(""))) &&
             window.siyuan.config.repo.key && window.siyuan.config.sync.enabled) {
-            document.getElementById("transactionTip").classList.remove("fn__none");
+            document.getElementById("toolbarSync").classList.remove("fn__none");
         }
         /// #endif
         if (response.data[0].doOperations[0].action === "setAttrs") {