test fixes, render helper update

package.json

@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@ecency/ns-query": "^1.1.4",
-    "@ecency/render-helper": "^2.2.29",
+    "@ecency/render-helper": "^2.2.30",
     "@ecency/render-helper-amp": "^1.1.0",
     "@emoji-mart/data": "^1.1.2",
     "@emoji-mart/react": "^1.1.1",
@@ -29,7 +29,6 @@
     "@popperjs/core": "^2.11.8",
     "@tanstack/react-query": "^4.29.7",
     "@tanstack/react-query-devtools": "^4.29.7",
-    "@types/tus-js-client": "^2.1.0",
     "@webscopeio/react-textarea-autocomplete": "^4.8.1",
     "axios": "^0.21.2",
     "axios-cookiejar-support": "^4.0.6",
@@ -136,6 +135,7 @@
     "@types/serialize-javascript": "^1.5.0",
     "@types/sortablejs": "^1.15.0",
     "@types/speakingurl": "^13.0.3",
+    "@types/tus-js-client": "^2.1.0",
     "@types/uuid": "^9.0.0",
     "@types/webpack-env": "^1.14.0",
     "@types/webscopeio__react-textarea-autocomplete": "^4.7.2",

src/common/components/comment/__snapshots__/index.spec.tsx.snap

@@ -203,7 +203,7 @@ exports[`(1) Default render 1`] = `
     </div>
     <div
       className="editor-tool"
-      id="editor-tool-emoji-picker-b8797f25-d649-4f67-90be-df5bc9aad062"
+      id="editor-tool-emoji-picker-beb0f6b7-5dd1-4915-880a-523ac231f2a0"
       role="none"
       title="Emoji"
     >
@@ -552,7 +552,7 @@ exports[`(2) Cancellable, in progress 1`] = `
     </div>
     <div
       className="editor-tool"
-      id="editor-tool-emoji-picker-dcf0eaee-9aa4-465b-97e6-71ba57dfdc47"
+      id="editor-tool-emoji-picker-a0cb8e4d-4aaa-441b-9b91-a43b67957f5c"
       role="none"
       title="Emoji"
     >

src/common/components/entry-list-item/__snapshots__/index.spec.tsx.snap

@@ -249,6 +249,9 @@ exports[`(1) Default render 1`] = `
               fill="currentColor"
             />
           </svg>
+          <span>
+            
+          </span>
         </a>
       </div>
       <div
@@ -534,6 +537,9 @@ exports[`(2) Grid view 1`] = `
               fill="currentColor"
             />
           </svg>
+          <span>
+            
+          </span>
         </a>
       </div>
       <div
@@ -862,6 +868,9 @@ exports[`(3) Nsfw 1`] = `
               fill="currentColor"
             />
           </svg>
+          <span>
+            
+          </span>
         </a>
       </div>
       <div
@@ -1190,6 +1199,9 @@ exports[`(4) Nsfw with active user 1`] = `
               fill="currentColor"
             />
           </svg>
+          <span>
+            
+          </span>
         </a>
       </div>
       <div
@@ -1518,6 +1530,9 @@ exports[`(5) Nsfw but allowed 1`] = `
               fill="currentColor"
             />
           </svg>
+          <span>
+            
+          </span>
         </a>
       </div>
       <div
@@ -1838,6 +1853,9 @@ exports[`(6) Cross post. Bottom menu 1`] = `
               fill="currentColor"
             />
           </svg>
+          <span>
+            
+          </span>
         </a>
       </div>
       <div

src/common/components/entry-reblog-btn/__snapshots__/index.spec.tsx.snap

@@ -17,6 +17,9 @@ exports[`(1) No active user 1`] = `
         fill="currentColor"
       />
     </svg>
+    <span>
+      
+    </span>
   </a>
 </div>
 `;
@@ -38,6 +41,9 @@ exports[`(2) Active user. Not reblogged 1`] = `
         fill="currentColor"
       />
     </svg>
+    <span>
+      
+    </span>
   </a>
 </div>
 `;
@@ -59,6 +65,9 @@ exports[`(3) Active user. Reblogged 1`] = `
         fill="currentColor"
       />
     </svg>
+    <span>
+      
+    </span>
   </a>
 </div>
 `;
@@ -80,6 +89,9 @@ exports[`(4) Reblogging 1`] = `
         fill="currentColor"
       />
     </svg>
+    <span>
+      
+    </span>
   </a>
 </div>
 `;

src/common/components/entry-reblog-btn/index.tsx

@@ -111,7 +111,7 @@ export class EntryReblogBtn extends BaseComponent<Props> {
         <Tooltip content={reblogged ? _t("entry-reblog.delete-reblog") : _t("entry-reblog.reblog")}>
           <a className="inner-btn">
             {repeatSvg}
-            <span>{entry?.reblogs > 0 ? entry.reblogs : ""}</span>
+            <span>{entry?.reblogs && entry?.reblogs > 0 ? entry.reblogs : ""}</span>
           </a>
         </Tooltip>
       </div>

yarn.lock

@@ -1406,10 +1406,10 @@
     xmldom "^0.5.0"
     xss "^1.0.8"
 
-"@ecency/render-helper@^2.2.29":
-  version "2.2.29"
-  resolved "https://registry.yarnpkg.com/@ecency/render-helper/-/render-helper-2.2.29.tgz#313b020e0bb651eef949b41aedaa3728510b00fd"
-  integrity sha512-QRw6kxZeGobB7YoQNkObhMroQnEQYVIB/UPCiyD+yXSr8yitfTn2/m+jTeOpBx98+J+0Y/PzlXDDzXkdO9Gt6A==
+"@ecency/render-helper@^2.2.30":
+  version "2.2.30"
+  resolved "https://registry.yarnpkg.com/@ecency/render-helper/-/render-helper-2.2.30.tgz#33b890910dc90f77e84e7e6bfa6d14dd31371b9b"
+  integrity sha512-+JAPXFSHiquEMmerZe0t4k1gnHwouyba25v+cfIR3kL6KRToy1P5wcBhKyFr85uGx5VEBEFHDiK6Q8mtydNJfg==
   dependencies:
     he "^1.2.0"
     lolight "^1.4.0"
@@ -12866,7 +12866,20 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
-tus-js-client@*, tus-js-client@^3.1.0:
+tus-js-client@*:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/tus-js-client/-/tus-js-client-4.0.1.tgz#9859bacebf88f6ff6f3597d48fc4cccf334a46f7"
+  integrity sha512-rbP0LNKIScy0137YUn0cOkBWsQS5z2815TjxrzzKKWWpiqJVcLhGyuiovm8uDpjzeP8ECCnZGiuSiGIPm5exOQ==
+  dependencies:
+    buffer-from "^1.1.2"
+    combine-errors "^3.0.3"
+    is-stream "^2.0.0"
+    js-base64 "^3.7.2"
+    lodash.throttle "^4.1.1"
+    proper-lockfile "^4.1.2"
+    url-parse "^1.5.7"
+
+tus-js-client@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/tus-js-client/-/tus-js-client-3.1.0.tgz#20af57d06c23823fbe108ccb3a3dcb7503968cb4"
   integrity sha512-Hfpc8ho4C9Lhs/OflPUA/nHUHZJUrKD5upoPBq7dYJJ9DQhWocsjJU2RZYfN16Y5n19j9dFDszwCvVZ5sfcogw==