fix "Verified by" is shown weirdly for contacts that were verified di…

…rectly (#3433)

* fix "Verified by" is shown weirdly for contacts that were verified directly

closes #3421

* changelog change that I forgot to save&commit

* remove 'cached' from varname

CHANGELOG.md

@@ -18,6 +18,7 @@
 - add description for enableChatAuditLog setting
 - fix: import key from file instead of folder, fixes #1863
 - fix webxdc title not updated in document title changes #3412
+- fix "Verified by" is shown weirdly for contacts that were verified directly #3421
 
 <a id="1_40_4"></a>
 

src/renderer/components/dialogs/ViewProfile.tsx

@@ -28,6 +28,9 @@ import { BackendRemote, onDCEvent, Type } from '../../backend-com'
 import { selectedAccountId } from '../../ScreenController'
 import moment from 'moment'
 import { InlineVerifiedIcon } from '../VerifiedIcon'
+import { getLogger } from '../../../shared/logger'
+
+const log = getLogger('renderer/dialogs/ViewProfile')
 
 function LastSeen({ timestamp }: { timestamp: number }) {
   const tx = useTranslationFunction()
@@ -133,6 +136,10 @@ export function ViewProfileInner({
     null
   )
   const [selfChatAvatar, setSelfChatAvatar] = useState<string | null>(null)
+  const [verifier, setVerifier] = useState<null | {
+    label: string
+    action?: () => void
+  }>(null)
   const isDeviceChat = contact.id === C.DC_CONTACT_ID_DEVICE
   const isSelfChat = contact.id === C.DC_CONTACT_ID_SELF
 
@@ -166,6 +173,38 @@ export function ViewProfileInner({
     }
   }, [accountId, isSelfChat])
 
+  useEffect(() => {
+    ;(async () => {
+      if (contact.verifierId === null) {
+        setVerifier({ label: tx('verified') })
+      } else if (contact.verifierId === C.DC_CONTACT_ID_SELF) {
+        setVerifier({ label: tx('verified_by_you') })
+      } else {
+        setVerifier(null) // make sure it rather shows nothing than wrong values
+        const verifierContactId = contact.verifierId
+        try {
+          const { address } = await BackendRemote.rpc.getContact(
+            accountId,
+            verifierContactId
+          )
+          setVerifier({
+            label: tx('verified_by', address),
+            action: () =>
+              openViewProfileDialog(screenContext, verifierContactId),
+          })
+        } catch (error) {
+          log.error('failed to load verifier contact', error)
+          setVerifier({
+            label:
+              'verified by: failed to load verifier contact, please report this issue',
+            action: () =>
+              openViewProfileDialog(screenContext, verifierContactId),
+          })
+        }
+      }
+    })()
+  }, [accountId, contact.id, contact.verifierId])
+
   const CHATLISTITEM_CHAT_HEIGHT =
     Number(useThemeCssVar('--SPECIAL-chatlist-item-chat-height')) || 64
 
@@ -211,22 +250,13 @@ export function ViewProfileInner({
           </div>
           {!isSelfChat && (
             <div className='contact-attributes'>
-              {contact.isVerified && !contact.verifierAddr && (
-                <div>
-                  <InlineVerifiedIcon />
-                  {tx('verified')}
-                </div>
-              )}
-              {contact.isVerified && contact.verifierAddr && (
+              {contact.isVerified && verifier && (
                 <div
-                  className='clickable'
-                  onClick={() =>
-                    contact.verifierId &&
-                    openViewProfileDialog(screenContext, contact.verifierId)
-                  }
+                  className={verifier.action && 'clickable'}
+                  onClick={verifier.action}
                 >
                   <InlineVerifiedIcon />
-                  {tx('verified_by', contact.verifierAddr)}
+                  {verifier.label}
                 </div>
               )}
               {contact.lastSeen !== 0 && (