Donation v2 strings

Author: ThomasSession

app/src/main/java/org/session/libsession/utilities/StringSubKeys.kt

@@ -65,4 +65,5 @@ object StringSubstitutionConstants {
     const val ACTION_TYPE_KEY: StringSubKey                = "action_type"
     const val ACTIVATION_TYPE_KEY: StringSubKey            = "activation_type"
     const val ENTITY_KEY: StringSubKey                     = "entity"
+    const val DONATE_APPEAL_KEY: StringSubKey                     = "donate_appeal_name"
 }

app/src/main/java/org/thoughtcrime/securesms/home/HomeDialogs.kt

@@ -52,7 +52,6 @@ import org.thoughtcrime.securesms.home.HomeViewModel.Commands.HideUrlDialog
 import org.thoughtcrime.securesms.home.HomeViewModel.Commands.HideUserProfileModal
 import org.thoughtcrime.securesms.home.HomeViewModel.Commands.OnLinkCopied
 import org.thoughtcrime.securesms.home.HomeViewModel.Commands.OnLinkOpened
-import org.thoughtcrime.securesms.home.HomeViewModel.Commands.ShowDonationConfirmation
 import org.thoughtcrime.securesms.home.startconversation.StartConversationSheet
 import org.thoughtcrime.securesms.preferences.prosettings.ProSettingsDestination
 import org.thoughtcrime.securesms.ui.AlertDialog
@@ -69,6 +68,7 @@ import org.thoughtcrime.securesms.ui.PinProCTA
 import org.thoughtcrime.securesms.ui.UserProfileModal
 import org.thoughtcrime.securesms.ui.components.AccentFillButtonRect
 import org.thoughtcrime.securesms.ui.components.annotatedStringResource
+import org.thoughtcrime.securesms.ui.openUrl
 import org.thoughtcrime.securesms.ui.qaTag
 import org.thoughtcrime.securesms.ui.shimmerOverlay
 import org.thoughtcrime.securesms.ui.theme.LocalColors
@@ -77,6 +77,7 @@ import org.thoughtcrime.securesms.ui.theme.LocalType
 import org.thoughtcrime.securesms.ui.theme.PreviewTheme
 import org.thoughtcrime.securesms.ui.theme.SessionMaterialTheme
 import org.thoughtcrime.securesms.ui.theme.blackAlpha40
+import org.thoughtcrime.securesms.util.DonationManager.Companion.URL_DONATE
 
 @Composable
 fun HomeDialogs(
@@ -271,15 +272,14 @@ fun DonationDialog(
         sendCommand(HideDonationCTADialog)
     }
 
-    val title = Phrase.from(context,R.string.donateSessionHelp) //todo DONV2 proper string
-        .put(StringSubstitutionConstants.APP_NAME_KEY, NonTranslatableStringConstants.APP_NAME)
+    val title = Phrase.from(context,R.string.donateSessionAppealTitle)
+        .put(StringSubstitutionConstants.DONATE_APPEAL_KEY, NonTranslatableStringConstants.DONATE_APPEAL_NAME)
         .format()
 
-    val text = Phrase.from(context,R.string.donateSessionDescription)  //todo DONV2 proper string
+    val text = Phrase.from(context,R.string.donateSessionAppealDescription)
         .put(StringSubstitutionConstants.APP_NAME_KEY, NonTranslatableStringConstants.APP_NAME)
         .format()
 
-
     val titleColor: Color = LocalColors.current.text
 
     BasicSessionAlertDialog(
@@ -347,10 +347,10 @@ fun DonationDialog(
                                         .qaTag(R.string.qa_cta_button_positive)
                                         .weight(1f)
                                         .shimmerOverlay(),
-                                    text = "Read Appeal", //stringResource(R.string.donate), //todo DONV2 proper string
+                                    text = stringResource(R.string.donateSessionAppealReadMore),
                                     onClick =  {
-                                        sendCommand(HideDonationCTADialog)
-                                        sendCommand(ShowDonationConfirmation)
+                                        context.openUrl(URL_DONATE)
+                                        sendCommand(HomeViewModel.Commands.OnDonationLinkClicked)
                                     }
                                 )
                             }

app/src/main/java/org/thoughtcrime/securesms/home/HomeViewModel.kt

@@ -20,7 +20,6 @@ import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.onStart
@@ -406,8 +405,9 @@ class HomeViewModel @Inject constructor(
                 _dialogsState.update { it.copy(donationCTA = false) }
             }
 
-            is Commands.ShowDonationConfirmation -> {
-                showUrlDialog(URL_DONATE)
+            is Commands.OnDonationLinkClicked -> {
+                donationManager.onDonationSeen()
+                _dialogsState.update { it.copy(donationCTA = false) }
             }
 
             is Commands.HideUrlDialog -> {
@@ -533,7 +533,7 @@ class HomeViewModel @Inject constructor(
         data object HidePinCTADialog : Commands
         data object HideExpiringCTADialog : Commands
         data object HideExpiredCTADialog : Commands
-        data object ShowDonationConfirmation : Commands
+        data object OnDonationLinkClicked : Commands
         data object HideDonationCTADialog : Commands
         data object HideUserProfileModal : Commands
         data object HideUrlDialog : Commands