diff --git a/src/app/webengine/map/MapPosition.qml b/src/app/webengine/map/MapPosition.qml index 636d92ab81c61d4843618ed1c8be973933ccece4..86677992c43d2ff48f2e8e3bd19dae28a5dca835 100644 --- a/src/app/webengine/map/MapPosition.qml +++ b/src/app/webengine/map/MapPosition.qml @@ -219,6 +219,7 @@ Item { PositionManager.startPositioning() //load locations that were received before this conversation was opened PositionManager.loadPreviousLocations(attachedAccountId); + isSharingToCurrentConversation = PositionManager.isPositionSharedToConv(attachedAccountId, currentConvId) } } } @@ -230,7 +231,6 @@ Item { StopSharingPositionPopup { id: stopSharingPositionPopup - property alias attachedAccountId: root.attachedAccountId } } } diff --git a/src/app/webengine/map/MapPositionSharingControl.qml b/src/app/webengine/map/MapPositionSharingControl.qml index 92a16240e761a8b5561efe2a7cfd7e093c3cf335..5e578cdfcae3dde6f1d023a609ace95b230333fa 100644 --- a/src/app/webengine/map/MapPositionSharingControl.qml +++ b/src/app/webengine/map/MapPositionSharingControl.qml @@ -98,7 +98,8 @@ ColumnLayout { textLeftPadding: JamiTheme.buttontextPadding textRightPadding: JamiTheme.buttontextPadding primary: true - visible: !isSharingToCurrentConversation && !isUnpin + visible: !isSharingToCurrentConversation && !isUnpin && webView.isLoaded + text: JamiStrings.shareLocation color: isError ? JamiTheme.buttonTintedGreyInactive