diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt b/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt index 60dcb0483..e5b364af8 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt @@ -9,6 +9,7 @@ import androidx.compose.material.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -44,14 +45,15 @@ fun CreateSimpleXAddress(m: ChatModel) { val connReqContact = m.controller.apiCreateUserAddress() if (connReqContact != null) { m.userAddress.value = UserContactLinkRec(connReqContact) - try { - val u = m.controller.apiSetProfileAddress(true) - if (u != null) { - m.updateUser(u) - } - } catch (e: Exception) { - Log.e(TAG, "CreateSimpleXAddress apiSetProfileAddress: ${e.stackTraceToString()}") - } +// TODO uncomment in v5.2 +// try { +// val u = m.controller.apiSetProfileAddress(true) +// if (u != null) { +// m.updateUser(u) +// } +// } catch (e: Exception) { +// Log.e(TAG, "CreateSimpleXAddress apiSetProfileAddress: ${e.stackTraceToString()}") +// } progressIndicator = false } } @@ -92,7 +94,8 @@ private fun CreateSimpleXAddressLayout( ContinueButton(nextStep) } else { CreateAddressButton(createAddress) - TextBelowButton(stringResource(R.string.your_contacts_will_see_it)) +// TODO remove color in v5.2 + TextBelowButton(stringResource(R.string.your_contacts_will_see_it), color = Color.Transparent) Spacer(Modifier.weight(1f)) SkipButton(nextStep) } @@ -141,7 +144,8 @@ private fun SkipButton(onClick: () -> Unit) { } @Composable -private fun TextBelowButton(text: String) { +private fun TextBelowButton(text: String, color: Color = Color.Unspecified) { + // TODO remove color in v5.2 Text( text, Modifier @@ -149,6 +153,7 @@ private fun TextBelowButton(text: String) { .padding(horizontal = DEFAULT_PADDING * 3), style = MaterialTheme.typography.subtitle1, textAlign = TextAlign.Center, + color = color ) } diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt index c9ce92f10..7d7646598 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt @@ -69,15 +69,16 @@ fun UserAddressView( if (connReqContact != null) { chatModel.userAddress.value = UserContactLinkRec(connReqContact) - AlertManager.shared.showAlertDialog( - title = generalGetString(R.string.share_address_with_contacts_question), - text = generalGetString(R.string.add_address_to_your_profile), - confirmText = generalGetString(R.string.share_verb), - onConfirm = { - setProfileAddress(true) - shareViaProfile.value = true - } - ) +// TODO uncomment in v5.2 +// AlertManager.shared.showAlertDialog( +// title = generalGetString(R.string.share_address_with_contacts_question), +// text = generalGetString(R.string.add_address_to_your_profile), +// confirmText = generalGetString(R.string.share_verb), +// onConfirm = { +// setProfileAddress(true) +// shareViaProfile.value = true +// } +// ) } progressIndicator = false } @@ -203,7 +204,8 @@ private fun UserAddressLayout( QRCode(userAddress.connReqContact, Modifier.padding(horizontal = DEFAULT_PADDING, vertical = DEFAULT_PADDING_HALF).aspectRatio(1f)) ShareAddressButton { share(userAddress.connReqContact) } ShareViaEmailButton { sendEmail(userAddress) } - ShareWithContactsButton(shareViaProfile, setProfileAddress) +// TODO uncomment in v5.2 +// ShareWithContactsButton(shareViaProfile, setProfileAddress) AutoAcceptToggle(autoAcceptState) { saveAas(autoAcceptState.value, autoAcceptStateSaved) } LearnMoreButton(learnMore) } diff --git a/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift b/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift index 28a58ba7c..48acf7a79 100644 --- a/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift +++ b/apps/ios/Shared/Views/Onboarding/CreateSimpleXAddress.swift @@ -81,11 +81,12 @@ struct CreateSimpleXAddress: View { DispatchQueue.main.async { m.userAddress = UserContactLink(connReqContact: connReqContact) } - if let u = try await apiSetProfileAddress(on: true) { - DispatchQueue.main.async { - m.updateUser(u) - } - } +// TODO uncomment in v5.2 +// if let u = try await apiSetProfileAddress(on: true) { +// DispatchQueue.main.async { +// m.updateUser(u) +// } +// } await MainActor.run { progressIndicator = false } } catch let error { logger.error("CreateSimpleXAddress create address: \(responseError(error))") @@ -100,9 +101,9 @@ struct CreateSimpleXAddress: View { } label: { Text("Create SimpleX address").font(.title) } - Group { - Text("Your contacts in SimpleX will see it.\nYou can change it in Settings.") - } + Text("Your contacts in SimpleX will see it.\nYou can change it in Settings.") + // TODO remove in in v5.2 + .foregroundColor(.clear) .multilineTextAlignment(.center) .font(.footnote) .padding(.horizontal, 32) diff --git a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift index 134eeb969..56cab6bc4 100644 --- a/apps/ios/Shared/Views/UserSettings/UserAddressView.swift +++ b/apps/ios/Shared/Views/UserSettings/UserAddressView.swift @@ -195,7 +195,8 @@ struct UserAddressView: View { if MFMailComposeViewController.canSendMail() { shareViaEmailButton(userAddress) } - shareWithContactsButton() +// TODO uncomment in 5.2 +// shareWithContactsButton() autoAcceptToggle() learnMoreButton() } header: { @@ -222,7 +223,8 @@ struct UserAddressView: View { let connReqContact = try await apiCreateUserAddress() DispatchQueue.main.async { chatModel.userAddress = UserContactLink(connReqContact: connReqContact) - alert = .shareOnCreate +// TODO uncomment in 5.2 +// alert = .shareOnCreate progressIndicator = false } } catch let error { diff --git a/src/Simplex/Chat/Help.hs b/src/Simplex/Chat/Help.hs index 8997f150d..fa7dbafff 100644 --- a/src/Simplex/Chat/Help.hs +++ b/src/Simplex/Chat/Help.hs @@ -201,7 +201,7 @@ myAddressHelpInfo = styleMarkdown [ green "Your contact address commands:", indent <> highlight "/address " <> " - create your address", - indent <> highlight "/profile_address on/off " <> " - share address with your contacts (it will be added to your profile)", + -- indent <> highlight "/profile_address on/off " <> " - share address with your contacts (it will be added to your profile)", indent <> highlight "/delete_address " <> " - delete your address (accepted contacts will remain connected)", indent <> highlight "/show_address " <> " - show your address", indent <> highlight "/accept " <> " - accept contact request", diff --git a/src/Simplex/Chat/View.hs b/src/Simplex/Chat/View.hs index 3e3797086..88f11256f 100644 --- a/src/Simplex/Chat/View.hs +++ b/src/Simplex/Chat/View.hs @@ -633,7 +633,7 @@ connReqContact_ intro cReq = "", "Anybody can send you contact requests with: " <> highlight' "/c ", "to show it again: " <> highlight' "/sa", - "to share with your contacts: " <> highlight' "/profile_address on", + -- "to share with your contacts: " <> highlight' "/profile_address on", "to delete it: " <> highlight' "/da" <> " (accepted contacts will remain connected)" ] diff --git a/tests/ChatTests/Utils.hs b/tests/ChatTests/Utils.hs index 3bb6f6721..a6223cfaf 100644 --- a/tests/ChatTests/Utils.hs +++ b/tests/ChatTests/Utils.hs @@ -355,7 +355,7 @@ getContactLink cc created = do cc <## "" cc <## "Anybody can send you contact requests with: /c " cc <## "to show it again: /sa" - cc <## "to share with your contacts: /profile_address on" + -- cc <## "to share with your contacts: /profile_address on" cc <## "to delete it: /da (accepted contacts will remain connected)" pure link