Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Bitkit/AppScene.swift
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ struct AppScene: View {
.onChange(of: migrations.isShowingMigrationLoading) { isLoading in
if !isLoading {
widgets.loadSavedWidgets()
suggestionsManager.reloadDismissed()
if UserDefaults.standard.bool(forKey: "pinOnLaunch") && settings.pinEnabled {
isPinVerified = false
}
Expand Down
4 changes: 2 additions & 2 deletions Bitkit/Managers/SuggestionsManager.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ final class SuggestionsManager: ObservableObject {
private let userDefaultsKey = "dismissedSuggestions"

init() {
loadDismissed()
reloadDismissed()
}

func dismiss(_ suggestionId: String) {
Expand All @@ -25,7 +25,7 @@ final class SuggestionsManager: ObservableObject {
dismissedIds.contains(suggestionId)
}

private func loadDismissed() {
func reloadDismissed() {
let dismissedArray = UserDefaults.standard.stringArray(forKey: userDefaultsKey) ?? []
dismissedIds = Set(dismissedArray)
}
Expand Down
67 changes: 67 additions & 0 deletions Bitkit/Services/MigrationsService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,10 @@ struct RNWidgets: Codable {
var sortOrder: [String]?
}

struct RNTodos: Codable {
var hide: [String: Int64]?
}

struct RNWidgetsWithOptions {
var widgets: RNWidgets
var widgetOptions: [String: Data] // widget name -> JSON options data
Expand Down Expand Up @@ -678,6 +682,31 @@ extension MigrationsService {
}
}

func extractRNTodos(from mmkvData: [String: String]) -> RNTodos? {
guard let rootJson = mmkvData["persist:root"],
let jsonStart = rootJson.firstIndex(of: "{")
else { return nil }

let jsonString = String(rootJson[jsonStart...])
guard let data = jsonString.data(using: .utf8),
let root = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let todosJson = root["todos"] as? String,
let todosData = todosJson.data(using: .utf8)
else {
return nil
}

do {
let todos = try JSONDecoder().decode(RNTodos.self, from: todosData)
let hideCount = todos.hide?.count ?? 0
Logger.debug("Extracted RN todos: \(hideCount) hidden suggestions", context: "Migration")
return todos
} catch {
Logger.error("Failed to decode RN todos: \(error)", context: "Migration")
return nil
}
}

func extractRNActivities(from mmkvData: [String: String]) -> [RNActivityItem]? {
guard let rootJson = mmkvData["persist:root"],
let jsonStart = rootJson.firstIndex(of: "{")
Expand Down Expand Up @@ -935,6 +964,37 @@ extension MigrationsService {
}
}

func applyRNTodos(_ todos: RNTodos) {
// Map RN todo types to iOS suggestion IDs
let mapping: [String: String] = [
"backupSeedPhrase": "backupSeedPhrase",
"buyBitcoin": "buyBitcoin",
"lightning": "transferToSpending",
"quickpay": "quickpay",
"shop": "shop",
"slashtagsProfile": "profile",
"support": "support",
"invite": "invite",
"pin": "pin",
]

guard let hide = todos.hide else { return }

var dismissedIds: [String] = []
for rnTodoType in hide.keys {
if let iosSuggestionId = mapping[rnTodoType] {
dismissedIds.append(iosSuggestionId)
}
}

if !dismissedIds.isEmpty {
let existing = UserDefaults.standard.stringArray(forKey: "dismissedSuggestions") ?? []
let merged = Array(Set(existing + dismissedIds))
UserDefaults.standard.set(merged, forKey: "dismissedSuggestions")
Logger.info("Migrated \(dismissedIds.count) dismissed suggestions", context: "Migration")
}
}

func applyRNActivities(_ items: [RNActivityItem]) async {
var activities: [Activity] = []
let now = UInt64(Date().timeIntervalSince1970)
Expand Down Expand Up @@ -1060,6 +1120,13 @@ extension MigrationsService {
Logger.debug("No widgets found in MMKV", context: "Migration")
}

if let todos = extractRNTodos(from: mmkvData) {
Logger.info("Migrating todos/dismissed suggestions", context: "Migration")
applyRNTodos(todos)
} else {
Logger.debug("No todos found in MMKV", context: "Migration")
}

UserDefaults.standard.set("", forKey: "onchainAddress")

Logger.info("MMKV data migration completed", context: "Migration")
Expand Down
Loading