Fix conflicts with main [skip ci]
OmarHatem committed
Dec 9, 2022 at 20:36 UTC
87e72eabdf15196e7605ed1c15ce2b8975fe85bf
1 file changed
+11
-1
lib/store/settings_store.dart
+11
-1
@@ -364,7 +364,17 @@ abstract class SettingsStoreBase with Store {
364
priority[WalletType.bitcoin] = bitcoin?.deserializeBitcoinTransactionPriority(
365
sharedPreferences.getInt(PreferencesKey.moneroTransactionPriority)!) ??
366
priority[WalletType.bitcoin]!;
367
- // TODO: Add litecoin and haven after CW-118 is merged
367
+
368
+ if (sharedPreferences.getInt(PreferencesKey.havenTransactionPriority) != null) {
369
+ priority[WalletType.haven] = monero?.deserializeMoneroTransactionPriority(
370
+ raw: sharedPreferences.getInt(PreferencesKey.havenTransactionPriority)!) ??
371
+ priority[WalletType.haven]!;
372
+ }
373
+ if (sharedPreferences.getInt(PreferencesKey.litecoinTransactionPriority) != null) {
374
+ priority[WalletType.litecoin] = bitcoin?.deserializeLitecoinTransactionPriority(
375
+ sharedPreferences.getInt(PreferencesKey.litecoinTransactionPriority)!) ??
376
+ priority[WalletType.litecoin]!;
377
+ }
378
379
balanceDisplayMode = BalanceDisplayMode.deserialize(
380
raw: sharedPreferences