Merge pull request #260 from AgoraDesk-LocalMonero/iteration-52

Iteration 52
AgoraDesk-LocalMonero · Nov 30, 2023 · 4190823 · 4190823
2 parents 2863752 + 6c27921
commit 4190823
Show file tree

Hide file tree

Showing 31 changed files with 430 additions and 239 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,7 +1,7 @@
 ### Updates
-1. Fix: Bug with a minimal ad edit.
-2. Fix: Markdown doesn't function in the app when viewing Terms of…
-3. Fix: Mark notifications as read - if a trade is opened and the app receives a notification about it, it should mark it as read.
+1. Added an additional price check before initiating a trade. If the ad price has changed, prompt the user for confirmation.
+2. Now displaying the usernames of those who leave feedback in a user's profile. This allows users to see who has provided feedback and to improve their service accordingly.
+3. Changed instructions for importing reputation from the Paxful platform.
 
 
 

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -24,9 +24,9 @@ PODS:
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.16.0):
+  - FirebaseCoreInternal (10.18.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
-  - FirebaseInstallations (10.16.0):
+  - FirebaseInstallations (10.18.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
@@ -61,37 +61,37 @@ PODS:
   - FMDB (2.7.5):
     - FMDB/standard (= 2.7.5)
   - FMDB/standard (2.7.5)
-  - GoogleDataTransport (9.2.5):
+  - GoogleDataTransport (9.3.0):
     - GoogleUtilities/Environment (~> 7.7)
     - nanopb (< 2.30910.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/AppDelegateSwizzler (7.11.5):
+  - GoogleUtilities/AppDelegateSwizzler (7.12.0):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.5):
+  - GoogleUtilities/Environment (7.12.0):
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.5):
+  - GoogleUtilities/Logger (7.12.0):
     - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.11.5):
+  - GoogleUtilities/Network (7.12.0):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.11.5)"
-  - GoogleUtilities/Reachability (7.11.5):
+  - "GoogleUtilities/NSData+zlib (7.12.0)"
+  - GoogleUtilities/Reachability (7.12.0):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.11.5):
+  - GoogleUtilities/UserDefaults (7.12.0):
     - GoogleUtilities/Logger
   - image_picker_ios (0.0.1):
     - Flutter
   - local_auth_ios (0.0.1):
     - Flutter
   - MTBBarcodeScanner (5.0.11)
-  - nanopb (2.30909.0):
-    - nanopb/decode (= 2.30909.0)
-    - nanopb/encode (= 2.30909.0)
-  - nanopb/decode (2.30909.0)
-  - nanopb/encode (2.30909.0)
+  - nanopb (2.30909.1):
+    - nanopb/decode (= 2.30909.1)
+    - nanopb/encode (= 2.30909.1)
+  - nanopb/decode (2.30909.1)
+  - nanopb/encode (2.30909.1)
   - OrderedSet (5.0.0)
   - package_info_plus (0.4.5):
     - Flutter
@@ -119,7 +119,7 @@ PODS:
     - FMDB (>= 2.7.5)
   - store_checker (0.0.1):
     - Flutter
-  - SwiftProtobuf (1.24.0)
+  - SwiftProtobuf (1.25.2)
   - uni_links (0.0.1):
     - Flutter
   - url_launcher_ios (0.0.1):
@@ -233,8 +233,8 @@ SPEC CHECKSUMS:
   firebase_core: 85b6664038311940ad60584eaabc73103c61f5de
   firebase_messaging: c55f70dd48a998dea00a29ccf94572e1e4d454b2
   FirebaseCore: d027ff503d37edb78db98429b11f580a24a7df2a
-  FirebaseCoreInternal: 26233f705cc4531236818a07ac84d20c333e505a
-  FirebaseInstallations: b822f91a61f7d1ba763e5ccc9d4f2e6f2ed3b3ee
+  FirebaseCoreInternal: 8eb002e564b533bdcf1ba011f33f2b5c10e2ed4a
+  FirebaseInstallations: e842042ec6ac1fd2e37d7706363ebe7f662afea4
   FirebaseMessaging: 8a3b9a8b98ce72a42d22e69865cf662e38d2d6f5
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_app_badger: b87fc231847b03b92ce1412aa351842e7e97932f
@@ -244,12 +244,12 @@ SPEC CHECKSUMS:
   flutter_local_notifications: 0c0b1ae97e741e1521e4c1629a459d04b9aec743
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
   FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
-  GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
-  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
+  GoogleDataTransport: 57c22343ab29bc686febbf7cbb13bad167c2d8fe
+  GoogleUtilities: 0759d1a57ebb953965c2dfe0ba4c82e95ccc2e34
   image_picker_ios: 4a8aadfbb6dc30ad5141a2ce3832af9214a705b5
   local_auth_ios: c6cf091ded637a88f24f86a8875d8b0f526e2605
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  nanopb: b552cce312b6c8484180ef47159bc0f65a1f0431
+  nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
   path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
