fix: resolve conflicts

openfoodfacts · Nov 14, 2024 · 5d09304 · 5d09304
1 parent 3b1f775
commit 5d09304
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/packages/smooth_app/lib/pages/product/add_new_product/add_new_product_page.dart b/packages/smooth_app/lib/pages/product/add_new_product/add_new_product_page.dart
@@ -170,9 +170,9 @@ class _AddNewProductPageState extends State<AddNewProductPage>
       ),
     ];
     _daoProductList = DaoProductList(localDatabase);
-    AnalyticsHelper.trackEvent(
+    AnalyticsHelper.trackProductEvent(
       widget.events[EditProductAction.openPage]!,
-      barcode: barcode,
+      product: upToDateProduct,
     );
     _pageController.addListener(() => setState(() {}));
   }
@@ -206,9 +206,9 @@ class _AddNewProductPageState extends State<AddNewProductPage>
       ),
     );
     if (leaveThePage == true) {
-      AnalyticsHelper.trackEvent(
+      AnalyticsHelper.trackProductEvent(
         widget.events[EditProductAction.leaveEmpty]!,
-        barcode: barcode,
+        product: upToDateProduct,
       );
     }
     return leaveThePage ?? false;
@@ -581,9 +581,7 @@ class _AddNewProductPageState extends State<AddNewProductPage>
           productType: productType,
           checked: productType == _inputProductType,
           onChanged: (ProductType value) {
-            if (value != null) {
-              setState(() => _inputProductType = value);
-            }
+            setState(() => _inputProductType = value);
           },
         ),
       );