Merge branch 'develop' into johannes/find-myself

src/components/views/location/LocationPicker.tsx

@@ -207,7 +207,7 @@ class LocationPicker extends React.Component<ILocationPickerProps, IState> {
         this.props.onFinished();
     };
 
-    public render(): JSX.Element {
+    public render(): React.ReactNode {
         if (this.state.error) {
             return (
                 <div className="mx_LocationPicker mx_LocationPicker_hasError">

src/components/views/location/LocationShareMenu.tsx

@@ -38,7 +38,7 @@ type Props = Omit<ILocationPickerProps, "onChoose" | "shareType"> & {
     relation?: IEventRelation;
 };
 
-const getEnabledShareTypes = (relation): LocationShareType[] => {
+const getEnabledShareTypes = (relation?: IEventRelation): LocationShareType[] => {
     const enabledShareTypes = [LocationShareType.Own];
 
     // live locations cannot have a relation

src/components/views/location/LocationViewDialog.tsx

@@ -54,7 +54,7 @@ export default class LocationViewDialog extends React.Component<IProps, IState>
         this.setState({ error });
     };
 
-    public render(): JSX.Element {
+    public render(): React.ReactNode {
         const { mxEvent } = this.props;
 
         // only pass member to marker when should render avatar marker