Skip to content

Commit 0c6cef7

Browse files
authored
fix: total migration balance (#97)
1 parent 68af75c commit 0c6cef7

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

packages/shared/lib/migration.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1357,6 +1357,7 @@ export const resetMigrationState = (): void => {
13571357
migrationAddress.set(null)
13581358
accounts.set([])
13591359
migrationLog.set([])
1360+
totalMigratedBalance.set(0)
13601361
}
13611362

13621363
/**
@@ -1424,7 +1425,7 @@ export const hasMigratedAndConfirmedSomeSelectedBundles = derived(get(migration)
14241425
/**
14251426
* Total migration balance
14261427
*/
1427-
export const totalMigratedBalance = derived(get(migration).data, (data) => data.balance)
1428+
export const totalMigratedBalance = writable<number>(0)
14281429

14291430
/**
14301431
* Determines if all spent addresses have low (less than MINIMUM MIGRATION) balance

packages/shared/routes/setup/migrate/views/Migrate.svelte

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
migrationLog,
1818
prepareMigrationLog,
1919
sendOffLedgerMigrationRequest,
20+
totalMigratedBalance,
2021
unselectedInputs,
2122
} from 'shared/lib/migration'
2223
import { showAppNotification } from 'shared/lib/notifications'
@@ -100,6 +101,7 @@
100101
requestId: receipt?.request?.requestId || '',
101102
}))
102103
)
104+
totalMigratedBalance.set(migratableBalance)
103105
loading = false
104106
if ($newProfile) {
105107
// Save profile
@@ -139,6 +141,7 @@
139141
requestId: receipt?.request?.requestId || '',
140142
}))
141143
)
144+
totalMigratedBalance.set(migratableBalance)
142145
loading = false
143146
if ($newProfile) {
144147
// Save profile

packages/shared/routes/setup/migrate/views/TransferFragmentedFunds.svelte

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
migrationLog,
2424
prepareMigrationLog,
2525
sendOffLedgerMigrationRequest,
26+
totalMigratedBalance,
2627
unmigratedBundles,
2728
} from 'shared/lib/migration'
2829
import { closePopup, popupState } from 'shared/lib/popup'
@@ -242,6 +243,7 @@
242243
requestId: receipt?.request?.requestId || '',
243244
}),
244245
])
246+
totalMigratedBalance.update((value) => (value += transaction.balance))
245247
246248
if (!hasBroadcastAnyBundle) {
247249
hasBroadcastAnyBundle = true
@@ -266,6 +268,7 @@
266268
}),
267269
])
268270
// todo: handle receipt data
271+
totalMigratedBalance.update((value) => (value += transaction.balance))
269272
// is this needed?
270273
if (!hasBroadcastAnyBundle) {
271274
hasBroadcastAnyBundle = true

0 commit comments

Comments
 (0)