[FC] Fix Accessible data callout copy logic

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## XX.XX.XX - 2023-XX-XX
 
+### Financial Connections
+* [FIXED][6375](https://github.com/stripe/stripe-android/pull/6375) Fixed Accessible data call out texts
+
 ### PaymentSheet
 * [FIXED][6366](https://github.com/stripe/stripe-android/pull/6366) Fixed an issue where the result couldn't be parsed in `PaymentSheetContract`.
 

financial-connections/res/values/strings.xml

@@ -46,6 +46,8 @@
     <string name="data_accessible_callout_no_business"><annotation bold="accessible_data">Data accessible to this business: </annotation>%1$s.<annotation clickable="learn_more"> Learn more</annotation></string>
     <string name="data_accessible_callout_through_stripe"><annotation bold="accessible_data">Data accessible to %1$s: </annotation>%2$s through Stripe.<annotation clickable="learn_more"> Learn more</annotation></string>
     <string name="data_accessible_callout_through_stripe_no_business"><annotation bold="accessible_data">Data accessible to this business: </annotation>%2$s through Stripe.<annotation clickable="learn_more"> Learn more</annotation></string>
+    <string name="data_accessible_callout_through_link"><annotation bold="accessible_data">Data accessible to %1$s: </annotation>%2$s through Link.<annotation clickable="learn_more"> Learn more</annotation></string>
+    <string name="data_accessible_callout_through_link_no_business"><annotation bold="accessible_data">Data accessible to this business: </annotation>%2$s through Link.<annotation clickable="learn_more"> Learn more</annotation></string>
     <string name="data_accessible_type_accountdetails">account details</string>
     <string name="data_accessible_type_balances">balances</string>
     <string name="data_accessible_type_transactions">transactions</string>

financial-connections/src/main/java/com/stripe/android/financialconnections/features/accountpicker/AccountPickerStates.kt

@@ -160,6 +160,7 @@ internal class AccountPickerStates : PreviewParameterProvider<AccountPickerState
                 FinancialConnectionsAccount.Permissions.TRANSACTIONS
             ),
             isStripeDirect = true,
+            isNetworking = false,
             dataPolicyUrl = ""
         )
     }

financial-connections/src/main/java/com/stripe/android/financialconnections/features/accountpicker/AccountPickerViewModel.kt

@@ -21,8 +21,6 @@ import com.stripe.android.financialconnections.domain.PollAuthorizationSessionAc
 import com.stripe.android.financialconnections.domain.SelectAccounts
 import com.stripe.android.financialconnections.features.accountpicker.AccountPickerState.SelectionMode
 import com.stripe.android.financialconnections.features.common.AccessibleDataCalloutModel
-import com.stripe.android.financialconnections.features.consent.ConsentTextBuilder
-import com.stripe.android.financialconnections.features.consent.FinancialConnectionsUrlResolver
 import com.stripe.android.financialconnections.model.FinancialConnectionsInstitution
 import com.stripe.android.financialconnections.model.FinancialConnectionsSessionManifest.Pane
 import com.stripe.android.financialconnections.model.PartnerAccount
