From 16196a3d10e284d42c54bb39b6a4ecb108005d39 Mon Sep 17 00:00:00 2001
From: Emil Junker <19289477+EmilJunker@users.noreply.github.com>
Date: Sat, 10 Sep 2022 14:47:02 +0200
Subject: [PATCH 1/2] Fix carbs value when importing from USDA

---
 www/activities/foodlist/js/usda.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/www/activities/foodlist/js/usda.js b/www/activities/foodlist/js/usda.js
index 7600ef862..3044307cb 100644
--- a/www/activities/foodlist/js/usda.js
+++ b/www/activities/foodlist/js/usda.js
@@ -182,15 +182,25 @@ app.USDA = {
             let value = app.Utils.convertUnit(n.value, n.unitName, units[x]);
             result.nutrition[x] = Math.round(value * multiplier * 100) / 100;
 
-            if (x == "sodium")
-              result.nutrition.salt = result.nutrition.sodium * 0.0025;
-
             break;
           }
         }
       }
     });
 
+    // The USDA db only contains values for sodium, but not for salt
+    if (result.nutrition.sodium !== undefined) {
+      result.nutrition.salt = result.nutrition.sodium * 0.0025;
+    }
+
+    // The carbs values in the USDA db include fiber, but we don't want that
+    if (result.nutrition.carbohydrates && result.nutrition.fiber) {
+      let correctedCarbs = result.nutrition.carbohydrates - result.nutrition.fiber;
+      if (correctedCarbs < result.nutrition.sugars || 0)
+        correctedCarbs = result.nutrition.sugars || 0;
+      result.nutrition.carbohydrates = correctedCarbs;
+    }
+
     return result;
   },
 

From 35f9fe676fc14c740c526b65e8767249e7fddbd2 Mon Sep 17 00:00:00 2001
From: Emil Junker <19289477+EmilJunker@users.noreply.github.com>
Date: Sat, 10 Sep 2022 14:53:12 +0200
Subject: [PATCH 2/2] Update changelog

---
 metadata/en-US/changelogs/30405.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/metadata/en-US/changelogs/30405.txt b/metadata/en-US/changelogs/30405.txt
index 3ba085551..c81450602 100644
--- a/metadata/en-US/changelogs/30405.txt
+++ b/metadata/en-US/changelogs/30405.txt
@@ -1,5 +1,6 @@
 - added ability to export diary as CSV file
 - improved Open Food Facts search integration
+- carbs values of items imported from USDA no longer include fiber
 - added support for Serbian language (Cyrillic and Latin)
 - various bugfixes