From 90f32c853b1b5cc222d817015989f7f158aef099 Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Sat, 23 Sep 2023 15:18:48 +0200
Subject: [PATCH] refactor: simplify version fetch

---
 add-on/src/lib/ipfs-companion.js | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/add-on/src/lib/ipfs-companion.js b/add-on/src/lib/ipfs-companion.js
index c6dd1ba6f..aca4e7d16 100644
--- a/add-on/src/lib/ipfs-companion.js
+++ b/add-on/src/lib/ipfs-companion.js
@@ -233,19 +233,15 @@ export default async function init (inQuickImport = false) {
   async function fetchKuboRpcBackendVersion () {
     // prefer AgentVersion string from 'ipfs id' , but if that fails, use 'ipfs version'
     try {
-      const id = await ipfs.id()
-      if (id) {
-        return id.agentVersion
+      const { agentVersion } = await ipfs.id()
+      if (agentVersion) {
+        return agentVersion
       }
-    } catch (_) {
-      try {
-        const v = await ipfs.version()
-        if (v) {
-          return v.commit ? v.version + '/' + v.commit : v.version
-        }
-      } catch (_) {
+      const { version, commit } = await ipfs.version()
+      if (version || commit) {
+        return [version, commit].filter(Boolean).join('/')
       }
-    }
+    } catch (_) {}
     return null
   }