update logic load proposal and fix loading on transaction page

JustinBeBoy · May 10, 2024 · 14b7a26 · 14b7a26
1 parent e507ac0
commit 14b7a26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/libwallet/internal/politeia/politeia_sync.go b/libwallet/internal/politeia/politeia_sync.go
@@ -451,10 +451,6 @@ func (p *Politeia) ProposalVoteDetailsRaw(ctx context.Context, wallet *wallet.Wa
 		hashes = append(hashes, hash)
 	}
 
-	if err != nil {
-		return nil, err
-	}
-
 	ticketHashes, addresses, err := wallet.CommittedTickets(ctx, hashes)
 	if err != nil {
 		return nil, err

diff --git a/ui/page/components/items_scroll.go b/ui/page/components/items_scroll.go
@@ -98,7 +98,7 @@ func (s *Scroll[T]) FetchScrollData(isScrollUp bool, window app.WindowNavigator,
 		s.cacheData = nil
 	}
 	s.mu.Unlock()
-	if s.data == nil {
+	if s.data == nil || len(s.data.items) == 0 {
 		s.fetchScrollData(isScrollUp, window)
 	}
 }
@@ -118,7 +118,6 @@ func (s *Scroll[T]) fetchScrollData(isScrollUp bool, window app.WindowNavigator)
 	if s.isLoadingItems || s.queryFunc == nil {
 		return
 	}
-
 	s.mu.Lock()
 	tempSize := s.pageSize
 	// Scroll up and down without load more
@@ -177,6 +176,9 @@ func (s *Scroll[T]) fetchScrollData(isScrollUp bool, window app.WindowNavigator)
 	items, _, _, err := s.queryFunc(s.offset, tempSize)
 	if len(items) <= 0 {
 		s.isLoadingItems = false
+		if s.itemsCount == -1 {
+			s.itemsCount = 0
+		}
 		return
 	}