Skip to content

Commit 8ece563

Browse files
committed
Merge branch 'feat/shopinbit' into vacay
2 parents 44d8794 + b84cd2a commit 8ece563

14 files changed

Lines changed: 2058 additions & 338 deletions

lib/db/isar/main_db.dart

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ class MainDB {
8181
name: "wallet_data",
8282
maxSizeMiB: Platform.isWindows ? 1024 : 512,
8383
);
84+
85+
// Clear on schema mismatch; tickets are recoverable from the API.
86+
try {
87+
isar.shopInBitTickets.where().findAllSync();
88+
} catch (_) {
89+
await isar.writeTxn(() async => isar.shopInBitTickets.clear());
90+
}
91+
8492
return true;
8593
}
8694

@@ -650,7 +658,11 @@ class MainDB {
650658
// ========== ShopInBit tickets ===============================================
651659

652660
List<ShopInBitTicket> getShopInBitTickets() {
653-
return isar.shopInBitTickets.where().sortByCreatedAtDesc().findAllSync();
661+
try {
662+
return isar.shopInBitTickets.where().sortByCreatedAtDesc().findAllSync();
663+
} catch (_) {
664+
return [];
665+
}
654666
}
655667

656668
Future<int> putShopInBitTicket(ShopInBitTicket ticket) async {

lib/hive_registrar.g.dart

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
// Generated by Hive CE
2+
// Do not modify
3+
// Check in to version control
4+
5+
import 'package:hive_ce/hive.dart';
6+
import 'package:stackwallet/models/exchange/change_now/exchange_transaction_status.dart';
7+
import 'package:stackwallet/models/exchange/response_objects/trade.dart';
8+
import 'package:stackwallet/models/mwcmqs_config_model.dart';
9+
import 'package:stackwallet/models/mwcmqs_server_model.dart';
10+
11+
extension HiveRegistrar on HiveInterface {
12+
void registerAdapters() {
13+
registerAdapter(ExchangeTransactionStatusAdapter());
14+
registerAdapter(MwcMqsConfigModelAdapter());
15+
registerAdapter(MwcMqsServerModelAdapter());
16+
registerAdapter(TradeAdapter());
17+
}
18+
}
19+
20+
extension IsolatedHiveRegistrar on IsolatedHiveInterface {
21+
void registerAdapters() {
22+
registerAdapter(ExchangeTransactionStatusAdapter());
23+
registerAdapter(MwcMqsConfigModelAdapter());
24+
registerAdapter(MwcMqsServerModelAdapter());
25+
registerAdapter(TradeAdapter());
26+
}
27+
}

lib/models/isar/models/shopinbit_ticket.dart

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,16 @@ class ShopInBitTicket {
2929
late List<ShopInBitTicketMessage> messages;
3030
late DateTime createdAt;
3131
late int apiTicketId;
32+
33+
// Car research retry support
34+
String? carResearchInvoiceId;
35+
String? feeTicketNumber;
36+
late bool needsCreateRequest;
37+
38+
// Car research resumable payment state
39+
late bool isPendingPayment;
40+
DateTime? carResearchExpiresAt;
41+
String? carResearchPaymentLinks;
3242
}
3343

3444
@embedded

0 commit comments

Comments
 (0)