ui(jar): hide empty internal change accounts

joinmarket-webui · Oct 31, 2023 · 80b2e14 · 80b2e14
1 parent 3b45e3a
commit 80b2e14
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 21 deletions.
diff --git a/src/components/jar_details/DisplayBranch.tsx b/src/components/jar_details/DisplayBranch.tsx
@@ -4,9 +4,9 @@ import { useTranslation } from 'react-i18next'
 import Balance from '../Balance'
 import { useSettings } from '../../context/SettingsContext'
 import { Branch, BranchEntry } from '../../context/WalletContext'
-import styles from './DisplayBranch.module.css'
 import { CopyButton } from '../CopyButton'
 import Sprite from '../Sprite'
+import styles from './DisplayBranch.module.css'
 
 const toHdPathIndex = (hdPath: string) => {
   const indexOfLastSeparator = hdPath.lastIndexOf('/')
@@ -76,15 +76,6 @@ export function DisplayBranchBody({ branch }: DisplayBranchProps) {
   )
 }
 
-export default function DisplayBranch({ branch }: DisplayBranchProps) {
-  return (
-    <article>
-      <DisplayBranchHeader branch={branch} />
-      <DisplayBranchBody branch={branch} />
-    </article>
-  )
-}
-
 interface DisplayBranchEntryProps extends rb.CardProps {
   entry: BranchEntry
 }

diff --git a/src/components/jar_details/JarDetailsOverlay.tsx b/src/components/jar_details/JarDetailsOverlay.tsx
@@ -414,16 +414,18 @@ const JarDetailsOverlay = (props: JarDetailsOverlayProps) => {
                   </>
                 ) : (
                   <rb.Accordion flush className="p-3 p-lg-0">
-                    {jar.branches.map((branch, index) => (
-                      <rb.Accordion.Item className={styles.jarItem} key={branch.branch} eventKey={`${index}`}>
-                        <rb.Accordion.Header>
-                          <DisplayBranchHeader branch={branch} />
-                        </rb.Accordion.Header>
-                        <rb.Accordion.Body>
-                          <DisplayBranchBody branch={branch} />
-                        </rb.Accordion.Body>
-                      </rb.Accordion.Item>
-                    ))}
+                    {jar.branches
+                      .filter((it) => it.entries.length > 0)
+                      .map((branch, index) => (
+                        <rb.Accordion.Item className={styles.jarItem} key={branch.branch} eventKey={`${index}`}>
+                          <rb.Accordion.Header>
+                            <DisplayBranchHeader branch={branch} />
+                          </rb.Accordion.Header>
+                          <rb.Accordion.Body>
+                            <DisplayBranchBody branch={branch} />
+                          </rb.Accordion.Body>
+                        </rb.Accordion.Item>
+                      ))}
                   </rb.Accordion>
                 )}
               </div>

diff --git a/src/context/ServiceInfoContext.tsx b/src/context/ServiceInfoContext.tsx
@@ -208,7 +208,7 @@ const ServiceInfoProvider = ({ children }: PropsWithChildren<{}>) => {
         })
         .catch((err) => {
           if (!signal.aborted) {
-            const isUnauthorized = err instanceof Api.JmApiError && err.response.status === 401
+            const isUnauthorized = err instanceof Api.JmApiError && err.response?.status === 401
             if (isUnauthorized) {
               resetWalletAndClearSession()
             } else {