Rename applyFees to isFeesApplicable

Update. dependencies to latest.
breez · Aug 9, 2023 · 94b774d · 94b774d
1 parent bf6779d
commit 94b774d
Show file tree

Hide file tree

Showing 6 changed files with 64 additions and 60 deletions.
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -1,6 +1,8 @@
 PODS:
-  - breez_sdk (0.0.1):
+  - breez_sdk (0.1.3):
+    - breez_sdkFFI (= 0.1.3)
     - Flutter
+  - breez_sdkFFI (0.1.3)
   - clipboard_watcher (0.0.1):
     - Flutter
   - connectivity_plus (0.0.1):
@@ -29,11 +31,11 @@ PODS:
     - FirebaseCoreInternal (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/Logger (~> 7.8)
-  - FirebaseCoreInternal (10.12.0):
+  - FirebaseCoreInternal (10.13.0):
     - "GoogleUtilities/NSData+zlib (~> 7.8)"
   - FirebaseDynamicLinks (10.12.0):
     - FirebaseCore (~> 10.0)
-  - FirebaseInstallations (10.12.0):
+  - FirebaseInstallations (10.13.0):
     - FirebaseCore (~> 10.0)
     - GoogleUtilities/Environment (~> 7.8)
     - GoogleUtilities/UserDefaults (~> 7.8)
@@ -63,7 +65,7 @@ PODS:
     - Flutter
   - flutter_secure_storage (6.0.0):
     - Flutter
-  - GoogleDataTransport (9.2.3):
+  - GoogleDataTransport (9.2.5):
     - GoogleUtilities/Environment (~> 7.7)
     - nanopb (< 2.30910.0, >= 2.30908.0)
     - PromisesObjC (< 3.0, >= 1.2)
@@ -84,22 +86,22 @@ PODS:
     - GoogleToolboxForMac/Defines (= 2.3.2)
     - "GoogleToolboxForMac/NSString+URLArguments (= 2.3.2)"
   - "GoogleToolboxForMac/NSString+URLArguments (2.3.2)"
-  - GoogleUtilities/AppDelegateSwizzler (7.11.4):
+  - GoogleUtilities/AppDelegateSwizzler (7.11.5):
     - GoogleUtilities/Environment
     - GoogleUtilities/Logger
     - GoogleUtilities/Network
-  - GoogleUtilities/Environment (7.11.4):
+  - GoogleUtilities/Environment (7.11.5):
     - PromisesObjC (< 3.0, >= 1.2)
-  - GoogleUtilities/Logger (7.11.4):
+  - GoogleUtilities/Logger (7.11.5):
     - GoogleUtilities/Environment
-  - GoogleUtilities/Network (7.11.4):
+  - GoogleUtilities/Network (7.11.5):
     - GoogleUtilities/Logger
     - "GoogleUtilities/NSData+zlib"
     - GoogleUtilities/Reachability
-  - "GoogleUtilities/NSData+zlib (7.11.4)"
-  - GoogleUtilities/Reachability (7.11.4):
+  - "GoogleUtilities/NSData+zlib (7.11.5)"
+  - GoogleUtilities/Reachability (7.11.5):
     - GoogleUtilities/Logger
-  - GoogleUtilities/UserDefaults (7.11.4):
+  - GoogleUtilities/UserDefaults (7.11.5):
     - GoogleUtilities/Logger
   - GoogleUtilitiesComponents (1.1.0):
     - GoogleUtilities/Logger
@@ -204,6 +206,7 @@ DEPENDENCIES:
 
 SPEC REPOS:
   trunk:
+    - breez_sdkFFI
     - Firebase
     - FirebaseCore
     - FirebaseCoreInternal
@@ -280,28 +283,29 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/workmanager/ios"
 
 SPEC CHECKSUMS:
-  breez_sdk: b771ec4372e4a757a05778e50c65a3da0dff101a
+  breez_sdk: 02ad39b316db6d5b90e27128af8afe5219146512
+  breez_sdkFFI: 945989831ec31233461349d1e000c6044ce94687
   clipboard_watcher: 86fb70421aca6f4944e0591a8292605da7784666
   connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
   Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
   firebase_core: e477125798fc37cd4ab43ca6a8536bf7e0929c00
   firebase_dynamic_links: d85cf455646322fd101c8a5a5942c3d47132fe80
   firebase_messaging: 334d68c3a36b6d4d5cd91e4f42509e0d4ae49828
   FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
-  FirebaseCoreInternal: 950500ad8a08963657f6d8c67b579740c06d6aa1
+  FirebaseCoreInternal: b342e37cd4f5b4454ec34308f073420e7920858e
   FirebaseDynamicLinks: 1a387da899779e5ef34f4d6f8bdba882f90d0e67
-  FirebaseInstallations: 7b99ef103f013624444c614397038219c45f8e63
+  FirebaseInstallations: b28af1b9f997f1a799efe818c94695a3728c352f
   FirebaseMessaging: bb2c4f6422a753038fe137d90ae7c1af57251316
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_fgbg: 31c0d1140a131daea2d342121808f6aa0dcd879d
   flutter_fimber: ec011dfb08d7cbfa16ab6bad8450b99574e6f6a4
   flutter_inappwebview: 4fe74e5e65809c3d363febfd9e2b21aa79bb0f1c
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
-  GoogleDataTransport: f0308f5905a745f94fb91fea9c6cbaf3831cb1bd
+  GoogleDataTransport: 54dee9d48d14580407f8f5fbf2f496e92437a2f2
   GoogleMLKit: 2bd0dc6253c4d4f227aad460f69215a504b2980e
   GoogleToolboxForMac: 8bef7c7c5cf7291c687cf5354f39f9db6399ad34
-  GoogleUtilities: c63691989bf362ba0505507da00eeb326192e83e
+  GoogleUtilities: 13e2c67ede716b8741c7989e26893d151b2b2084
   GoogleUtilitiesComponents: 679b2c881db3b615a2777504623df6122dd20afe
   GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2
   image_cropper: a3291c624a953049bc6a02e1f8c8ceb162a24b25

diff --git a/lib/bloc/account/account_state.dart b/lib/bloc/account/account_state.dart
@@ -104,7 +104,7 @@ class AccountState {
 
   int get reserveAmount => balance - maxAllowedToPay;
 
-  bool get applyFees => maxAllowedToReceive > maxInboundLiquidity;
+  bool get isFeesApplicable => maxAllowedToReceive > maxInboundLiquidity;
 
   // TODO: Add payments toJson
   Map<String, dynamic>? toJson() {

diff --git a/lib/routes/subswap/swap/widgets/deposit_widget.dart b/lib/routes/subswap/swap/widgets/deposit_widget.dart
@@ -97,7 +97,7 @@ class _DepositWidgetState extends State<DepositWidget> {
     final setUpFee = (openingFeeParams.proportional / 10000).toString();
     final liquidity = currencyState.bitcoinCurrency.format(accountState.maxInboundLiquidity);
     final liquidityAboveZero = accountState.maxInboundLiquidity > 0;
-    final showFeeMessage = accountState.applyFees;
+    final showFeeMessage = accountState.isFeesApplicable;
 
     if (!showFeeMessage) {
       // Send more than {minSats} and up to {maxSats} to this address. This address can be used only once.

diff --git a/lib/widgets/receivable_btc_box.dart b/lib/widgets/receivable_btc_box.dart
@@ -55,7 +55,7 @@ class ReceivableBTCBoxState extends State<ReceivableBTCBox> {
               maxLines: 1,
               minFontSize: MinFontSize(context).minFontSize,
             ),
-            accountState.applyFees ? FeeMessage() : const SizedBox(),
+            accountState.isFeesApplicable ? FeeMessage() : const SizedBox(),
           ],
         ),
       ),

diff --git a/pubspec.lock b/pubspec.lock
@@ -237,10 +237,10 @@ packages:
     dependency: "direct main"
     description:
       name: connectivity_plus
-      sha256: "8599ae9edca5ff96163fca3e36f8e481ea917d1e71cdad912c084b5579913f34"
+      sha256: "77a180d6938f78ca7d2382d2240eb626c0f6a735d0bfdce227d8ffb80f95c48b"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.1"
+    version: "4.0.2"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -829,10 +829,10 @@ packages:
     dependency: "direct main"
     description:
       name: image_picker
-      sha256: "6296e98782726d37f59663f0727d0e978eee1ced1ffed45ccaba591786a7f7b3"
+      sha256: "841837258e0b42c80946c43443054fc726f5e8aa84a97f363eb9ef0d45b33c14"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   image_picker_android:
     dependency: transitive
     description:
@@ -845,10 +845,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_for_web
-      sha256: "869fe8a64771b7afbc99fc433a5f7be2fea4d1cb3d7c11a48b6b579eb9c797f0"
+      sha256: "8b6c160cdbe572199103a091c783685b236110e4a0fd7a4947f32ff5b7da8765"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.0"
+    version: "3.0.0"
   image_picker_ios:
     dependency: transitive
     description:
@@ -1026,10 +1026,10 @@ packages:
     dependency: "direct main"
     description:
       name: mobile_scanner
-      sha256: "54dd914e1bb5758b3db7aa02e56d65d80285ba0705e0e5fa5cfbb11e27344c4b"
+      sha256: "2fbc3914fe625e196c64ea8ffc4084cd36781d2be276d4d5923b11af3b5d44ff"
       url: "https://pub.dev"
     source: hosted
-    version: "3.3.0"
+    version: "3.4.1"
   mockito:
     dependency: "direct main"
     description:
@@ -1074,10 +1074,10 @@ packages:
     dependency: "direct main"
     description:
       name: package_info_plus
-      sha256: ceb027f6bc6a60674a233b4a90a7658af1aebdea833da0b5b53c1e9821a78c7b
+      sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a"
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.2"
+    version: "4.1.0"
   package_info_plus_platform_interface:
     dependency: transitive
     description:
@@ -1106,50 +1106,50 @@ packages:
     dependency: "direct main"
     description:
       name: path_provider
-      sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2"
+      sha256: "909b84830485dbcd0308edf6f7368bc8fd76afa26a270420f34cabea2a6467a0"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.15"
+    version: "2.1.0"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "2cec049d282c7f13c594b4a73976b0b4f2d7a1838a6dd5aaf7bd9719196bee86"
+      sha256: "5d44fc3314d969b84816b569070d7ace0f1dea04bd94a83f74c4829615d22ad8"
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.27"
+    version: "2.1.0"
   path_provider_foundation:
     dependency: transitive
     description:
       name: path_provider_foundation
-      sha256: "916731ccbdce44d545414dd9961f26ba5fbaa74bcbb55237d8e65a623a8c7297"
+      sha256: "1b744d3d774e5a879bb76d6cd1ecee2ba2c6960c03b1020cd35212f6aa267ac5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.4"
+    version: "2.3.0"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      sha256: ffbb8cc9ed2c9ec0e4b7a541e56fd79b138e8f47d2fb86815f15358a349b3b57
+      sha256: ba2b77f0c52a33db09fc8caf85b12df691bf28d983e84cf87ff6d693cfa007b3
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.11"
+    version: "2.2.0"
   path_provider_platform_interface:
     dependency: "direct main"
     description:
       name: path_provider_platform_interface
-      sha256: "57585299a729335f1298b43245842678cb9f43a6310351b18fb577d6e33165ec"
+      sha256: bced5679c7df11190e1ddc35f3222c858f328fff85c3942e46e7f5589bf9eb84
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.6"
+    version: "2.1.0"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      sha256: "1cb68ba4cd3a795033de62ba1b7b4564dace301f952de6bfb3cd91b202b6ee96"
+      sha256: ee0e0d164516b90ae1f970bdf29f726f1aa730d7cfc449ecc74c495378b705da
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.7"
+    version: "2.2.0"
   petitparser:
     dependency: transitive
     description:
@@ -1258,18 +1258,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: ed3fcea4f789ed95913328e629c0c53e69e80e08b6c24542f1b3576046c614e8
+      sha256: "6cec740fa0943a826951223e76218df002804adb588235a8910dc3d6b0654e11"
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.2"
+    version: "7.1.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: "0c6e61471bd71b04a138b8b588fa388e66d8b005e6f2deda63371c5c505a0981"
+      sha256: "357412af4178d8e11d14f41723f80f12caea54cf0d5cd29af9dcdab85d58aea7"
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.1"
+    version: "3.3.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1744,10 +1744,10 @@ packages:
     dependency: transitive
     description:
       name: xdg_directories
-      sha256: e0b1147eec179d3911f1f19b59206448f78195ca1d20514134e10641b7d7fbff
+      sha256: f0c26453a2d47aa4c2570c6a033246a3fc62da2fe23c7ffdd0a7495086dc0247
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.1"
+    version: "1.0.2"
   xml:
     dependency: transitive
     description:

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -25,22 +25,22 @@ dependencies:
       url: https://github.com/breez/Breez-Translations
       ref: 077a94046e0b7ff9bd1aff225616541dea0ba208
   clipboard_watcher: ^0.2.0
-  connectivity_plus: ^4.0.1
+  connectivity_plus: ^4.0.2
   drag_and_drop_lists: ^0.3.3
   duration: ^3.0.13
   email_validator: ^2.1.17
   extended_image: <8.0.0 # Requires Flutter 3.10
-  ffi: ^2.0.2
+  ffi: <2.1.0 # Requires Flutter 3.10
   fimber: ^0.7.0
   fimber_io: ^0.7.0
   # Doesn't support: Linux Mac Windows
   flutter_fimber: ^0.7.1
   # Doesn't support: Linux Windows
-  firebase_core: ^2.14.0
+  firebase_core: ^2.15.0
   # Doesn't support: Linux Mac Windows
-  firebase_dynamic_links: ^5.3.3
+  firebase_dynamic_links: ^5.3.4
   # Doesn't support: Linux Windows
-  firebase_messaging: ^14.6.4
+  firebase_messaging: ^14.6.5
   flutter_bloc: ^8.1.3
   # Doesn't support: Linux Mac Windows
   flutter_fgbg:
@@ -62,7 +62,7 @@ dependencies:
   # Doesn't support: Linux Mac Windows
   image_cropper: <5.0.0 # Requires Flutter 3.10
   # Doesn't support: Linux Mac Windows
-  image_picker: ^1.0.1
+  image_picker: ^1.0.2
   ini: ^2.1.0
   intl: ^0.18.1
   # Doesn't support: Linux Mac
@@ -71,18 +71,18 @@ dependencies:
   local_auth_ios: ^1.1.3
   mockito: <5.4.1 # flutter_test requirement
   # Doesn't support: Linux Windows
-  mobile_scanner: ^3.3.0
-  package_info_plus: ^4.0.2
+  mobile_scanner: ^3.4.1
+  package_info_plus: ^4.1.0
   path: ^1.8.3
-  path_provider: ^2.0.15
-  path_provider_platform_interface: ^2.0.6
-  plugin_platform_interface: ^2.1.4
+  path_provider: ^2.1.0
+  path_provider_platform_interface: ^2.1.0
+  plugin_platform_interface: ^2.1.5
   qr_flutter: ^4.1.0
   rxdart: ^0.27.7
-  share_plus: ^7.0.2
+  share_plus: ^7.1.0
   shared_preferences: ^2.2.0
   simple_animations: ^5.0.2
-  sqflite_common_ffi: ^2.2.5
+  sqflite_common_ffi: <2.3.0 # Requires Flutter 3.10
   sqlite3_flutter_libs: ^0.5.15
   synchronized: ^3.1.0
   theme_provider: ^0.6.0