From 316748988bed485803385850d381ac0ae8a254d3 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Fri, 23 Jul 2021 18:24:51 +0200
Subject: [PATCH] Allow contact's profile modal to be shown...

even if there is now OMEMO device info
---
 src/modals/templates/profile.js              | 11 +++++------
 src/plugins/omemo/overrides/profile-modal.js |  9 +++------
 src/shared/chat/message.js                   |  2 +-
 src/shared/styles/messages.scss              |  2 ++
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/modals/templates/profile.js b/src/modals/templates/profile.js
index b933bafc0..b0fd134f4 100644
--- a/src/modals/templates/profile.js
+++ b/src/modals/templates/profile.js
@@ -58,7 +58,7 @@ const device_list = (o) => {
                     ${i18n_other_devices}
                 </label>
             </li>
-            ${ o.view.other_devices.map(device => device_item(Object.assign({device}, o))) }
+            ${ o.view.other_devices?.map(device => device_item(Object.assign({device}, o))) }
         </ul>
         <div class="form-group"><button type="submit" class="save-form btn btn-primary">${i18n_remove_devices}</button></div>
     `;
@@ -81,7 +81,7 @@ const omemo_page = (o) => {
                 <div class="form-group">
                     <button type="button" class="generate-bundle btn btn-danger">${i18n_generate}</button>
                 </div>
-                ${ o.view.other_devices.length ? device_list(o) : '' }
+                ${ o.view.other_devices?.length ? device_list(o) : '' }
             </form>
         </div>`;
 }
@@ -100,16 +100,15 @@ export default (o) => {
     const i18n_omemo = __('OMEMO');
     const i18n_profile = __('Profile');
 
-    const navigation =  html`
-        <ul class="nav nav-pills justify-content-center">
+    const navigation = o.view.current_device ?
+        html`<ul class="nav nav-pills justify-content-center">
             <li role="presentation" class="nav-item">
                 <a class="nav-link active" id="profile-tab" href="#profile-tabpanel" aria-controls="profile-tabpanel" role="tab" data-toggle="tab">${i18n_profile}</a>
             </li>
             <li role="presentation" class="nav-item">
                 <a class="nav-link" id="omemo-tab" href="#omemo-tabpanel" aria-controls="omemo-tabpanel" role="tab" data-toggle="tab">${i18n_omemo}</a>
             </li>
-        </ul>`;
-
+        </ul>` : '';
 
     return html`
         <div class="modal-dialog" role="document">
diff --git a/src/plugins/omemo/overrides/profile-modal.js b/src/plugins/omemo/overrides/profile-modal.js
index 0a601afbe..e52c4c60d 100644
--- a/src/plugins/omemo/overrides/profile-modal.js
+++ b/src/plugins/omemo/overrides/profile-modal.js
@@ -25,15 +25,12 @@ const ProfileModal = {
     },
 
     beforeRender () {
-        const device_id = _converse.omemo_store.get('device_id');
-
+        const device_id = _converse.omemo_store?.get('device_id');
         if (device_id) {
             this.current_device = this.devicelist.devices.get(device_id);
+            this.other_devices = this.devicelist.devices.filter(d => d.get('id') !== device_id);
         }
-        this.other_devices = this.devicelist.devices.filter(d => d.get('id') !== device_id);
-        if (this.__super__.beforeRender) {
-            return this.__super__.beforeRender.apply(this, arguments);
-        }
+        return this.__super__.beforeRender?.apply(this, arguments);
     },
 
     selectAll (ev) {
diff --git a/src/shared/chat/message.js b/src/shared/chat/message.js
index 0586c1434..654cd3542 100644
--- a/src/shared/chat/message.js
+++ b/src/shared/chat/message.js
@@ -276,7 +276,7 @@ export default class Message extends CustomElement {
 
     showUserModal (ev) {
         if (this.model.get('sender') === 'me') {
-            _converse.xmppstatusview.showProfileModal(ev);
+            api.modal.show(_converse.ProfileModal, {model: this.model}, ev);
         } else if (this.model.get('type') === 'groupchat') {
             ev.preventDefault();
             api.modal.show(OccupantModal, { 'model': this.model.occupant }, ev);
diff --git a/src/shared/styles/messages.scss b/src/shared/styles/messages.scss
index 68aae034c..88a80e3b0 100644
--- a/src/shared/styles/messages.scss
+++ b/src/shared/styles/messages.scss
@@ -10,6 +10,8 @@
     }
     .message {
         .show-msg-author-modal {
+            align-self: flex-start; // Don't expand height to that of largest sibling
+                                    // https://stackoverflow.com/questions/27575779/prevent-a-flex-items-height-from-expanding-to-match-other-flex-items/40156422#40156422
             color: var(--text-color) !important;
         }