Remove the Description from the location picker

res/css/views/location/_LocationPicker.scss

@@ -26,7 +26,7 @@ limitations under the License.
 }
 
 #mx_LocationPicker_map {
-    height: 324px;
+    height: 366px;
     border-radius: 8px 8px 0px 0px;
 }
 

src/components/views/location/LocationButton.tsx

@@ -30,7 +30,6 @@ interface IProps extends Pick<ICollapsibleButtonProps, "narrowMode"> {
         uri: string,
         ts: number,
         type: LocationShareType,
-        description: string,
     ) => boolean;
     menuPosition: AboveLeftOf;
     narrowMode: boolean;

src/components/views/location/LocationPicker.tsx

@@ -19,7 +19,6 @@ import maplibregl from 'maplibre-gl';
 import { logger } from "matrix-js-sdk/src/logger";
 
 import SdkConfig from '../../../SdkConfig';
-import Field from "../elements/Field";
 import DialogButtons from "../elements/DialogButtons";
 import Dropdown from "../elements/Dropdown";
 import LocationShareType from "./LocationShareType";
@@ -91,13 +90,11 @@ interface IProps {
         uri: string,
         ts: number,
         type: LocationShareType,
-        description: string,
     ): boolean;
     onFinished(ev?: SyntheticEvent): void;
 }
 
 interface IState {
-    description: string;
     type: LocationShareType;
     position?: GeolocationPosition;
     manualPosition?: GeolocationPosition;
@@ -114,7 +111,6 @@ class LocationPicker extends React.Component<IProps, IState> {
         super(props);
 
         this.state = {
-            description: _t("My location"),
             type: LocationShareType.OnceOff,
             position: undefined,
             manualPosition: undefined,
@@ -209,10 +205,6 @@ class LocationPicker extends React.Component<IProps, IState> {
         this.setState({ position });
     };
 
-    private onDescriptionChange = (ev: React.ChangeEvent<HTMLInputElement>) => {
-        this.setState({ description: ev.target.value });
-    };
-
     private onOk = () => {
         const position = (this.state.type == LocationShareType.Custom) ?
             this.state.manualPosition : this.state.position;
@@ -221,7 +213,6 @@ class LocationPicker extends React.Component<IProps, IState> {
             position ? getGeoUri(position) : undefined,
             position ? position.timestamp : undefined,
             this.state.type,
-            this.state.description,
         );
         this.props.onFinished();
     };
@@ -263,14 +254,6 @@ class LocationPicker extends React.Component<IProps, IState> {
                             width={400}
                         />
 
-                        <Field
-                            label={_t('Description')}
-                            onChange={this.onDescriptionChange}
-                            value={this.state.description}
-                            width={400}
-                            className="mx_LocationPicker_description"
-                        />
-
                         <DialogButtons primaryButton={_t('Share')}
                             onPrimaryButtonClick={this.onOk}
                             onCancel={this.props.onFinished}

src/components/views/rooms/MessageComposer.tsx

@@ -457,14 +457,13 @@ export default class MessageComposer extends React.Component<IProps, IState> {
         uri: string,
         ts: number,
         _type: LocationShareType,
-        description: string | null,
     ): boolean => {
         if (!uri) return false;
         try {
-            const text = textForLocation(uri, ts, description);
+            const text = textForLocation(uri, ts, null);
             MatrixClientPeg.get().sendMessage(
                 this.props.room.roomId,
-                makeLocationContent(text, uri, ts, description),
+                makeLocationContent(text, uri, ts, null),
             );
         } catch (e) {
             logger.error("Error sending location:", e);

src/i18n/strings/en_EN.json

@@ -2129,7 +2129,6 @@
     "Share location": "Share location",
     "Share custom location": "Share custom location",
     "Share my current location as a once off": "Share my current location as a once off",
-    "My location": "My location",
     "Type of location share": "Type of location share",
     "Failed to load group members": "Failed to load group members",
     "Filter community members": "Filter community members",