Merge remote-tracking branch 'origin/main'

SatoshiPortal · May 17, 2024 · ad79b4f · ad79b4f
2 parents ba46736 + 89953cf
commit ad79b4f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/lib/locator.dart b/lib/locator.dart
@@ -53,7 +53,7 @@ import 'package:flutter_animate/flutter_animate.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
 
-const bbVersion = '0.2.0-8';
+const bbVersion = '0.2.0-9';
 
 GetIt locator = GetIt.instance;
 

diff --git a/lib/receive/bloc/receive_cubit.dart b/lib/receive/bloc/receive_cubit.dart
@@ -247,9 +247,9 @@ class ReceiveCubit extends Cubit<ReceiveState> {
 
     if (state.walletBloc == null) return;
 
-    final (updatedWallet, err) = await _walletAddress.newAddress(
-      state.walletBloc!.state.wallet!,
-    );
+    final wallet = state.walletBloc!.state.wallet!;
+
+    final (updatedWallet, err) = await _walletAddress.newAddress(wallet);
     if (err != null) {
       emit(
         state.copyWith(
@@ -287,10 +287,23 @@ class ReceiveCubit extends Cubit<ReceiveState> {
       emit(state.copyWith(updateAddressGap: addressGap + 1));
       Future.delayed(const Duration(milliseconds: 100));
     }
+    if (wallet.isLiquid())
+      emit(
+        state.copyWith(
+          defaultLiquidAddress: updatedWallet.lastGeneratedAddress,
+        ),
+      );
+    else
+      emit(
+        state.copyWith(
+          defaultAddress: updatedWallet.lastGeneratedAddress,
+        ),
+      );
 
     emit(
       state.copyWith(
         defaultLiquidAddress: updatedWallet.lastGeneratedAddress,
+        defaultAddress: updatedWallet.lastGeneratedAddress,
         privateLabel: '',
         savedDescription: '',
         description: '',

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,7 +1,7 @@
 name: bb_mobile
 description: Bull Bitcoin Mobile Wallet
 publish_to: 'none' 
-version: 0.2.0-8+15
+version: 0.2.0-9+16
 
 environment:
   sdk: ">=3.3.0 <4.0.0"