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,9 +176,15 @@ 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)
+    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

@@ -206,6 +206,7 @@ dependencies {
   implementation(projects.featureMovingflow)
 
   implementation(projects.featureRemoveAddons)
+  implementation(projects.featurePayinAccount)
   implementation(projects.featurePayoutAccount)
   implementation(projects.featurePayments)
   implementation(projects.featureProfile)

app/app/src/main/kotlin/com/hedvig/android/app/di/ApplicationModule.kt

@@ -78,6 +78,7 @@ import com.hedvig.android.feature.insurance.certificate.di.insuranceEvidenceModu
 import com.hedvig.android.feature.insurances.di.insurancesModule
 import com.hedvig.android.feature.login.di.loginModule
 import com.hedvig.android.feature.movingflow.di.movingFlowModule
+import com.hedvig.android.feature.payin.account.di.payinAccountModule
 import com.hedvig.android.feature.payments.di.paymentsModule
 import com.hedvig.android.feature.payoutaccount.di.payoutAccountModule
 import com.hedvig.android.feature.profile.di.profileModule
@@ -346,6 +347,7 @@ val applicationModule = module {
       notificationBadgeModule,
       notificationModule,
       payoutAccountModule,
+      payinAccountModule,
       paymentsModule,
       profileModule,
       settingsDatastoreModule,

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

@@ -68,6 +68,8 @@ import com.hedvig.android.feature.insurances.navigation.insuranceGraph
 import com.hedvig.android.feature.login.navigation.loginGraph
 import com.hedvig.android.feature.movingflow.SelectContractForMoving
 import com.hedvig.android.feature.movingflow.movingFlowGraph
+import com.hedvig.android.feature.payin.account.navigation.PayinAccountDestination
+import com.hedvig.android.feature.payin.account.navigation.payinAccountGraph
 import com.hedvig.android.feature.payments.navigation.paymentsGraph
 import com.hedvig.android.feature.payoutaccount.navigation.PayoutAccountDestination
 import com.hedvig.android.feature.payoutaccount.navigation.payoutAccountGraph
@@ -110,6 +112,9 @@ internal fun HedvigNavHost(
   val navController = hedvigAppState.navController
 
   fun navigateToConnectPayment(builder: NavOptionsBuilder.() -> Unit = {}) {
+    navController.navigate(PayinAccountDestination.Graph, builder)
+  }
+  fun navigateToConnectTrustly(builder: NavOptionsBuilder.() -> Unit = {}) {
     navController.navigate(TrustlyDestination, builder)
   }
   val navigateToInbox = {
@@ -357,6 +362,14 @@ internal fun HedvigNavHost(
       navigateToConnectPayment = ::navigateToConnectPayment,
       navigateUp = navController::navigateUp,
     )
+    payinAccountGraph(
+      navController = navController,
+      globalSnackBarState = globalSnackBarState,
+      hedvigDeepLinkContainer = hedvigDeepLinkContainer,
+      navigateToConnectTrustly = ::navigateToConnectTrustly,
+      navigateUp = navController::navigateUp,
+      openUrl = openUrl
+    )
     profileGraph(
       settingsDestinationNestedGraphs = {
         deleteAccountGraph(hedvigDeepLinkContainer, navController)
@@ -480,7 +493,7 @@ internal fun HedvigNavHost(
           }
 
           QuickLinkConnectPayment -> {
-            TrustlyDestination
+            PayinAccountDestination.Graph
           }
 
           QuickLinkTermination -> {

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

@@ -522,6 +522,7 @@
   <string name="LETTER_TO_EIR_SUBJECT">Fråga angående skadeanmälan - Fordon reg. %1$s</string>
   <string name="LOGIN_MARKET_PICKER_PREFERENCES">Välj land och språk</string>
   <string name="LOGOUT_BUTTON">Logga ut</string>
+  <string name="MANAGE_BILLING_METHODS_BUTTON">Manage your payment methods</string>
   <string name="MANUAL_CHARGE_CANCELLATION_WARNING">Aktivera ditt försäkringsskydd igen genom att kontakta oss när din betalning har registrerats</string>
   <string name="MARKETING_GET_HEDVIG">Få ett prisförslag</string>
   <string name="MISSING_CONTACT_INFO_CARD_BUTTON">Se över kontaktuppgifter</string>
@@ -680,7 +681,7 @@
   <string name="PROFILE_ROW_TRAVEL_CERTIFICATE">Reseintyg</string>
   <string name="PROFILE_TITLE">Din profil</string>
   <string name="PUPPY_GUIDE_GO_BUTTON">Se guider</string>
-  <string name="PUPPY_GUIDE_INFO">I valpguiden hittar du användbara artiklar som hjälper dig med allt från första veterinärbesöket till hur du väljer rätt foder.</string>
+  <string name="PUPPY_GUIDE_INFO">I Valpguiden får du svar på de vanligaste frågorna som rör valpens första tid.</string>
   <string name="PUPPY_GUIDE_LABEL">Utvalda guider</string>
   <string name="PUPPY_GUIDE_LABEL_READ">Läst</string>
   <string name="PUPPY_GUIDE_RATING_NOT_HELPFUL">Inte hjälpsam</string>
@@ -1279,6 +1280,19 @@
   <string name="offer_screen_MULTIPLE_INSURANCES_coverage_paragraph">Läs om ditt fullständiga försäkringsskydd nedan.</string>
   <string name="onboarding_contextual_menu_app_info_label">Appinformation</string>
   <string name="onboarding_embark_flow_information_modal_title">Information</string>
+  <string name="ongoing_shop_session_action_button">Fortsätt köpet</string>
+  <plurals name="ongoing_shop_session_offer_expires_in_days">
+    <item quantity="one">Erbjudandet löper ut om %1$d dag</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d dagar</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_hours">
+    <item quantity="one">Erbjudandet löper ut om %1$d timme</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d timmar</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_minutes">
+    <item quantity="one">Erbjudandet löper ut om %1$d minut</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d minuter</item>
+  </plurals>
   <string name="open_chat">Skriv meddelande</string>
   <string name="pay_in_confirmation_direct_debit_headline">Autogiro är anslutet!</string>
   <string name="pay_in_error_body">Vi kunde inte ansluta ditt bankkonto. Vänligen försök igen eller skriv till oss direkt i appen.</string>

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

@@ -522,6 +522,7 @@
   <string name="LETTER_TO_EIR_SUBJECT">Question regarding claim, Vehicle reg. %1$s</string>
   <string name="LOGIN_MARKET_PICKER_PREFERENCES">Preferences</string>
   <string name="LOGOUT_BUTTON">Logout</string>
+  <string name="MANAGE_BILLING_METHODS_BUTTON">Manage your payment methods</string>
   <string name="MANUAL_CHARGE_CANCELLATION_WARNING">Activate your coverage again by contacting us once your payment has been processed</string>
   <string name="MARKETING_GET_HEDVIG">Get a price quote</string>
   <string name="MISSING_CONTACT_INFO_CARD_BUTTON">Review contact info</string>
@@ -1279,6 +1280,19 @@
   <string name="offer_screen_MULTIPLE_INSURANCES_coverage_paragraph">Read the full coverage of your insurances below. </string>
   <string name="onboarding_contextual_menu_app_info_label">App information</string>
   <string name="onboarding_embark_flow_information_modal_title">Information</string>
+  <string name="ongoing_shop_session_action_button">Continue purchase</string>
+  <plurals name="ongoing_shop_session_offer_expires_in_days">
+    <item quantity="one">The offer expires in %1$d day</item>
+    <item quantity="other">The offer expires in %1$d days</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_hours">
+    <item quantity="one">The offer expires in %1$d hour</item>
+    <item quantity="other">The offer expires in %1$d hours</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_minutes">
+    <item quantity="one">The offer expires in %1$d minute</item>
+    <item quantity="other">The offer expires in %1$d minutes</item>
+  </plurals>
   <string name="open_chat">Write message</string>
   <string name="pay_in_confirmation_direct_debit_headline">Direct debit connected!</string>
   <string name="pay_in_error_body">We were unable to add your payment method. Please try again or send us a message here in the app.</string>

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

@@ -522,6 +522,7 @@
   <string name="LETTER_TO_EIR_SUBJECT">Fråga angående skadeanmälan - Fordon reg. %1$s</string>
   <string name="LOGIN_MARKET_PICKER_PREFERENCES">Välj land och språk</string>
   <string name="LOGOUT_BUTTON">Logga ut</string>
+  <string name="MANAGE_BILLING_METHODS_BUTTON">Manage your payment methods</string>
   <string name="MANUAL_CHARGE_CANCELLATION_WARNING">Aktivera ditt försäkringsskydd igen genom att kontakta oss när din betalning har registrerats</string>
   <string name="MARKETING_GET_HEDVIG">Få ett prisförslag</string>
   <string name="MISSING_CONTACT_INFO_CARD_BUTTON">Se över kontaktuppgifter</string>
@@ -680,7 +681,7 @@
   <string name="PROFILE_ROW_TRAVEL_CERTIFICATE">Reseintyg</string>
   <string name="PROFILE_TITLE">Din profil</string>
   <string name="PUPPY_GUIDE_GO_BUTTON">Se guider</string>
-  <string name="PUPPY_GUIDE_INFO">I valpguiden hittar du användbara artiklar som hjälper dig med allt från första veterinärbesöket till hur du väljer rätt foder.</string>
+  <string name="PUPPY_GUIDE_INFO">I Valpguiden får du svar på de vanligaste frågorna som rör valpens första tid.</string>
   <string name="PUPPY_GUIDE_LABEL">Utvalda guider</string>
   <string name="PUPPY_GUIDE_LABEL_READ">Läst</string>
   <string name="PUPPY_GUIDE_RATING_NOT_HELPFUL">Inte hjälpsam</string>
@@ -1279,6 +1280,19 @@
   <string name="offer_screen_MULTIPLE_INSURANCES_coverage_paragraph">Läs om ditt fullständiga försäkringsskydd nedan.</string>
   <string name="onboarding_contextual_menu_app_info_label">Appinformation</string>
   <string name="onboarding_embark_flow_information_modal_title">Information</string>
+  <string name="ongoing_shop_session_action_button">Fortsätt köpet</string>
+  <plurals name="ongoing_shop_session_offer_expires_in_days">
+    <item quantity="one">Erbjudandet löper ut om %1$d dag</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d dagar</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_hours">
+    <item quantity="one">Erbjudandet löper ut om %1$d timme</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d timmar</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_minutes">
+    <item quantity="one">Erbjudandet löper ut om %1$d minut</item>
+    <item quantity="other">Erbjudandet löper ut om %1$d minuter</item>
+  </plurals>
   <string name="open_chat">Skriv meddelande</string>
   <string name="pay_in_confirmation_direct_debit_headline">Autogiro är anslutet!</string>
   <string name="pay_in_error_body">Vi kunde inte ansluta ditt bankkonto. Vänligen försök igen eller skriv till oss direkt i appen.</string>

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

@@ -522,6 +522,7 @@
   <string name="LETTER_TO_EIR_SUBJECT">Question regarding claim, Vehicle reg. %1$s</string>
   <string name="LOGIN_MARKET_PICKER_PREFERENCES">Preferences</string>
   <string name="LOGOUT_BUTTON">Logout</string>
+  <string name="MANAGE_BILLING_METHODS_BUTTON">Manage your payment methods</string>
   <string name="MANUAL_CHARGE_CANCELLATION_WARNING">Activate your coverage again by contacting us once your payment has been processed</string>
   <string name="MARKETING_GET_HEDVIG">Get a price quote</string>
   <string name="MISSING_CONTACT_INFO_CARD_BUTTON">Review contact info</string>
@@ -1279,6 +1280,19 @@
   <string name="offer_screen_MULTIPLE_INSURANCES_coverage_paragraph">Read the full coverage of your insurances below. </string>
   <string name="onboarding_contextual_menu_app_info_label">App information</string>
   <string name="onboarding_embark_flow_information_modal_title">Information</string>
+  <string name="ongoing_shop_session_action_button">Continue purchase</string>
+  <plurals name="ongoing_shop_session_offer_expires_in_days">
+    <item quantity="one">The offer expires in %1$d day</item>
+    <item quantity="other">The offer expires in %1$d days</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_hours">
+    <item quantity="one">The offer expires in %1$d hour</item>
+    <item quantity="other">The offer expires in %1$d hours</item>
+  </plurals>
+  <plurals name="ongoing_shop_session_offer_expires_in_minutes">
+    <item quantity="one">The offer expires in %1$d minute</item>
+    <item quantity="other">The offer expires in %1$d minutes</item>
+  </plurals>
   <string name="open_chat">Write message</string>
   <string name="pay_in_confirmation_direct_debit_headline">Direct debit connected!</string>
   <string name="pay_in_error_body">We were unable to add your payment method. Please try again or send us a message here in the app.</string>

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

@@ -203,6 +203,7 @@ fun HedvigButtonGhostWithBorder(
   enabled: Boolean = true,
   interactionSource: MutableInteractionSource? = null,
   size: ButtonSize = ButtonSize.Medium,
+  isLoading: Boolean = false
 ) {
   HedvigTextButton(
     text = text,
@@ -215,6 +216,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))
+    }
   }
 }
 
@@ -161,7 +172,9 @@ object EmptyStateDefaults {
     SUCCESS,
     BANK_ID,
     NO_ICON,
-    SUCCESS_WITH_WARNING
+    SUCCESS_WITH_WARNING,
+
+    SWISH
   }
 
   sealed class EmptyStateButtonStyle {