Merge branch 'trunk' into feature/new_privacy_screen

Author: wzieba

WooCommerce/src/main/kotlin/com/woocommerce/android/model/Notification.kt

@@ -22,7 +22,8 @@ data class Notification(
     val noteMessage: String?,
     val noteType: WooNotificationType,
     val channelType: NotificationChannelType,
-    val tag: String? = null
+    val tag: String? = null,
+    val data: String? = null
 ) : Parcelable {
     @IgnoredOnParcel
     val isOrderNotification = noteType == WooNotificationType.NEW_ORDER

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/local/LocalNotification.kt

@@ -17,6 +17,8 @@ sealed class LocalNotification(
     abstract fun getTitleString(resourceProvider: ResourceProvider): String
     abstract fun getDescriptionString(resourceProvider: ResourceProvider): String
 
+    open val data: String? = null
+
     data class StoreCreationFinishedNotification(
         val name: String
     ) : LocalNotification(
@@ -34,4 +36,22 @@ sealed class LocalNotification(
             return resourceProvider.getString(description, name)
         }
     }
+
+    data class StoreCreationIncompleteNotification(val name: String, val storeName: String) : LocalNotification(
+        title = R.string.local_notification_without_free_trial_title,
+        description = R.string.local_notification_without_free_trial_description,
+        type = LocalNotificationType.STORE_CREATION_INCOMPLETE,
+        delay = 24,
+        delayUnit = TimeUnit.HOURS
+    ) {
+        override fun getTitleString(resourceProvider: ResourceProvider): String {
+            return resourceProvider.getString(title)
+        }
+
+        override fun getDescriptionString(resourceProvider: ResourceProvider): String {
+            return resourceProvider.getString(description, name, storeName)
+        }
+
+        override val data: String = storeName
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/local/LocalNotificationScheduler.kt

@@ -22,6 +22,7 @@ class LocalNotificationScheduler @Inject constructor(
         const val LOCAL_NOTIFICATION_ID = "local_notification_id"
         const val LOCAL_NOTIFICATION_TITLE = "local_notification_title"
         const val LOCAL_NOTIFICATION_DESC = "local_notification_description"
+        const val LOCAL_NOTIFICATION_DATA = "local_notification_data"
     }
 
     private val workManager = WorkManager.getInstance(appContext)
@@ -54,7 +55,8 @@ class LocalNotificationScheduler @Inject constructor(
             LOCAL_NOTIFICATION_TYPE to notification.type.value,
             LOCAL_NOTIFICATION_ID to notification.id,
             LOCAL_NOTIFICATION_TITLE to notification.getTitleString(resourceProvider),
-            LOCAL_NOTIFICATION_DESC to notification.getDescriptionString(resourceProvider)
+            LOCAL_NOTIFICATION_DESC to notification.getDescriptionString(resourceProvider),
+            LOCAL_NOTIFICATION_DATA to notification.data
         )
         return OneTimeWorkRequestBuilder<LocalNotificationWorker>()
             .addTag(notification.type.value)

WooCommerce/src/main/kotlin/com/woocommerce/android/notifications/local/LocalNotificationWorker.kt

@@ -12,6 +12,7 @@ import com.woocommerce.android.model.Notification
 import com.woocommerce.android.notifications.NotificationChannelType.OTHER
 import com.woocommerce.android.notifications.WooNotificationBuilder
 import com.woocommerce.android.notifications.WooNotificationType.LOCAL_REMINDER
+import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Companion.LOCAL_NOTIFICATION_DATA
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Companion.LOCAL_NOTIFICATION_DESC
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Companion.LOCAL_NOTIFICATION_ID
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler.Companion.LOCAL_NOTIFICATION_TITLE
@@ -35,13 +36,14 @@ class LocalNotificationWorker @AssistedInject constructor(
         val id = inputData.getInt(LOCAL_NOTIFICATION_ID, -1)
         val title = inputData.getString(LOCAL_NOTIFICATION_TITLE)
         val description = inputData.getString(LOCAL_NOTIFICATION_DESC)
+        val data = inputData.getString(LOCAL_NOTIFICATION_DATA)
 
         if (type != null && id != -1 && title != null && description != null) {
-            val notification = buildNotification(id, type, title, description)
+            val notification = buildNotification(id, type, title, description, data)
             wooNotificationBuilder.buildAndDisplayLocalNotification(
                 appContext.getString(R.string.notification_channel_general_id),
                 notification,
-                getIntent(appContext, notification),
+                getIntent(notification),
             )
 
             AnalyticsTracker.track(
@@ -54,14 +56,20 @@ class LocalNotificationWorker @AssistedInject constructor(
         return Result.success()
     }
 
-    private fun getIntent(context: Context, notification: Notification): Intent {
-        return Intent(context, MainActivity::class.java).apply {
+    private fun getIntent(notification: Notification): Intent {
+        return Intent(appContext, MainActivity::class.java).apply {
             flags = Intent.FLAG_ACTIVITY_SINGLE_TOP
             putExtra(MainActivity.FIELD_LOCAL_NOTIFICATION, notification)
         }
     }
 
-    private fun buildNotification(id: Int, type: String, title: String, description: String) = Notification(
+    private fun buildNotification(
+        id: Int,
+        type: String,
+        title: String,
+        description: String,
+        data: String?
+    ) = Notification(
         noteId = id,
         tag = type,
         uniqueId = 0,
@@ -71,6 +79,7 @@ class LocalNotificationWorker @AssistedInject constructor(
         noteTitle = title,
         noteMessage = description,
         noteType = LOCAL_REMINDER,
-        channelType = OTHER
+        channelType = OTHER,
+        data = data
     )
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/iap/CheckIapEligibilityFragment.kt

@@ -8,6 +8,7 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.compose.ui.platform.ViewCompositionStrategy
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.findNavController
+import androidx.navigation.fragment.navArgs
 import com.woocommerce.android.extensions.navigateSafely
 import com.woocommerce.android.extensions.navigateToHelpScreen
 import com.woocommerce.android.ui.base.BaseFragment
@@ -26,6 +27,8 @@ class CheckIapEligibilityFragment : BaseFragment() {
     override val activityAppBarStatus: AppBarStatus
         get() = AppBarStatus.Hidden
 
+    private val navArgs by navArgs<CheckIapEligibilityFragmentArgs>()
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         return ComposeView(requireContext()).apply {
             setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
@@ -68,7 +71,8 @@ class CheckIapEligibilityFragment : BaseFragment() {
     private fun navigateToStoreCreationNative() {
         findNavController()
             .navigateSafely(
-                CheckIapEligibilityFragmentDirections.actionCheckIapEligibilityFragmentToStoreNamePickerFragment(),
+                CheckIapEligibilityFragmentDirections
+                    .actionCheckIapEligibilityFragmentToStoreNamePickerFragment(navArgs.storeName),
                 skipThrottling = true
             )
     }

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/name/StoreNamePickerViewModel.kt

@@ -11,26 +11,36 @@ import com.woocommerce.android.AppPrefsWrapper
 import com.woocommerce.android.analytics.AnalyticsEvent
 import com.woocommerce.android.analytics.AnalyticsTracker
 import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
+import com.woocommerce.android.extensions.isNotNullOrEmpty
+import com.woocommerce.android.notifications.local.LocalNotification.StoreCreationIncompleteNotification
+import com.woocommerce.android.notifications.local.LocalNotificationScheduler
 import com.woocommerce.android.support.help.HelpOrigin.STORE_CREATION
 import com.woocommerce.android.ui.login.storecreation.NewStore
 import com.woocommerce.android.util.FeatureFlag
+import com.woocommerce.android.util.IsRemoteFeatureFlagEnabled
+import com.woocommerce.android.util.RemoteFeatureFlag.LOCAL_NOTIFICATION_NUDGE_FREE_TRIAL_AFTER_1D
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.Exit
 import com.woocommerce.android.viewmodel.MultiLiveEvent.Event.NavigateToHelpScreen
 import com.woocommerce.android.viewmodel.ScopedViewModel
 import com.woocommerce.android.viewmodel.SingleLiveEvent
 import com.woocommerce.android.viewmodel.getStateFlow
+import com.woocommerce.android.viewmodel.navArgs
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.update
 import kotlinx.parcelize.Parcelize
+import org.wordpress.android.fluxc.store.AccountStore
 import javax.inject.Inject
 
 @HiltViewModel
 class StoreNamePickerViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val newStore: NewStore,
     private val analyticsTrackerWrapper: AnalyticsTrackerWrapper,
-    private val prefsWrapper: AppPrefsWrapper
+    private val prefsWrapper: AppPrefsWrapper,
+    private val localNotificationScheduler: LocalNotificationScheduler,
+    private val isRemoteFeatureFlagEnabled: IsRemoteFeatureFlagEnabled,
+    private val accountStore: AccountStore
 ) : ScopedViewModel(savedStateHandle) {
     override val _event = SingleLiveEvent<Event>()
     override val event: LiveData<Event> = _event
@@ -45,6 +55,8 @@ class StoreNamePickerViewModel @Inject constructor(
         get() = FeatureFlag.FREE_TRIAL_M2.isEnabled() &&
             FeatureFlag.STORE_CREATION_PROFILER.isEnabled().not()
 
+    private val navArgs: StoreNamePickerFragmentArgs by savedStateHandle.navArgs()
+
     init {
         analyticsTrackerWrapper.track(
             AnalyticsEvent.SITE_CREATION_STEP,
@@ -54,6 +66,10 @@ class StoreNamePickerViewModel @Inject constructor(
         )
 
         triggerEvent(CheckNotificationsPermission(::onCheckNotificationsPermissionResult))
+
+        if (navArgs.storeName != null) {
+            onStoreNameChanged(navArgs.storeName!!)
+        }
     }
 
     fun onCancelPressed() {
@@ -88,6 +104,9 @@ class StoreNamePickerViewModel @Inject constructor(
 
     fun onContinueClicked() {
         newStore.update(name = _viewState.value.storeName)
+
+        scheduleDeferredNotification()
+
         if (canCreateFreeTrialStore) {
             triggerEvent(NavigateToSummary)
         } else if (FeatureFlag.STORE_CREATION_PROFILER.isEnabled()) {
@@ -97,6 +116,22 @@ class StoreNamePickerViewModel @Inject constructor(
         }
     }
 
+    private fun scheduleDeferredNotification() {
+        if (isRemoteFeatureFlagEnabled(LOCAL_NOTIFICATION_NUDGE_FREE_TRIAL_AFTER_1D)) {
+            val name = if (accountStore.account.firstName.isNotNullOrEmpty())
+                accountStore.account.firstName
+            else
+                accountStore.account.userName
+
+            localNotificationScheduler.scheduleNotification(
+                StoreCreationIncompleteNotification(
+                    name,
+                    _viewState.value.storeName
+                )
+            )
+        }
+    }
+
     fun onPermissionRationaleDismissed() {
         setPermissionRationaleVisible(false)
 

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/login/storecreation/summary/StoreCreationSummaryViewModel.kt

@@ -8,6 +8,7 @@ import com.woocommerce.android.analytics.AnalyticsTrackerWrapper
 import com.woocommerce.android.extensions.isNotNullOrEmpty
 import com.woocommerce.android.notifications.local.LocalNotification.StoreCreationFinishedNotification
 import com.woocommerce.android.notifications.local.LocalNotificationScheduler
+import com.woocommerce.android.notifications.local.LocalNotificationType.STORE_CREATION_INCOMPLETE
 import com.woocommerce.android.ui.login.storecreation.CreateFreeTrialStore
 import com.woocommerce.android.ui.login.storecreation.CreateFreeTrialStore.StoreCreationState.Failed
 import com.woocommerce.android.ui.login.storecreation.CreateFreeTrialStore.StoreCreationState.Finished
@@ -92,6 +93,9 @@ class StoreCreationSummaryViewModel @Inject constructor(
                 accountStore.account.userName
             localNotificationScheduler.scheduleNotification(StoreCreationFinishedNotification(name))
         }
+
+        // No need to display a notification to complete store creation anymore
+        localNotificationScheduler.cancelScheduledNotification(STORE_CREATION_INCOMPLETE)
     }
 
     object OnCancelPressed : MultiLiveEvent.Event()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivity.kt

@@ -35,6 +35,7 @@ import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.navigation.fragment.NavHostFragment
+import androidx.navigation.navOptions
 import com.automattic.android.tracks.crashlogging.CrashLogging
 import com.google.android.material.appbar.AppBarLayout
 import com.woocommerce.android.AppPrefs
@@ -77,6 +78,7 @@ import com.woocommerce.android.ui.main.MainActivityViewModel.RestartActivityForA
 import com.woocommerce.android.ui.main.MainActivityViewModel.RestartActivityForNotification
 import com.woocommerce.android.ui.main.MainActivityViewModel.ShortcutOpenOrderCreation
 import com.woocommerce.android.ui.main.MainActivityViewModel.ShortcutOpenPayments
+import com.woocommerce.android.ui.main.MainActivityViewModel.ShortcutOpenStoreCreation
 import com.woocommerce.android.ui.main.MainActivityViewModel.ShowFeatureAnnouncement
 import com.woocommerce.android.ui.main.MainActivityViewModel.ViewMyStoreStats
 import com.woocommerce.android.ui.main.MainActivityViewModel.ViewOrderDetail
@@ -98,6 +100,7 @@ import com.woocommerce.android.ui.plans.trial.DetermineTrialStatusBarState.Trial
 import com.woocommerce.android.ui.prefs.AppSettingsActivity
 import com.woocommerce.android.ui.products.ProductListFragmentDirections
 import com.woocommerce.android.ui.reviews.ReviewListFragmentDirections
+import com.woocommerce.android.ui.sitepicker.SitePickerFragmentDirections
 import com.woocommerce.android.util.ChromeCustomTabUtils
 import com.woocommerce.android.util.WooAnimUtils.Duration
 import com.woocommerce.android.util.WooAnimUtils.animateBottomBar
@@ -718,6 +721,7 @@ class MainActivity :
             viewModel.handleIncomingNotification(localPushId, notification)
         } else if (localNotification != null) {
             viewModel.onLocalNotificationTapped(localNotification)
+            intent.removeExtra(FIELD_LOCAL_NOTIFICATION)
         }
     }
     // endregion
@@ -737,6 +741,7 @@ class MainActivity :
                 is ShowFeatureAnnouncement -> navigateToFeatureAnnouncement(event)
                 is ViewUrlInWebView -> navigateToWebView(event)
                 is RequestNotificationsPermission -> requestNotificationsPermission()
+                is ShortcutOpenStoreCreation -> shortcutOpenStoreCreation(event.storeName)
                 ViewPayments -> showPayments()
                 ViewTapToPay -> showTapToPaySummary()
                 ShortcutOpenPayments -> shortcutShowPayments()
@@ -758,6 +763,22 @@ class MainActivity :
         observeBottomBarState()
     }
 
+    private fun shortcutOpenStoreCreation(storeName: String?) {
+        navController.apply {
+            navigate(
+                NavGraphMainDirections.actionGlobalLoginToSitePickerFragment(
+                    openedFromLogin = AppPrefs.getStoreCreationSource() != AnalyticsTracker.VALUE_SWITCHING_STORE
+                )
+            )
+            navigate(
+                SitePickerFragmentDirections.actionSitePickerFragmentToStoreCreationNativeFlow(storeName),
+                navOptions {
+                    popUpTo(R.id.sitePickerFragment) { inclusive = true }
+                }
+            )
+        }
+    }
+
     private fun observeNotificationsPermissionBarVisibility() {
         viewModel.isNotificationsPermissionCardVisible.observe(this) { isVisible ->
             if (isVisible) {

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/main/MainActivityViewModel.kt

@@ -16,6 +16,7 @@ import com.woocommerce.android.model.FeatureAnnouncement
 import com.woocommerce.android.model.Notification
 import com.woocommerce.android.notifications.NotificationChannelType
 import com.woocommerce.android.notifications.UnseenReviewsCountHandler
+import com.woocommerce.android.notifications.local.LocalNotificationType
 import com.woocommerce.android.notifications.push.NotificationMessageHandler
 import com.woocommerce.android.tools.SelectedSite
 import com.woocommerce.android.tools.SiteConnectionType.Jetpack
@@ -251,6 +252,10 @@ class MainActivityViewModel @Inject constructor(
             AnalyticsEvent.LOCAL_NOTIFICATION_TAPPED,
             mapOf(AnalyticsTracker.KEY_TYPE to notification.tag)
         )
+
+        if (notification.tag == LocalNotificationType.STORE_CREATION_INCOMPLETE.value) {
+            triggerEvent(ShortcutOpenStoreCreation(storeName = notification.data))
+        }
     }
 
     fun onPrivacyPreferenceUpdateFailed(analyticsEnabled: Boolean) {
@@ -280,6 +285,7 @@ class MainActivityViewModel @Inject constructor(
     data class ViewUrlInWebView(val url: String) : Event()
     object ShortcutOpenPayments : Event()
     object ShortcutOpenOrderCreation : Event()
+    data class ShortcutOpenStoreCreation(val storeName: String?) : Event()
     data class RestartActivityForNotification(val pushId: Int, val notification: Notification) : Event()
     data class RestartActivityForAppLink(val data: Uri) : Event()
     data class ShowFeatureAnnouncement(val announcement: FeatureAnnouncement) : Event()

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/orders/details/OrderDetailViewModel.kt

@@ -108,7 +108,8 @@ class OrderDetailViewModel @Inject constructor(
     private val shippingLabelOnboardingRepository: ShippingLabelOnboardingRepository,
     private val orderDetailsTransactionLauncher: OrderDetailsTransactionLauncher,
     private val getOrderSubscriptions: GetOrderSubscriptions,
-    private val giftCardRepository: GiftCardRepository
+    private val giftCardRepository: GiftCardRepository,
+    private val orderProductMapper: OrderProductMapper
 ) : ScopedViewModel(savedState), OnProductFetchedListener {
     private val navArgs: OrderDetailFragmentArgs by savedState.navArgs()
 
@@ -607,7 +608,7 @@ class OrderDetailViewModel @Inject constructor(
     ): ListInfo<OrderProduct> {
         val products = refunds.list.getNonRefundedProducts(order.items)
         checkAddonAvailability(products)
-        val orderProducts = products.toOrderProducts()
+        val orderProducts = orderProductMapper.toOrderProducts(_productList.value ?: emptyList(), products)
         return ListInfo(isVisible = orderProducts.isNotEmpty(), list = orderProducts)
     }
     private fun checkAddonAvailability(products: List<Order.Item>) {