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

justjanne · web-flow · commit 0ae0737097c1 · 2022-05-20T18:06:29.000+02:00
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
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><rect width="4" height="4" x="2" y="2" fill="#737D8C" rx="1"/><path fill="#737D8C" fill-rule="evenodd" d="M5.5 11.25a.75.75 0 0 1-.75-.75V8a.75.75 0 0 0-1.5 0v2.5a2.25 2.25 0 0 0 2.25 2.25H8a.75.75 0 0 0 0-1.5H5.5Z" clip-rule="evenodd"/><rect width="4" height="4" x="10" y="10" fill="#737D8C" rx="1"/></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"

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,6 @@ limitations under the License.`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`.mx_MessageContextMenu_jumpToEvent::before {`
`114`		`- mask-image: url('$(res)/img/element-icons/left-arrow.svg');`
	`114`	`+ mask-image: url('$(res)/img/element-icons/child-relationship.svg');`
`115`	`115`	`}`
`116`	`116`	`}`