CAKE-297 | merged main branch into current

OleksandrSobol committed May 18, 2021 at 19:37 UTC 9ad276622fff62b8a4947f1a28b566c5c416b83b
3 files changed +4 -5
lib/view_model/transaction_details_view_model.dart
-1
@@ -1,5 +1,4 @@
1 import 'package:cake_wallet/bitcoin/electrum_transaction_info.dart';
2 -//import 'package:cake_wallet/bitcoin/bitcoin_transaction_info.dart';
2 import 'package:cake_wallet/core/wallet_base.dart';
3 import 'package:cake_wallet/entities/transaction_info.dart';
4 import 'package:cake_wallet/entities/wallet_type.dart';
pubspec.lock
+3 -3
@@ -70,7 +70,7 @@ packages:
70 path: "."
71 ref: cake
72 resolved-ref: "02fef082f20af13de00b4e64efb93a2c1e5e1cf2"
73 - url: "git@github.com:cake-tech/bech32.git"
73 + url: "https://github.com/cake-tech/bech32.git"
74 source: git
75 version: "0.2.0"
76 bip32:
@@ -92,8 +92,8 @@ packages:
92 description:
93 path: "."
94 ref: cake
95 - resolved-ref: b3ab2926c665f0e68b74a4a5f31059f7fcd817b7
96 - url: "git@github.com:cake-tech/bitcoin_flutter.git"
95 + resolved-ref: cbabfd87b6ce3cae6051a3e86ddb56e7a934e188
96 + url: "https://github.com/cake-tech/bitcoin_flutter.git"
97 source: git
98 version: "2.0.2"
99 boolean_selector:
pubspec.yaml
+1 -1
@@ -67,7 +67,7 @@ dependencies:
67 basic_utils: ^2.0.3
68 bitcoin_flutter:
69 git:
70 - url: git@github.com:cake-tech/bitcoin_flutter.git
70 + url: https://github.com/cake-tech/bitcoin_flutter.git
71 ref: cake
72 get_it: ^6.0.0
73 connectivity: ^3.0.3