Updated review prompt modal

mpretty-cyro · Dec 16, 2025 · Dec 12, 2025 · Dec 14, 2025 · Dec 14, 2025 · Dec 14, 2025
commit 6aeff73b9c236972ee9e950ed7bb175995bd7c82
diff --git a/Session/Home/App Review/AppReviewPromptModel.swift b/Session/Home/App Review/AppReviewPromptModel.swift
@@ -9,9 +9,11 @@ struct AppReviewPromptModel {
     let message: String
 
     var primaryButtonTitle: String?
+    var primaryButtonColor: ThemeValue?
     var primaryButtonAccessibilityIdentifier: String?
 
     var secondaryButtonTitle: String?
+    var secondaryButtonColor: ThemeValue?
     var secondaryButtonAccessibilityIdentifier: String?
 }
 
@@ -87,14 +89,16 @@ enum AppReviewPromptState {
                     message: "enjoyingSessionDescription"
                         .put(key: "app_name", value:  Constants.app_name)
                         .localized(),
-                    primaryButtonTitle: "enjoyingSessionButtonPositive"
-                        .put(key: "emoji", value: "❤️")
-                        .localized(),
-                    primaryButtonAccessibilityIdentifier: "enjoy-session-positive-button",
-                    secondaryButtonTitle: "enjoyingSessionButtonNegative"
+                    primaryButtonTitle: "enjoyingSessionButtonNegative"
                         .put(key: "emoji", value: "😕")
                         .localized(),
-                    secondaryButtonAccessibilityIdentifier: "enjoy-session-negative-button"
+                    primaryButtonColor: .textPrimary,
+                    primaryButtonAccessibilityIdentifier: "enjoy-session-negative-button",
+                    secondaryButtonTitle: "enjoyingSessionButtonPositive"
+                        .put(key: "emoji", value: "❤️")
+                        .localized(),
+                    secondaryButtonColor: .sessionButton_text,
+                    secondaryButtonAccessibilityIdentifier: "enjoy-session-positive-button"
                 )
 
             case .rateSession:
@@ -107,14 +111,16 @@ enum AppReviewPromptState {
                     title: "rateSession"
                         .put(key: "app_name", value: Constants.app_name)
                         .localized(),
-                    message: "rateSessionModalDescription"
+                    message: "rateSessionModalDescriptionUpdated"
                         .put(key: "app_name", value: Constants.app_name)
                         .put(key: "storevariant", value: storeVaraint)
                         .localized(),
-                    primaryButtonTitle: "rateSessionApp".localized(),
+                    primaryButtonTitle: "rateUs".localized(),
+                    primaryButtonColor: .sessionButton_text,
                     primaryButtonAccessibilityIdentifier: "rate-app-button",
-                    secondaryButtonTitle: "notNow".localized(),
-                    secondaryButtonAccessibilityIdentifier: "not-now-button"
+                    secondaryButtonTitle: nil,
+                    secondaryButtonColor: nil,
+                    secondaryButtonAccessibilityIdentifier: nil
                 )
 
             case .feedback:
@@ -124,8 +130,10 @@ enum AppReviewPromptState {
                         .put(key: "app_name", value: Constants.app_name)
                         .localized(),
                     primaryButtonTitle: "openSurvey".localized(),
+                    primaryButtonColor: .sessionButton_text,
                     primaryButtonAccessibilityIdentifier: "open-survey-button",
                     secondaryButtonTitle: "notNow".localized(),
+                    secondaryButtonColor: .textPrimary,
                     secondaryButtonAccessibilityIdentifier: "not-now-button"
                 )
 

