Merge branch 'trunk' into woomob-1405-woo-poslocal-catalog-run-incremental-sync-on-pos-splash

Author: samiuelson

RELEASE-NOTES.txt

@@ -5,6 +5,9 @@
 -----
 - [*] Fixed an issue where Blaze campaign creation could fail for products using PDF thumbnails as images [https://github.com/woocommerce/woocommerce-android/pull/14642]
 
+23.3.1
+-----
+- [***] Fix issue with In Person Payments card reader connection flow [https://github.com/woocommerce/woocommerce-android/pull/14681]
 23.3
 -----
 - [Internal] Migration to POS specific product model [https://github.com/woocommerce/woocommerce-android/pull/14598]

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/Navigation.kt

@@ -1,7 +1,7 @@
 package com.woocommerce.android.wear.ui
 
 import androidx.compose.runtime.Composable
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/login/LoginScreen.kt

@@ -23,7 +23,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController
 import androidx.wear.compose.material.Button

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/orders/list/OrdersListScreen.kt

@@ -27,7 +27,7 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.navigation.NavController
 import androidx.navigation.compose.rememberNavController

WooCommerce-Wear/src/main/java/com/woocommerce/android/wear/ui/stats/StoreStatsScreen.kt

@@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.LocalLifecycleOwner
 import androidx.wear.compose.material.Icon
 import androidx.wear.compose.material.PositionIndicator

WooCommerce/src/androidTest/kotlin/com/woocommerce/android/AppPrefsTest.kt

@@ -10,7 +10,6 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.Before
 import org.junit.Test
 
-@Suppress("UnitTestNamingRule")
 class AppPrefsTest {
     @Before
     fun setup() {
@@ -593,4 +592,44 @@ class AppPrefsTest {
 
         assertThat(AppPrefs.isPOSLaunchableForSite(siteId)).isFalse
     }
+
+    @Test
+    fun givenWooPosSurveyNotificationCurrentUserShownNotSetThenReturnFalseByDefault() {
+        assertThat(AppPrefs.isWooPosSurveyNotificationCurrentUserShown).isFalse
+    }
+
+    @Test
+    fun givenWooPosSurveyNotificationCurrentUserShownSetToTrueThenReturnTrue() {
+        AppPrefs.isWooPosSurveyNotificationCurrentUserShown = true
+
+        assertThat(AppPrefs.isWooPosSurveyNotificationCurrentUserShown).isTrue
+    }
+
+    @Test
+    fun givenWooPosSurveyNotificationCurrentUserShownSetToFalseThenReturnFalse() {
+        AppPrefs.isWooPosSurveyNotificationCurrentUserShown = true
+        AppPrefs.isWooPosSurveyNotificationCurrentUserShown = false
+
+        assertThat(AppPrefs.isWooPosSurveyNotificationCurrentUserShown).isFalse
+    }
+
+    @Test
+    fun givenWooPosSurveyNotificationPotentialUserShownNotSetThenReturnFalseByDefault() {
+        assertThat(AppPrefs.isWooPosSurveyNotificationPotentialUserShown).isFalse
+    }
+
+    @Test
+    fun givenWooPosSurveyNotificationPotentialUserShownSetToTrueThenReturnTrue() {
+        AppPrefs.isWooPosSurveyNotificationPotentialUserShown = true
+
+        assertThat(AppPrefs.isWooPosSurveyNotificationPotentialUserShown).isTrue
+    }
+
+    @Test
+    fun givenWooPosSurveyNotificationPotentialUserShownSetToFalseThenReturnFalse() {
+        AppPrefs.isWooPosSurveyNotificationPotentialUserShown = true
+        AppPrefs.isWooPosSurveyNotificationPotentialUserShown = false
+
+        assertThat(AppPrefs.isWooPosSurveyNotificationPotentialUserShown).isFalse
+    }
 }

WooCommerce/src/main/kotlin/com/woocommerce/android/AppPrefs.kt

@@ -213,7 +213,11 @@ object AppPrefs {
 
         POS_TAB_VISIBILITY,
 
-        POS_LAUNCHABLE
+        POS_LAUNCHABLE,
+
+        WOO_POS_SURVEY_NOTIFICATION_CURRENT_USER_SHOWN,
+
+        WOO_POS_SURVEY_NOTIFICATION_POTENTIAL_USER_SHOWN
     }
 
     fun init(context: Context) {
@@ -1353,6 +1357,14 @@ object AppPrefs {
         )
     }
 
+    var isWooPosSurveyNotificationCurrentUserShown: Boolean
+        get() = getBoolean(UndeletablePrefKey.WOO_POS_SURVEY_NOTIFICATION_CURRENT_USER_SHOWN, false)
+        set(value) = setBoolean(UndeletablePrefKey.WOO_POS_SURVEY_NOTIFICATION_CURRENT_USER_SHOWN, value)
+
+    var isWooPosSurveyNotificationPotentialUserShown: Boolean
+        get() = getBoolean(UndeletablePrefKey.WOO_POS_SURVEY_NOTIFICATION_POTENTIAL_USER_SHOWN, false)
+        set(value) = setBoolean(UndeletablePrefKey.WOO_POS_SURVEY_NOTIFICATION_POTENTIAL_USER_SHOWN, value)
+
     enum class CardReaderOnboardingStatus {
         CARD_READER_ONBOARDING_COMPLETED,
         CARD_READER_ONBOARDING_PENDING,

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/blaze/DashboardBlazeCard.kt

@@ -25,7 +25,7 @@ import androidx.compose.ui.res.dimensionResource
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.compose.LocalLifecycleOwner

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/coupons/DashboardCouponsCard.kt

@@ -24,7 +24,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.compose.LocalLifecycleOwner
@@ -49,7 +49,7 @@ import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.Da
 import com.woocommerce.android.ui.dashboard.coupons.DashboardCouponsViewModel.State
 import com.woocommerce.android.ui.dashboard.defaultHideMenuEntry
 import com.woocommerce.android.viewmodel.MultiLiveEvent
-import java.util.*
+import java.util.Date
 
 @Composable
 fun DashboardCouponsCard(

WooCommerce/src/main/kotlin/com/woocommerce/android/ui/dashboard/google/DashboardGoogleAdsCard.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.Observer
 import androidx.lifecycle.compose.LocalLifecycleOwner