Feat/maker days swish payin

app/apollo/apollo-core/src/commonMain/kotlin/com/hedvig/android/apollo/ApolloCallExt.kt

@@ -20,6 +20,7 @@ import com.hedvig.android.apollo.ApolloOperationError.OperationError
 import com.hedvig.android.apollo.ApolloOperationError.OperationException
 import com.hedvig.android.apollo.parseResponse
 import com.hedvig.android.core.common.ErrorMessage
+import com.hedvig.android.logger.logcat
 import kotlin.jvm.JvmInline
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -175,10 +176,21 @@ private fun <D : Operation.Data> iorFromErrorsAndData(
   data: D?,
 ): Ior<Nel<ApolloOperationError>, D> {
   return when {
-    errors != null && data != null -> Ior.Both(errors, data)
-    errors != null -> Ior.Left(errors)
-    data != null -> Ior.Right(data)
-    else -> error("Non compliant server")
+    errors != null && data != null -> {
+      Ior.Both(errors, data)
+    }
+
+    errors != null -> {
+      Ior.Left(errors)
+    }
+
+    data != null -> {
+      Ior.Right(data)
+    }
+
+    else -> {
+      error("Non compliant server")
+    }
   }
 }
 

app/app/build.gradle.kts

@@ -214,6 +214,8 @@ dependencies {
   implementation(projects.featureOnboarding)
 
   implementation(projects.featureRemoveAddons)
+  implementation(projects.featurePayinAccount)
+  implementation(projects.featurePayinAccountNavigation)
   implementation(projects.featurePayoutAccount)
   implementation(projects.featurePayments)
   implementation(projects.featurePaymentsNavigation)

app/app/src/main/kotlin/com/hedvig/android/app/navigation/HedvigEntryProvider.kt

@@ -52,6 +52,8 @@ import com.hedvig.android.feature.movingflow.SelectContractForMovingKey
 import com.hedvig.android.feature.movingflow.movingFlowEntries
 import com.hedvig.android.feature.onboarding.data.ResetOnboardingSeenUseCase
 import com.hedvig.android.feature.onboarding.navigation.onboardingEntries
+import com.hedvig.android.feature.payin.account.navigation.PayinAccountKey
+import com.hedvig.android.feature.payin.account.navigation.payinAccountEntries
 import com.hedvig.android.feature.payments.navigation.paymentsEntries
 import com.hedvig.android.feature.payoutaccount.navigation.PayoutAccountKey
 import com.hedvig.android.feature.payoutaccount.navigation.payoutAccountEntries
@@ -105,6 +107,7 @@ internal fun EntryProviderScope<HedvigNavKey>.hedvigEntryProvider(
 ) {
   val shouldShowRequestPermissionRationale: (String) -> Boolean = androidAppHost::shouldShowPermissionRationale
   val navigateToConnectPayment: () -> Unit = { backstack.add(TrustlyKey) }
+  val navigateToPayinAccount: () -> Unit = { backstack.add(PayinAccountKey) }
   val navigateToPayoutAccount: () -> Unit = { backstack.add(PayoutAccountKey) }
   val navigateToInbox: () -> Unit = { backstack.add(InboxKey) }
   val navigateToNewConversation: () -> Unit = { backstack.add(ChatKey(Uuid.randomUUID().toString())) }
@@ -136,7 +139,7 @@ internal fun EntryProviderScope<HedvigNavKey>.hedvigEntryProvider(
     navigateToNewConversation = navigateToNewConversation,
     navigateToConversation = navigateToConversation,
     navigateToInbox = navigateToInbox,
-    navigateToConnectPayment = navigateToConnectPayment,
+    navigateToPayinAccount = navigateToPayinAccount,
     navigateToPayoutAccount = navigateToPayoutAccount,
     navigateToTravelCertificate = navigateToTravelCertificate,
     navigateToAddonPurchaseFlow = navigateToAddonPurchaseFlow,
@@ -158,7 +161,9 @@ internal fun EntryProviderScope<HedvigNavKey>.hedvigEntryProvider(
   addPaymentsEntries(
     backstack = backstack,
     globalSnackBarState = globalSnackBarState,
+    openUrl = openUrl,
     navigateToConnectPayment = navigateToConnectPayment,
+    navigateToPayinAccount = navigateToPayinAccount,
     navigateToPayoutAccount = navigateToPayoutAccount,
     navigateToNewConversation = navigateToNewConversation,
   )
@@ -169,7 +174,7 @@ internal fun EntryProviderScope<HedvigNavKey>.hedvigEntryProvider(
     languageService = languageService,
     externalNavigator = externalNavigator,
     openUrl = openUrl,
-    navigateToConnectPayment = navigateToConnectPayment,
+    navigateToPayinAccount = navigateToPayinAccount,
     navigateToPayoutAccount = navigateToPayoutAccount,
     navigateToNewConversation = navigateToNewConversation,
     onResetOnboardingForDebug = {
@@ -243,7 +248,7 @@ private fun EntryProviderScope<HedvigNavKey>.addHomeEntries(
   navigateToNewConversation: () -> Unit,
   navigateToConversation: (String) -> Unit,
   navigateToInbox: () -> Unit,
-  navigateToConnectPayment: () -> Unit,
+  navigateToPayinAccount: () -> Unit,
   navigateToPayoutAccount: () -> Unit,
   navigateToTravelCertificate: () -> Unit,
   navigateToAddonPurchaseFlow: (List<String>) -> Unit,
@@ -267,7 +272,7 @@ private fun EntryProviderScope<HedvigNavKey>.addHomeEntries(
     onNavigateToInbox = navigateToInbox,
     onNavigateToNewConversation = navigateToNewConversation,
     navigateToClaimDetails = { claimId -> backstack.add(ClaimDetailsKey(claimId)) },
-    navigateToConnectPayment = navigateToConnectPayment,
+    navigateToConnectPayment = navigateToPayinAccount,
     navigateToConnectPayout = navigateToPayoutAccount,
     navigateToContactInfo = { backstack.add(ContactInfoKey) },
     navigateToMissingInfo = { contractId: String, type: CoInsuredFlowType ->
@@ -458,13 +463,16 @@ private fun EntryProviderScope<HedvigNavKey>.addInsuranceEntries(
 private fun EntryProviderScope<HedvigNavKey>.addPaymentsEntries(
   backstack: BackstackController,
   globalSnackBarState: GlobalSnackBarState,
+  openUrl: (String) -> Unit,
   navigateToConnectPayment: () -> Unit,
+  navigateToPayinAccount: () -> Unit,
   navigateToPayoutAccount: () -> Unit,
   navigateToNewConversation: () -> Unit,
 ) {
   paymentsEntries(
     backstack = backstack,
     navigateToConnectPayment = navigateToConnectPayment,
+    navigateToPayinAccount = navigateToPayinAccount,
     navigateToPayoutAccount = navigateToPayoutAccount,
     openConversation = navigateToNewConversation,
   )
@@ -473,6 +481,12 @@ private fun EntryProviderScope<HedvigNavKey>.addPaymentsEntries(
     globalSnackBarState = globalSnackBarState,
     navigateToConnectPayment = navigateToConnectPayment,
   )
+  payinAccountEntries(
+    backstack = backstack,
+    globalSnackBarState = globalSnackBarState,
+    navigateToConnectPayment = navigateToConnectPayment,
+    openUrl = openUrl,
+  )
   connectPaymentEntries(backstack = backstack)
 }
 
@@ -483,7 +497,7 @@ private fun EntryProviderScope<HedvigNavKey>.addProfileEntries(
   languageService: LanguageService,
   externalNavigator: ExternalNavigator,
   openUrl: (String) -> Unit,
-  navigateToConnectPayment: () -> Unit,
+  navigateToPayinAccount: () -> Unit,
   navigateToPayoutAccount: () -> Unit,
   navigateToNewConversation: () -> Unit,
   onResetOnboardingForDebug: () -> Unit,
@@ -501,7 +515,7 @@ private fun EntryProviderScope<HedvigNavKey>.addProfileEntries(
     globalSnackBarState = globalSnackBarState,
     backstack = backstack,
     hedvigBuildConstants = hedvigBuildConstants,
-    navigateToConnectPayment = navigateToConnectPayment,
+    navigateToConnectPayment = navigateToPayinAccount,
     navigateToConnectPayout = navigateToPayoutAccount,
     navigateToAddMissingInfo = { contractId: String, type: CoInsuredFlowType ->
       backstack.add(CoInsuredAddInfoKey(contractId, type))

app/core/core-resources/src/androidMain/res/values-sv-rSE/strings.xml

@@ -519,7 +519,7 @@
   <string name="HOME_QUICK_ACTIONS_INVITE">Bjud in en vän</string>
   <string name="HOME_QUICK_ACTIONS_TRAVEL_CERT">Reseintyg</string>
   <string name="HOME_QUICK_ACTIONS_UPCOMING_PAYMENT">Kommande betalning</string>
-  <string name="HOME_QUICK_ACTIONS_UPGRADE_COVERAGE">Uppgradera mitt skydd</string>
+  <string name="HOME_QUICK_ACTIONS_UPGRADE_COVERAGE">Ändra mitt skydd</string>
   <string name="HOME_QUOTES_SECTION_TITLE">Dina prisförslag</string>
   <string name="HOME_TODO_ADD_COINSURED_TITLE">Lägg till medförsäkrad</string>
   <string name="HOME_TODO_ADD_COOWNER_TITLE">Lägg till medägare</string>
@@ -726,7 +726,23 @@
   <string name="PAYMENTS_SUBTOTAL">Delsumma</string>
   <string name="PAYMENTS_UPCOMING_PAYMENT">Kommande betalning</string>
   <string name="PAYMENTS_VALID_UNTIL">Giltig till %1$s</string>
+  <string name="PAYMENT_ADD_METHOD_BUTTON">Lägg till betalningsmetod</string>
+  <string name="PAYMENT_CHOOSE_PRIMARY_BUTTON">Välj primär metod</string>
+  <string name="PAYMENT_CONNECT_SUBTITLE">Lägg till en betalningsmetod för att hålla din försäkring aktiv</string>
+  <string name="PAYMENT_CONNECT_TITLE">Koppla betalning</string>
   <string name="PAYMENT_HISTORY_TITLE">Betalningshistorik</string>
+  <string name="PAYMENT_METHODS_TITLE">Betalningsmetoder</string>
+  <string name="PAYMENT_METHOD_TITLE">Betalningsmetod</string>
+  <string name="PAYMENT_OPTION_CONNECTED_LABEL">Kopplat</string>
+  <string name="PAYMENT_OPTION_INVOICE_SUBTITLE">Direktbetalning via faktura</string>
+  <string name="PAYMENT_OPTION_SWISH_SUBTITLE">Betalningar och utbetalningar via Swish</string>
+  <string name="PAYMENT_OPTION_TRUSTLY_SUBTITLE">Anslut din bank via Trustly</string>
+  <string name="PAYMENT_PRIMARY_CONFIRM_TITLE">Bekräfta primär betalningsmetod</string>
+  <string name="PAYMENT_PRIMARY_LABEL">Primär</string>
+  <string name="PAYMENT_PRIMARY_SUBTITLE">Ändra ditt föredragna betalsätt</string>
+  <string name="PAYMENT_PRIMARY_TITLE">Primär betalningsmetod</string>
+  <string name="PAYMENT_REMOVE_SUBTITLE">Är du säker på att du vill ta bort betalningsmetoden?</string>
+  <string name="PAYMENT_REMOVE_TITLE">Ta bort betalningsmetod</string>
   <string name="PAYOUT_ADD_PAYOUT_METHOD">Lägg till utbetalningsmetod</string>
   <string name="PAYOUT_METHOD_INVOICE_DESCRIPTION">Direktutbetalning via Faktura</string>
   <string name="PAYOUT_METHOD_SWISH_DESCRIPTION">Snabb utbetalning med Swish</string>

app/core/core-resources/src/androidMain/res/values/strings.xml

@@ -519,7 +519,7 @@
   <string name="HOME_QUICK_ACTIONS_INVITE">Invite a friend</string>
   <string name="HOME_QUICK_ACTIONS_TRAVEL_CERT">Travel certificate</string>
   <string name="HOME_QUICK_ACTIONS_UPCOMING_PAYMENT">Upcoming payment</string>
-  <string name="HOME_QUICK_ACTIONS_UPGRADE_COVERAGE">Upgrade my coverage</string>
+  <string name="HOME_QUICK_ACTIONS_UPGRADE_COVERAGE">Change my coverage</string>
   <string name="HOME_QUOTES_SECTION_TITLE">Your quotes</string>
   <string name="HOME_TODO_ADD_COINSURED_TITLE">Add co-insured</string>
   <string name="HOME_TODO_ADD_COOWNER_TITLE">Add co-owner</string>
@@ -726,7 +726,23 @@
   <string name="PAYMENTS_SUBTOTAL">Subtotal</string>
   <string name="PAYMENTS_UPCOMING_PAYMENT">Upcoming payment</string>
   <string name="PAYMENTS_VALID_UNTIL">Valid until %1$s</string>
+  <string name="PAYMENT_ADD_METHOD_BUTTON">Add payment method</string>
+  <string name="PAYMENT_CHOOSE_PRIMARY_BUTTON">Choose primary method</string>
+  <string name="PAYMENT_CONNECT_SUBTITLE">Add a payment method to keep your insurance active</string>
+  <string name="PAYMENT_CONNECT_TITLE">Connect payment</string>
   <string name="PAYMENT_HISTORY_TITLE">Payment history</string>
+  <string name="PAYMENT_METHODS_TITLE">Payment methods</string>
+  <string name="PAYMENT_METHOD_TITLE">Payment method</string>
+  <string name="PAYMENT_OPTION_CONNECTED_LABEL">Connected</string>
+  <string name="PAYMENT_OPTION_INVOICE_SUBTITLE">Direct payment via Invoice</string>
+  <string name="PAYMENT_OPTION_SWISH_SUBTITLE">Payments and payouts via Swish</string>
+  <string name="PAYMENT_OPTION_TRUSTLY_SUBTITLE">Connect your bank via Trustly</string>
+  <string name="PAYMENT_PRIMARY_CONFIRM_TITLE">Confirm primary payment method</string>
+  <string name="PAYMENT_PRIMARY_LABEL">Primary</string>
+  <string name="PAYMENT_PRIMARY_SUBTITLE">Change your preferred way of payment</string>
+  <string name="PAYMENT_PRIMARY_TITLE">Primary payment method</string>
+  <string name="PAYMENT_REMOVE_SUBTITLE">Are you sure you want to remove payment method?</string>
+  <string name="PAYMENT_REMOVE_TITLE">Remove payment method</string>
   <string name="PAYOUT_ADD_PAYOUT_METHOD">Add payout method</string>
   <string name="PAYOUT_METHOD_INVOICE_DESCRIPTION">Direct payment via Invoice</string>
   <string name="PAYOUT_METHOD_SWISH_DESCRIPTION">Instant payout with Swish</string>

app/core/core-resources/src/commonMain/composeResources/values-sv-rSE/strings.xml

@@ -518,7 +518,7 @@
   <string name="HOME_QUICK_ACTIONS_INVITE">Bjud in en vän</string>
   <string name="HOME_QUICK_ACTIONS_TRAVEL_CERT">Reseintyg</string>
   <string name="HOME_QUICK_ACTIONS_UPCOMING_PAYMENT">Kommande betalning</string>
-  <string name="HOME_QUICK_ACTIONS_UPGRADE_COVERAGE">Uppgradera mitt skydd</string>
+  <string name="HOME_QUICK_ACTIONS_UPGRADE_COVERAGE">Ändra mitt skydd</string>
   <string name="HOME_QUOTES_SECTION_TITLE">Dina prisförslag</string>
   <string name="HOME_TODO_ADD_COINSURED_TITLE">Lägg till medförsäkrad</string>
   <string name="HOME_TODO_ADD_COOWNER_TITLE">Lägg till medägare</string>
@@ -725,7 +725,23 @@
   <string name="PAYMENTS_SUBTOTAL">Delsumma</string>
   <string name="PAYMENTS_UPCOMING_PAYMENT">Kommande betalning</string>
   <string name="PAYMENTS_VALID_UNTIL">Giltig till %1$s</string>
+  <string name="PAYMENT_ADD_METHOD_BUTTON">Lägg till betalningsmetod</string>
+  <string name="PAYMENT_CHOOSE_PRIMARY_BUTTON">Välj primär metod</string>
+  <string name="PAYMENT_CONNECT_SUBTITLE">Lägg till en betalningsmetod för att hålla din försäkring aktiv</string>
+  <string name="PAYMENT_CONNECT_TITLE">Koppla betalning</string>
   <string name="PAYMENT_HISTORY_TITLE">Betalningshistorik</string>
+  <string name="PAYMENT_METHODS_TITLE">Betalningsmetoder</string>
+  <string name="PAYMENT_METHOD_TITLE">Betalningsmetod</string>
+  <string name="PAYMENT_OPTION_CONNECTED_LABEL">Kopplat</string>
+  <string name="PAYMENT_OPTION_INVOICE_SUBTITLE">Direktbetalning via faktura</string>
+  <string name="PAYMENT_OPTION_SWISH_SUBTITLE">Betalningar och utbetalningar via Swish</string>
+  <string name="PAYMENT_OPTION_TRUSTLY_SUBTITLE">Anslut din bank via Trustly</string>
+  <string name="PAYMENT_PRIMARY_CONFIRM_TITLE">Bekräfta primär betalningsmetod</string>
+  <string name="PAYMENT_PRIMARY_LABEL">Primär</string>
+  <string name="PAYMENT_PRIMARY_SUBTITLE">Ändra ditt föredragna betalsätt</string>
+  <string name="PAYMENT_PRIMARY_TITLE">Primär betalningsmetod</string>
+  <string name="PAYMENT_REMOVE_SUBTITLE">Är du säker på att du vill ta bort betalningsmetoden?</string>
+  <string name="PAYMENT_REMOVE_TITLE">Ta bort betalningsmetod</string>
   <string name="PAYOUT_ADD_PAYOUT_METHOD">Lägg till utbetalningsmetod</string>
   <string name="PAYOUT_METHOD_INVOICE_DESCRIPTION">Direktutbetalning via Faktura</string>
   <string name="PAYOUT_METHOD_SWISH_DESCRIPTION">Snabb utbetalning med Swish</string>

app/core/core-resources/src/commonMain/composeResources/values/strings.xml

@@ -518,7 +518,7 @@
   <string name="HOME_QUICK_ACTIONS_INVITE">Invite a friend</string>
   <string name="HOME_QUICK_ACTIONS_TRAVEL_CERT">Travel certificate</string>
   <string name="HOME_QUICK_ACTIONS_UPCOMING_PAYMENT">Upcoming payment</string>
-  <string name="HOME_QUICK_ACTIONS_UPGRADE_COVERAGE">Upgrade my coverage</string>
+  <string name="HOME_QUICK_ACTIONS_UPGRADE_COVERAGE">Change my coverage</string>
   <string name="HOME_QUOTES_SECTION_TITLE">Your quotes</string>
   <string name="HOME_TODO_ADD_COINSURED_TITLE">Add co-insured</string>
   <string name="HOME_TODO_ADD_COOWNER_TITLE">Add co-owner</string>
@@ -725,7 +725,23 @@
   <string name="PAYMENTS_SUBTOTAL">Subtotal</string>
   <string name="PAYMENTS_UPCOMING_PAYMENT">Upcoming payment</string>
   <string name="PAYMENTS_VALID_UNTIL">Valid until %1$s</string>
+  <string name="PAYMENT_ADD_METHOD_BUTTON">Add payment method</string>
+  <string name="PAYMENT_CHOOSE_PRIMARY_BUTTON">Choose primary method</string>
+  <string name="PAYMENT_CONNECT_SUBTITLE">Add a payment method to keep your insurance active</string>
+  <string name="PAYMENT_CONNECT_TITLE">Connect payment</string>
   <string name="PAYMENT_HISTORY_TITLE">Payment history</string>
+  <string name="PAYMENT_METHODS_TITLE">Payment methods</string>
+  <string name="PAYMENT_METHOD_TITLE">Payment method</string>
+  <string name="PAYMENT_OPTION_CONNECTED_LABEL">Connected</string>
+  <string name="PAYMENT_OPTION_INVOICE_SUBTITLE">Direct payment via Invoice</string>
+  <string name="PAYMENT_OPTION_SWISH_SUBTITLE">Payments and payouts via Swish</string>
+  <string name="PAYMENT_OPTION_TRUSTLY_SUBTITLE">Connect your bank via Trustly</string>
+  <string name="PAYMENT_PRIMARY_CONFIRM_TITLE">Confirm primary payment method</string>
+  <string name="PAYMENT_PRIMARY_LABEL">Primary</string>
+  <string name="PAYMENT_PRIMARY_SUBTITLE">Change your preferred way of payment</string>
+  <string name="PAYMENT_PRIMARY_TITLE">Primary payment method</string>
+  <string name="PAYMENT_REMOVE_SUBTITLE">Are you sure you want to remove payment method?</string>
+  <string name="PAYMENT_REMOVE_TITLE">Remove payment method</string>
   <string name="PAYOUT_ADD_PAYOUT_METHOD">Add payout method</string>
   <string name="PAYOUT_METHOD_INVOICE_DESCRIPTION">Direct payment via Invoice</string>
   <string name="PAYOUT_METHOD_SWISH_DESCRIPTION">Instant payout with Swish</string>

app/design-system/design-system-hedvig/src/commonMain/kotlin/com/hedvig/android/design/system/hedvig/Button.kt

@@ -259,6 +259,7 @@ fun HedvigButtonGhostWithBorder(
   enabled: Boolean = true,
   interactionSource: MutableInteractionSource? = null,
   size: ButtonSize = ButtonSize.Medium,
+  isLoading: Boolean = false,
 ) {
   HedvigTextButton(
     text = text,
@@ -271,6 +272,7 @@ fun HedvigButtonGhostWithBorder(
     ),
     buttonSize = size,
     interactionSource = interactionSource,
+    isLoading = isLoading,
   )
 }
 

app/design-system/design-system-hedvig/src/commonMain/kotlin/com/hedvig/android/design/system/hedvig/EmptyState.kt

@@ -1,5 +1,6 @@
 package com.hedvig.android.design.system.hedvig
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.ColumnScope
@@ -37,6 +38,7 @@ import com.hedvig.android.design.system.hedvig.icon.CheckFilled
 import com.hedvig.android.design.system.hedvig.icon.HedvigIcons
 import com.hedvig.android.design.system.hedvig.icon.InfoFilled
 import com.hedvig.android.design.system.hedvig.icon.WarningFilled
+import com.hedvig.android.design.system.hedvig.icon.colored.Swish
 import com.hedvig.android.design.system.hedvig.tokens.EmptyStateTokens
 
 @Composable
@@ -148,6 +150,15 @@ private fun ColumnScope.EmptyStateIcon(iconStyle: EmptyStateIconStyle) {
       )
       Spacer(Modifier.height(16.dp))
     }
+
+    EmptyStateIconStyle.SWISH -> {
+      Image(
+        HedvigIcons.Swish,
+        null,
+        modifier = Modifier.size(48.dp),
+      )
+      Spacer(Modifier.height(16.dp))
+    }
   }
 }
 
@@ -162,6 +173,8 @@ object EmptyStateDefaults {
     BANK_ID,
     NO_ICON,
     SUCCESS_WITH_WARNING,
+
+    SWISH,
   }
 
   sealed class EmptyStateButtonStyle {