@@ -83,12 +81,7 @@ internal class AccountPickerViewModel @Inject constructor(
                     activeAuthSession.skipAccountSelection == true,
                 accounts = accounts,
                 selectionMode = if (manifest.singleAccount) SelectionMode.RADIO else SelectionMode.CHECKBOXES,
-                accessibleData = AccessibleDataCalloutModel(
-                    businessName = ConsentTextBuilder.getBusinessName(manifest),
-                    permissions = manifest.permissions,
-                    isStripeDirect = manifest.isStripeDirect ?: false,
-                    dataPolicyUrl = FinancialConnectionsUrlResolver.getDataPolicyUrl(manifest)
-                ),
+                accessibleData = AccessibleDataCalloutModel.fromManifest(manifest),
                 /**
                  * in the special case that this is single account and the institution would have
                  * skipped account selection but _didn't_ (because we still saw this), we should

financial-connections/src/main/java/com/stripe/android/financialconnections/features/common/AccessibleDataCallout.kt

@@ -141,16 +141,21 @@ private fun AccessibleDataText(
     val permissionsReadable = remember(model.permissions) { model.permissions.toStringRes() }
     AnnotatedText(
         text = TextResource.StringId(
-            value = when (model.isStripeDirect) {
-                true -> when (model.businessName) {
-                    null -> R.string.data_accessible_callout_through_stripe_no_business
-                    else -> R.string.data_accessible_callout_through_stripe
+            value = when {
+                model.isNetworking -> when (model.businessName) {
+                    null -> R.string.data_accessible_callout_through_link_no_business
+                    else -> R.string.data_accessible_callout_through_link
                 }
 
-                false -> when (model.businessName) {
+                model.isStripeDirect -> when (model.businessName) {
                     null -> R.string.data_accessible_callout_no_business
                     else -> R.string.data_accessible_callout
                 }
+
+                else -> when (model.businessName) {
+                    null -> R.string.data_accessible_callout_through_stripe_no_business
+                    else -> R.string.data_accessible_callout_through_stripe
+                }
             },
             args = listOfNotNull(
                 model.businessName,
@@ -221,6 +226,7 @@ internal data class AccessibleDataCalloutModel(
     val businessName: String?,
     val permissions: List<Permissions>,
     val isStripeDirect: Boolean,
+    val isNetworking: Boolean,
     val dataPolicyUrl: String
 ) {
 
@@ -229,6 +235,7 @@ internal data class AccessibleDataCalloutModel(
             AccessibleDataCalloutModel(
                 businessName = ConsentTextBuilder.getBusinessName(manifest),
                 permissions = manifest.permissions,
+                isNetworking = manifest.isNetworkingUserFlow ?: false,
                 isStripeDirect = manifest.isStripeDirect ?: false,
                 dataPolicyUrl = FinancialConnectionsUrlResolver.getDataPolicyUrl(manifest)
             )
@@ -249,7 +256,8 @@ internal fun AccessibleDataCalloutPreview() {
                     Permissions.TRANSACTIONS,
                     Permissions.ACCOUNT_NUMBERS
                 ),
-                isStripeDirect = true,
+                isNetworking = false,
+                isStripeDirect = false,
                 dataPolicyUrl = ""
             ),
             onLearnMoreClick = {}
@@ -271,62 +279,78 @@ internal fun AccessibleDataCalloutWithManyAccountsPreview() {
                     Permissions.OWNERSHIP,
                     Permissions.TRANSACTIONS
                 ),
-                isStripeDirect = true,
+                isStripeDirect = false,
+                isNetworking = false,
                 dataPolicyUrl = ""
             ),
-            accounts = listOf(
-                PartnerAccount(
-                    authorization = "Authorization",
-                    institutionName = "Random bank",
-                    category = FinancialConnectionsAccount.Category.CASH,
-                    id = "id1",
-                    name = "Account 1 - no acct numbers",
-                    _allowSelection = true,
-                    allowSelectionMessage = "",
-                    subcategory = FinancialConnectionsAccount.Subcategory.CHECKING,
-                    supportedPaymentMethodTypes = emptyList()
-                ),
-                PartnerAccount(
-                    authorization = "Authorization",
-                    category = FinancialConnectionsAccount.Category.CASH,
-                    id = "id2",
-                    name = "Account 2 - no acct numbers",
-                    _allowSelection = true,
-                    allowSelectionMessage = "",
-                    subcategory = FinancialConnectionsAccount.Subcategory.SAVINGS,
-                    supportedPaymentMethodTypes = emptyList()
-                ),
-                PartnerAccount(
-                    authorization = "Authorization",
-                    category = FinancialConnectionsAccount.Category.CASH,
-                    id = "id3",
-                    name = "Account 3 - no acct numbers",
-                    _allowSelection = true,
-                    allowSelectionMessage = "",
-                    subcategory = FinancialConnectionsAccount.Subcategory.SAVINGS,
-                    supportedPaymentMethodTypes = emptyList()
+            accounts = partnerAccountsForPreview(),
+            institution = FinancialConnectionsInstitution(
+                id = "id",
+                name = "name",
+                url = "url",
+                featured = true,
+                icon = null,
+                logo = null,
+                featuredOrder = null,
+                mobileHandoffCapable = false
+            ),
+            onLearnMoreClick = {}
+        )
+    }
+}
+
+@Preview
+@Composable
+@Suppress("LongMethod")
+internal fun AccessibleDataCalloutStripeDirectPreview() {
+    FinancialConnectionsPreview {
+        AccessibleDataCalloutWithAccounts(
+            AccessibleDataCalloutModel(
+                businessName = "My business",
+                permissions = listOf(
+                    Permissions.PAYMENT_METHOD,
+                    Permissions.BALANCES,
+                    Permissions.OWNERSHIP,
+                    Permissions.TRANSACTIONS
                 ),
-                PartnerAccount(
-                    authorization = "Authorization",
-                    category = FinancialConnectionsAccount.Category.CASH,
-                    id = "id4",
-                    name = "Account 4 - no acct numbers",
-                    _allowSelection = true,
-                    allowSelectionMessage = "",
-                    subcategory = FinancialConnectionsAccount.Subcategory.SAVINGS,
-                    supportedPaymentMethodTypes = emptyList()
+                isStripeDirect = true,
+                isNetworking = false,
+                dataPolicyUrl = ""
+            ),
+            accounts = partnerAccountsForPreview(),
+            institution = FinancialConnectionsInstitution(
+                id = "id",
+                name = "name",
+                url = "url",
+                featured = true,
+                icon = null,
+                logo = null,
+                featuredOrder = null,
+                mobileHandoffCapable = false
+            ),
+            onLearnMoreClick = {}
+        )
+    }
+}
+@Preview
+@Composable
+@Suppress("LongMethod")
+internal fun AccessibleDataCalloutNetworkingPreview() {
+    FinancialConnectionsPreview {
+        AccessibleDataCalloutWithAccounts(
+            AccessibleDataCalloutModel(
+                businessName = "My business",
+                permissions = listOf(
+                    Permissions.PAYMENT_METHOD,
+                    Permissions.BALANCES,
+                    Permissions.OWNERSHIP,
+                    Permissions.TRANSACTIONS
                 ),
-                PartnerAccount(
-                    authorization = "Authorization",
-                    category = FinancialConnectionsAccount.Category.CASH,
-                    id = "id5",
-                    name = "Account 5 - no acct numbers",
-                    _allowSelection = true,
-                    allowSelectionMessage = "",
-                    subcategory = FinancialConnectionsAccount.Subcategory.SAVINGS,
-                    supportedPaymentMethodTypes = emptyList()
-                )
+                isStripeDirect = false,
+                isNetworking = true,
+                dataPolicyUrl = ""
             ),
+            accounts = partnerAccountsForPreview(),
             institution = FinancialConnectionsInstitution(
                 id = "id",
                 name = "name",
@@ -342,6 +366,61 @@ internal fun AccessibleDataCalloutWithManyAccountsPreview() {
     }
 }
 
+@Composable
+private fun partnerAccountsForPreview() = listOf(
+    PartnerAccount(
+        authorization = "Authorization",
+        institutionName = "Random bank",
+        category = FinancialConnectionsAccount.Category.CASH,
+        id = "id1",
+        name = "Account 1 - no acct numbers",
+        _allowSelection = true,
+        allowSelectionMessage = "",
+        subcategory = FinancialConnectionsAccount.Subcategory.CHECKING,
+        supportedPaymentMethodTypes = emptyList()
+    ),
+    PartnerAccount(
+        authorization = "Authorization",
+        category = FinancialConnectionsAccount.Category.CASH,
+        id = "id2",
+        name = "Account 2 - no acct numbers",
+        _allowSelection = true,
+        allowSelectionMessage = "",
+        subcategory = FinancialConnectionsAccount.Subcategory.SAVINGS,
+        supportedPaymentMethodTypes = emptyList()
+    ),
+    PartnerAccount(
+        authorization = "Authorization",
+        category = FinancialConnectionsAccount.Category.CASH,
+        id = "id3",
+        name = "Account 3 - no acct numbers",
+        _allowSelection = true,
+        allowSelectionMessage = "",
+        subcategory = FinancialConnectionsAccount.Subcategory.SAVINGS,
+        supportedPaymentMethodTypes = emptyList()
+    ),
+    PartnerAccount(
+        authorization = "Authorization",
+        category = FinancialConnectionsAccount.Category.CASH,
+        id = "id4",
+        name = "Account 4 - no acct numbers",
+        _allowSelection = true,
+        allowSelectionMessage = "",
+        subcategory = FinancialConnectionsAccount.Subcategory.SAVINGS,
+        supportedPaymentMethodTypes = emptyList()
+    ),
+    PartnerAccount(
+        authorization = "Authorization",
+        category = FinancialConnectionsAccount.Category.CASH,
+        id = "id5",
+        name = "Account 5 - no acct numbers",
+        _allowSelection = true,
+        allowSelectionMessage = "",
+        subcategory = FinancialConnectionsAccount.Subcategory.SAVINGS,
+        supportedPaymentMethodTypes = emptyList()
+    )
+)
+
 @Preview
 @Composable
 internal fun AccessibleDataCalloutWithMultipleAccountsPreview() {
@@ -356,6 +435,7 @@ internal fun AccessibleDataCalloutWithMultipleAccountsPreview() {
                     Permissions.TRANSACTIONS
                 ),
                 isStripeDirect = true,
+                isNetworking = false,
                 dataPolicyUrl = ""
             ),
             accounts = listOf(
@@ -413,6 +493,7 @@ internal fun AccessibleDataCalloutWithOneAccountPreview() {
                     Permissions.TRANSACTIONS
                 ),
                 isStripeDirect = true,
+                isNetworking = false,
                 dataPolicyUrl = ""
             ),
             accounts = listOf(

financial-connections/src/main/java/com/stripe/android/financialconnections/features/success/SuccessScreen.kt

@@ -279,6 +279,7 @@ internal fun SuccessScreenPreview() {
                     FinancialConnectionsAccount.Permissions.TRANSACTIONS
                 ),
                 isStripeDirect = true,
+                isNetworking = false,
                 dataPolicyUrl = ""
             ),
             disconnectUrl = "",