update display block for sync info

JustinBeBoy · Mar 11, 2024 · ef45b03 · ef45b03
1 parent 813a59a
commit ef45b03
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/libwallet/assets/dcr/sync.go b/libwallet/assets/dcr/sync.go
@@ -89,8 +89,8 @@ type activeSyncData struct {
 	rescanStartTime int64
 
 	totalInactiveSeconds int64
-	isrescanning         bool
-	isAddDiscovering     bool
+	isRescanning         bool
+	isAddressDiscovery   bool
 }
 
 const (
@@ -388,7 +388,7 @@ func (asset *Asset) IsAddressDiscovering() bool {
 	defer asset.syncData.mu.RUnlock()
 
 	if asset.syncData != nil && asset.syncData.syncing {
-		return asset.syncData.isAddDiscovering
+		return asset.syncData.isAddressDiscovery
 	}
 
 	return false
@@ -399,7 +399,7 @@ func (asset *Asset) IsSycnRescanning() bool {
 	defer asset.syncData.mu.RUnlock()
 
 	if asset.syncData != nil && asset.syncData.syncing {
-		return asset.syncData.isrescanning
+		return asset.syncData.isRescanning
 	}
 
 	return false

diff --git a/libwallet/assets/dcr/syncnotification.go b/libwallet/assets/dcr/syncnotification.go
@@ -294,7 +294,7 @@ func (asset *Asset) discoverAddressesStarted() {
 	}
 
 	asset.syncData.mu.Lock()
-	asset.syncData.isAddDiscovering = true
+	asset.syncData.isAddressDiscovery = true
 	asset.syncData.syncStage = AddressDiscoverySyncStage
 	asset.syncData.addressDiscoveryProgress.AddressDiscoveryStartTime = time.Now().Unix()
 	asset.syncData.addressDiscoveryCompletedOrCanceled = make(chan bool)
@@ -403,7 +403,7 @@ func (asset *Asset) discoverAddressesFinished() {
 		return
 	}
 	asset.syncData.mu.Lock()
-	asset.syncData.isAddDiscovering = false
+	asset.syncData.isAddressDiscovery = false
 	asset.syncData.mu.Unlock()
 
 	asset.stopUpdatingAddressDiscoveryProgress()
@@ -431,7 +431,7 @@ func (asset *Asset) rescanStarted() {
 		return
 	}
 
-	asset.syncData.isrescanning = true
+	asset.syncData.isRescanning = true
 	asset.syncData.syncStage = HeadersRescanSyncStage
 	asset.syncData.rescanStartTime = time.Now().Unix()
 
@@ -521,7 +521,7 @@ func (asset *Asset) rescanFinished() {
 	}
 
 	asset.syncData.mu.Lock()
-	asset.syncData.isrescanning = false
+	asset.syncData.isRescanning = false
 	asset.syncData.headersRescanProgress.TotalTimeRemainingSeconds = 0
 	asset.syncData.headersRescanProgress.TotalSyncProgress = 100
 

diff --git a/ui/page/components/wallet_sync_info.go b/ui/page/components/wallet_sync_info.go
@@ -323,7 +323,13 @@ func (wsi *WalletSyncInfo) syncContent(gtx C, uniform layout.Inset) D {
 							if !isInProgress || (isRescanning && (isBtcORLtcAsset)) {
 								return D{}
 							}
-							blockHeightFetched := values.StringF(values.StrBlockHeaderFetchedCount, bestBlock.Height, wsi.FetchSyncProgress().HeadersToFetchOrScan)
+							header := wsi.FetchSyncProgress().HeadersToFetchOrScan
+							// When progress's state is rescan header is a header of rescan and not fetch
+							// this is a workaround display block for user
+							if header < bestBlock.Height {
+								header = bestBlock.Height
+							}
+							blockHeightFetched := values.StringF(values.StrBlockHeaderFetchedCount, bestBlock.Height, header)
 							return wsi.labelTexSize16Layout(blockHeightFetched, dp8, false)(gtx)
 						}),
 						layout.Rigid(func(gtx C) D {