diff --git a/Session/Home/App Review/View/AppReviewPromptDialog.swift b/Session/Home/App Review/View/AppReviewPromptDialog.swift
@@ -54,7 +54,7 @@ class AppReviewPromptDialog: UIView {
     private lazy var primaryButton: UIButton = {
         let result = UIButton(type: .custom)
         result.setThemeTitleColor(.sessionButton_text, for: .normal)
-        result.setThemeTitleColor(.sessionButton_highlight, for: .highlighted)
+        result.setThemeTitleColor(.highlighted(.sessionButton_text, alwaysDarken: false), for: .highlighted)
         result.titleLabel?.font = .boldSystemFont(ofSize: Values.mediumFontSize)
         result.titleLabel?.numberOfLines = 0
         result.titleLabel?.textAlignment = .center
@@ -66,7 +66,7 @@ class AppReviewPromptDialog: UIView {
     private lazy var secondaryButton: UIButton = {
         let result = UIButton(type: .custom)
         result.setThemeTitleColor(.textPrimary, for: .normal)
-        result.setThemeTitleColor(.textSecondary, for: .highlighted)
+        result.setThemeTitleColor(.highlighted(.textPrimary, alwaysDarken: false), for: .highlighted)
         result.titleLabel?.font = .boldSystemFont(ofSize: Values.mediumFontSize)
         result.titleLabel?.numberOfLines = 0
         result.titleLabel?.textAlignment = .center
@@ -138,10 +138,20 @@ class AppReviewPromptDialog: UIView {
 
         primaryButton.isHidden = prompt?.promptContent.primaryButtonTitle == nil
         primaryButton.setTitle(prompt?.promptContent.primaryButtonTitle, for: .normal)
+        primaryButton.setThemeTitleColor(prompt?.promptContent.primaryButtonColor, for: .normal)
+        primaryButton.setThemeTitleColor(
+            (prompt?.promptContent.primaryButtonColor).map { .highlighted($0, alwaysDarken: false) },
+            for: .highlighted
+        )
         primaryButton.accessibilityIdentifier = prompt?.promptContent.primaryButtonAccessibilityIdentifier
 
         secondaryButton.isHidden = prompt?.promptContent.secondaryButtonTitle == nil
         secondaryButton.setTitle(prompt?.promptContent.secondaryButtonTitle, for: .normal)
+        secondaryButton.setThemeTitleColor(prompt?.promptContent.secondaryButtonColor, for: .normal)
+        secondaryButton.setThemeTitleColor(
+            (prompt?.promptContent.secondaryButtonColor).map { .highlighted($0, alwaysDarken: false) },
+            for: .highlighted
+        )
         secondaryButton.accessibilityIdentifier = prompt?.promptContent.secondaryButtonAccessibilityIdentifier
 
         let isButtonsHidden = primaryButton.isHidden && secondaryButton.isHidden

diff --git a/Session/Home/HomeViewModel.swift b/Session/Home/HomeViewModel.swift
@@ -802,16 +802,11 @@ public class HomeViewModel: NavigatableStateHolder {
         self.transitionToScreen(modal, transitionType: .present)
     }
 
-    @MainActor
-    func handlePrimaryTappedForState(_ state: AppReviewPromptState) {
+    @MainActor func handlePrimaryTappedForState(_ state: AppReviewPromptState) {
         dependencies[defaults: .standard, key: .didActionAppReviewPrompt] = true
 
         switch state {
-            case .enjoyingSession:
-                handlePromptChangeState(.rateSession)
-                scheduleAppReviewRetry()
-                dependencies[singleton: .donationsManager].positiveReviewChosen()
-
+            case .enjoyingSession: handlePromptChangeState(.feedback)
             case .feedback:
                 // Close prompt before showing survery
                 handlePromptChangeState(nil)
@@ -824,12 +819,16 @@ public class HomeViewModel: NavigatableStateHolder {
         }
     }
 
-    func handleSecondayTappedForState(_ state: AppReviewPromptState) {
+    @MainActor func handleSecondayTappedForState(_ state: AppReviewPromptState) {
         dependencies[defaults: .standard, key: .didActionAppReviewPrompt] = true
 
         switch state {
             case .feedback, .rateSession: handlePromptChangeState(nil)
-            case .enjoyingSession: handlePromptChangeState(.feedback)
+            case .enjoyingSession:
+                handlePromptChangeState(.rateSession)
+                scheduleAppReviewRetry()
+                dependencies[singleton: .donationsManager].positiveReviewChosen()
+
             default: break
         }
     }

diff --git a/Session/Meta/Translations/InfoPlist.xcstrings b/Session/Meta/Translations/InfoPlist.xcstrings
@@ -1504,6 +1504,12 @@
     "NSLocalNetworkUsageDescription" : {
       "extractionState" : "manual",
       "localizations" : {
+        "ar" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "يتطلب Session الوصول إلى الشبكة المحلية لإجراء المكالمات الصوتية ومكالمات الفيديو."
+          }
+        },
         "az" : {
           "stringUnit" : {
             "state" : "translated",
@@ -1600,18 +1606,42 @@
             "value" : "Session이 음성 및 영상 통화를 하기 위해 로컬 네트워크에 접근해야 합니다."
           }
         },
+        "nb" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Session må ha tilgang til det lokale nettverket for å kunne foreta tale- og videosamtaler."
+          }
+        },
+        "nb-NO" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Session må ha tilgang til det lokale nettverket for å kunne foreta tale- og videosamtaler."
+          }
+        },
         "nl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Session heeft toegang nodig tot het lokale netwerk om spraak- en videogesprekken uit te voeren."
           }
         },
+        "nn-NO" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Session må ha tilgang til det lokale nettverket for å kunne foreta tale- og videosamtaler."
+          }
+        },
         "pl" : {
           "stringUnit" : {
             "state" : "translated",
             "value" : "Session potrzebuje dostępu do sieci lokalnej, aby wykonywać połączenia głosowe i wideo."
           }
         },
+        "pt-BR" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Session precisa de acesso à rede local para realizar chamadas de voz e vídeo."
+          }
+        },
         "pt-PT" : {
           "stringUnit" : {
             "state" : "translated",