@@ -263,7 +263,7 @@ SPEC CHECKSUMS:
   shared_preferences_foundation: e2dae3258e06f44cc55f49d42024fd8dd03c590c
   sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
   store_checker: 359c5051d9ec30ff0a8fa39eb5ec9df021bb745d
-  SwiftProtobuf: bcfd2bc231cf9ae552cdc7c4e877bd3b41fe57b1
+  SwiftProtobuf: 407a385e97fd206c4fbe880cc84123989167e0d1
   uni_links: d97da20c7701486ba192624d99bffaaffcfc298a
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
   video_player_avfoundation: 81e49bb3d9fb63dccf9fa0f6d877dc3ddbeac126

diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -432,7 +432,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 110;
+				CURRENT_PROJECT_VERSION = 111;
 				DEVELOPMENT_TEAM = G8RXR25D89;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -441,7 +441,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.14;
+				MARKETING_VERSION = 1.1.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.agoradesk.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -522,7 +522,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 110;
+				CURRENT_PROJECT_VERSION = 111;
 				DEVELOPMENT_TEAM = G8RXR25D89;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -531,7 +531,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.14;
+				MARKETING_VERSION = 1.1.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.agoradesk.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -611,7 +611,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 110;
+				CURRENT_PROJECT_VERSION = 111;
 				DEVELOPMENT_TEAM = G8RXR25D89;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -620,7 +620,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.14;
+				MARKETING_VERSION = 1.1.15;
 				PRODUCT_BUNDLE_IDENTIFIER = co.localmonero.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -703,7 +703,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 110;
+				CURRENT_PROJECT_VERSION = 111;
 				DEVELOPMENT_TEAM = G8RXR25D89;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -712,7 +712,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.14;
+				MARKETING_VERSION = 1.1.15;
 				PRODUCT_BUNDLE_IDENTIFIER = co.localmonero.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -791,7 +791,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 110;
+				CURRENT_PROJECT_VERSION = 111;
 				DEVELOPMENT_TEAM = G8RXR25D89;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -800,7 +800,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.14;
+				MARKETING_VERSION = 1.1.15;
 				PRODUCT_BUNDLE_IDENTIFIER = com.agoradesk.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -878,7 +878,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 110;
+				CURRENT_PROJECT_VERSION = 111;
 				DEVELOPMENT_TEAM = G8RXR25D89;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
@@ -887,7 +887,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.1.14;
+				MARKETING_VERSION = 1.1.15;
 				PRODUCT_BUNDLE_IDENTIFIER = co.localmonero.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/lib/core/widgets/branded/agora_dialog_close_link.dart b/lib/core/widgets/branded/agora_dialog_close_link.dart
@@ -22,7 +22,7 @@ class AgoraDialogCloseLink extends StatelessWidget {
         showDialog(
           barrierDismissible: true,
           context: context,
-          builder: (_) => AgoraDialogClose(
+          builder: (context) => AgoraDialogClose(
             title: title ?? linkTitle,
             text: text,
           ),

diff --git a/lib/core/widgets/branded/agora_dialog_info_link.dart b/lib/core/widgets/branded/agora_dialog_info_link.dart
@@ -22,7 +22,7 @@ class AgoraDialogInfoWithMarkdown extends StatelessWidget {
         showDialog(
           barrierDismissible: true,
           context: context,
-          builder: (_) => AgoraDialogInfo(
+          builder: (context) => AgoraDialogInfo(
             title: title ?? linkTitle,
             text: text,
           ),

diff --git a/lib/features/account/data/models/feedback_model.dart b/lib/features/account/data/models/feedback_model.dart
@@ -14,6 +14,7 @@ class FeedbackModel with _$FeedbackModel {
     @JsonKey(name: 'feedback_type', includeIfNull: false) required FeedbackType feedbackType,
     @JsonKey(name: 'given_at', includeIfNull: false, fromJson: fromJsonDate, toJson: toJsonDate) required DateTime date,
     @JsonKey(name: 'msg', includeIfNull: false) String? text,
+    String? giver,
   }) = _FeedbackModel;
 
   factory FeedbackModel.fromJson(Map<String, dynamic> json) => _$FeedbackModelFromJson(json);

diff --git a/lib/features/account/data/models/feedback_model.freezed.dart b/lib/features/account/data/models/feedback_model.freezed.dart
@@ -30,6 +30,7 @@ mixin _$FeedbackModel {
   DateTime get date => throw _privateConstructorUsedError;
   @JsonKey(name: 'msg', includeIfNull: false)
   String? get text => throw _privateConstructorUsedError;
+  String? get giver => throw _privateConstructorUsedError;
 
   Map<String, dynamic> toJson() => throw _privateConstructorUsedError;
   @JsonKey(ignore: true)
@@ -49,7 +50,8 @@ abstract class $FeedbackModelCopyWith<$Res> {
       @JsonKey(name: 'given_at', includeIfNull: false, fromJson: fromJsonDate, toJson: toJsonDate)
           DateTime date,
       @JsonKey(name: 'msg', includeIfNull: false)
-          String? text});
+          String? text,
+      String? giver});
 }
 
 /// @nodoc
@@ -68,6 +70,7 @@ class _$FeedbackModelCopyWithImpl<$Res, $Val extends FeedbackModel>
     Object? feedbackType = null,
     Object? date = null,
     Object? text = freezed,
+    Object? giver = freezed,
   }) {
     return _then(_value.copyWith(
       feedbackType: null == feedbackType
@@ -82,6 +85,10 @@ class _$FeedbackModelCopyWithImpl<$Res, $Val extends FeedbackModel>
           ? _value.text
           : text // ignore: cast_nullable_to_non_nullable
               as String?,
+      giver: freezed == giver
+          ? _value.giver
+          : giver // ignore: cast_nullable_to_non_nullable
+              as String?,
     ) as $Val);
   }
 }
