From 42ed78d947dbe6625adb0f40aa2f8dcee1f11814 Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Tue, 9 Aug 2022 20:52:57 +0200
Subject: [PATCH] fix: remove web ui version and keep revision (#2000)

* fix: remove web ui version and keep revision
* fix: replace web ui version by revision in status page
* style: simplify UI revision

no need for it to be clickable (kubo version is not)
nor for it to say "revision" (it is UI, and not kubo or desktop
revision)

Co-authored-by: Marcin Rataj <lidel@lidel.org>
---
 public/locales/en/app.json | 6 +++---
 src/navigation/NavBar.js   | 7 +------
 src/status/NodeInfo.js     | 2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/public/locales/en/app.json b/public/locales/en/app.json
index 25dec68db..ddba598c3 100644
--- a/public/locales/en/app.json
+++ b/public/locales/en/app.json
@@ -37,8 +37,7 @@
   },
   "nav": {
     "bugsLink": "Report a bug",
-    "codeLink": "See the code",
-    "revision": "Revision"
+    "codeLink": "See the code"
   },
   "status": {
     "connectedToIpfs": "Connected to IPFS",
@@ -91,7 +90,8 @@
     "totalOut": "Total out",
     "unknown": "Unknown",
     "ui": "UI",
-    "upSpeed": "Outgoing"
+    "upSpeed": "Outgoing",
+    "revision": "Revision"
   },
   "tour": {
     "back": "Back",
diff --git a/src/navigation/NavBar.js b/src/navigation/NavBar.js
index 3e09a1cc0..050997c8c 100644
--- a/src/navigation/NavBar.js
+++ b/src/navigation/NavBar.js
@@ -55,8 +55,6 @@ export const NavBar = ({ t }) => {
   const bugsUrl = `${codeUrl}/issues`
   const gitRevision = process.env.REACT_APP_GIT_REV
   const revisionUrl = `${codeUrl}/commit/${gitRevision}`
-  const webUiVersion = process.env.REACT_APP_VERSION
-  const webUiVersionUrl = `${codeUrl}/releases/tag/v${webUiVersion}`
   return (
     <div className='h-100 fixed-l flex flex-column justify-between' style={{ overflowY: 'auto', width: 'inherit' }}>
       <div className='flex flex-column'>
@@ -75,11 +73,8 @@ export const NavBar = ({ t }) => {
         </div>
       </div>
       <div className='dn db-l navbar-footer mb2 tc center f7 o-80 glow'>
-        { webUiVersion && <div className='mb1'>
-          <a className='link white' href={webUiVersionUrl} target='_blank' rel='noopener noreferrer'>{t('app:terms.ui')} v{webUiVersion}</a>
-        </div> }
         { gitRevision && <div className='mb1'>
-          <a className='link white' href={revisionUrl} target='_blank' rel='noopener noreferrer'>{t('app:nav.revision')} {gitRevision}</a>
+          <a className='link white' href={revisionUrl} target='_blank' rel='noopener noreferrer'>{t('app:terms.revision')} {gitRevision}</a>
         </div> }
         <div className='mb1'>
           <a className='link white' href={codeUrl} target='_blank' rel='noopener noreferrer'>{t('app:nav.codeLink')}</a>
diff --git a/src/status/NodeInfo.js b/src/status/NodeInfo.js
index 0ea5dcdf4..982d6186b 100644
--- a/src/status/NodeInfo.js
+++ b/src/status/NodeInfo.js
@@ -29,7 +29,7 @@ class NodeInfo extends React.Component {
       <DefinitionList>
         <Definition term={t('terms.peerId')} desc={this.getField(identity, 'id')} />
         <Definition term={t('terms.agent')} desc={<VersionLink agentVersion={this.getField(identity, 'agentVersion')} />} />
-        <Definition term={t('terms.ui')} desc={<a href={'https://github.com/ipfs-shipyard/ipfs-webui/releases/tag/v' + process.env.REACT_APP_VERSION} className='link blue' target='_blank' rel='noopener noreferrer'>v{process.env.REACT_APP_VERSION}</a>} />
+        <Definition term={t('terms.ui')} desc={process.env.REACT_APP_GIT_REV} />
       </DefinitionList>
     )
   }