Merge pull request #315 from Manuito83/develop

Hotfix: fixed issue with AWH pricing

Author: Manuito83

android/app/build.gradle

@@ -16,12 +16,12 @@ if (localPropertiesFile.exists()) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '510'
+    flutterVersionCode = '511'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '3.7.3'
+    flutterVersionName = '3.7.4'
 }
 
 def keystoreProperties = new Properties()

ios/Runner.xcodeproj/project.pbxproj

@@ -549,7 +549,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 510;
+				CURRENT_PROJECT_VERSION = 511;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -567,7 +567,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.7.3;
+				MARKETING_VERSION = 3.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.manuito.tornpda;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -698,7 +698,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 510;
+				CURRENT_PROJECT_VERSION = 511;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -716,7 +716,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.7.3;
+				MARKETING_VERSION = 3.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.manuito.tornpda;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -739,7 +739,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 510;
+				CURRENT_PROJECT_VERSION = 511;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -757,7 +757,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 3.7.3;
+				MARKETING_VERSION = 3.7.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.manuito.tornpda;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

lib/main.dart

@@ -69,9 +69,9 @@ import 'package:wakelock_plus/wakelock_plus.dart';
 import 'package:workmanager/workmanager.dart';
 
 // TODO (App release)
-const String appVersion = '3.7.3';
-const String androidCompilation = '510';
-const String iosCompilation = '510';
+const String appVersion = '3.7.4';
+const String androidCompilation = '511';
+const String iosCompilation = '511';
 
 // TODO (App release)
 // Note: if using Windows and calling HTTP functions, we need to change the URL in [firebase_functions.dart]

lib/providers/trades_provider.dart

@@ -162,6 +162,10 @@ class TradesProvider extends ChangeNotifier {
           addColor2Items(itemLine, allTornItems, tradesContainer.rightItems);
         }
 
+        // We need to save the original rightItems before applying the Torn Exchange
+        // data so that we can send them unaltered to AWH
+        tradesContainer.rightOriginalItemsBeforeTornExchange = tradesContainer.rightItems;
+
         // Check Arson Warehouse.
         tradesContainer.awhActive = await Prefs().getAWHEnabled();
 
@@ -190,10 +194,6 @@ class TradesProvider extends ChangeNotifier {
               // and preserving any leftover items that TE doesn’t mention.
               // This also ensures we keep original market prices for items that TE sets to zero.
 
-              // If we have a Torn Exchange response, we need to save the original rightItems
-              // before applying the Torn Exchange data so that we can send them unaltered to AWH
-              tradesContainer.rightOriginalItemsBeforeTornExchange = tradesContainer.rightItems;
-
               // Apply Torn Exchange data to our existing rightItems
               tradesContainer.rightItems = applyTornExchangeIn(
                 tradesContainer.rightItems,

lib/utils/changelog.dart

@@ -51,11 +51,12 @@ class ChangeLogState extends State<ChangeLog> {
   void _createItems() {
     final itemList = <ChangeLogItem>[];
 
-    // v3.7.3 - Build 510 - 08/04/2025
+    // v3.7.4 - Build 511 - 012/04/2025
     itemList.add(
       ChangeLogItem()
-        ..version = 'Torn PDA v3.7.3'
+        ..version = 'Torn PDA v3.7.4'
         ..date = '15 APR 2025'
+        ..infoString = "Hotfix: fixed issue with AWH pricing"
         ..features = [
           "Alerts: company messages can now be filtered out in chat notifications",
           "Added Wiki to the main drawer menu",