Merge branch 'develop' into justjanne/fix/19305-login-after-registering

matrix-org · May 20, 2022 · 0ae0737 · 0ae0737
2 parents 665f8b5 + 025fb63
commit 0ae0737
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/res/css/views/context_menus/_MessageContextMenu.scss b/res/css/views/context_menus/_MessageContextMenu.scss
@@ -111,6 +111,6 @@ limitations under the License.
     }
 
     .mx_MessageContextMenu_jumpToEvent::before {
-        mask-image: url('$(res)/img/element-icons/left-arrow.svg');
+        mask-image: url('$(res)/img/element-icons/child-relationship.svg');
     }
 }
diff --git a/res/img/element-icons/child-relationship.svg b/res/img/element-icons/child-relationship.svg
diff --git a/res/img/element-icons/left-arrow.svg b/res/img/element-icons/left-arrow.svg
diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx
@@ -499,7 +499,7 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
 
         let jumpToRelatedEventButton: JSX.Element;
         const relatedEventId = mxEvent.getWireContent()?.["m.relates_to"]?.event_id;
-        if (relatedEventId) {
+        if (relatedEventId && SettingsStore.getValue("developerMode")) {
             jumpToRelatedEventButton = (
                 <IconizedContextMenuOption
                     iconClassName="mx_MessageContextMenu_jumpToEvent"