@@ -100,7 +107,8 @@ abstract class _$$_FeedbackModelCopyWith<$Res>
       @JsonKey(name: 'given_at', includeIfNull: false, fromJson: fromJsonDate, toJson: toJsonDate)
           DateTime date,
       @JsonKey(name: 'msg', includeIfNull: false)
-          String? text});
+          String? text,
+      String? giver});
 }
 
 /// @nodoc
@@ -117,6 +125,7 @@ class __$$_FeedbackModelCopyWithImpl<$Res>
     Object? feedbackType = null,
     Object? date = null,
     Object? text = freezed,
+    Object? giver = freezed,
   }) {
     return _then(_$_FeedbackModel(
       feedbackType: null == feedbackType
@@ -131,6 +140,10 @@ class __$$_FeedbackModelCopyWithImpl<$Res>
           ? _value.text
           : text // ignore: cast_nullable_to_non_nullable
               as String?,
+      giver: freezed == giver
+          ? _value.giver
+          : giver // ignore: cast_nullable_to_non_nullable
+              as String?,
     ));
   }
 }
@@ -145,7 +158,8 @@ class _$_FeedbackModel implements _FeedbackModel {
       @JsonKey(name: 'given_at', includeIfNull: false, fromJson: fromJsonDate, toJson: toJsonDate)
           required this.date,
       @JsonKey(name: 'msg', includeIfNull: false)
-          this.text});
+          this.text,
+      this.giver});
 
   factory _$_FeedbackModel.fromJson(Map<String, dynamic> json) =>
       _$$_FeedbackModelFromJson(json);
@@ -163,10 +177,12 @@ class _$_FeedbackModel implements _FeedbackModel {
   @override
   @JsonKey(name: 'msg', includeIfNull: false)
   final String? text;
+  @override
+  final String? giver;
 
   @override
   String toString() {
-    return 'FeedbackModel(feedbackType: $feedbackType, date: $date, text: $text)';
+    return 'FeedbackModel(feedbackType: $feedbackType, date: $date, text: $text, giver: $giver)';
   }
 
   @override
@@ -177,12 +193,13 @@ class _$_FeedbackModel implements _FeedbackModel {
             (identical(other.feedbackType, feedbackType) ||
                 other.feedbackType == feedbackType) &&
             (identical(other.date, date) || other.date == date) &&
-            (identical(other.text, text) || other.text == text));
+            (identical(other.text, text) || other.text == text) &&
+            (identical(other.giver, giver) || other.giver == giver));
   }
 
   @JsonKey(ignore: true)
   @override
-  int get hashCode => Object.hash(runtimeType, feedbackType, date, text);
+  int get hashCode => Object.hash(runtimeType, feedbackType, date, text, giver);
 
   @JsonKey(ignore: true)
   @override
@@ -205,7 +222,8 @@ abstract class _FeedbackModel implements FeedbackModel {
       @JsonKey(name: 'given_at', includeIfNull: false, fromJson: fromJsonDate, toJson: toJsonDate)
           required final DateTime date,
       @JsonKey(name: 'msg', includeIfNull: false)
-          final String? text}) = _$_FeedbackModel;
+          final String? text,
+      final String? giver}) = _$_FeedbackModel;
 
   factory _FeedbackModel.fromJson(Map<String, dynamic> json) =
       _$_FeedbackModel.fromJson;
@@ -224,6 +242,8 @@ abstract class _FeedbackModel implements FeedbackModel {
   @JsonKey(name: 'msg', includeIfNull: false)
   String? get text;
   @override
+  String? get giver;
+  @override
   @JsonKey(ignore: true)
   _$$_FeedbackModelCopyWith<_$_FeedbackModel> get copyWith =>
       throw _privateConstructorUsedError;

diff --git a/lib/features/account/data/models/feedback_model.g.dart b/lib/features/account/data/models/feedback_model.g.dart