Fix loading bugs

Author: dyng

internal/view/account.go

@@ -54,6 +54,10 @@ func (a *Account) SetAccount(account *serv.Account) {
 	// change current account
 	a.account = account
 
+	// set base account
+	base := a.account.GetAddress()
+	a.transactionList.SetBaseAccount(&base)
+
 	// populate contract field if account is a contract
 	if account.IsContract() {
 		contract, err := account.AsContract()
@@ -186,10 +190,6 @@ func (a *Account) refresh() {
 		log.Error("Failed to fetch account balance", "account", addr, "error", err)
 	}
 
-	// set base account
-	base := a.account.GetAddress()
-	a.transactionList.SetBaseAccount(&base)
-
 	// update transaction history asynchronously
 	a.transactionList.LoadAsync(a.account.GetTransactions)
 }

internal/view/method_call.go

@@ -252,9 +252,6 @@ func (d *MethodCallDialog) methodHasNoArg() bool {
 }
 
 func (d *MethodCallDialog) callMethod() {
-	// start calling
-	d.spinner.StartAndShow()
-
 	methodName := d.methodSelected()
 	method := d.contract.GetABI().Methods[methodName]
 
@@ -270,7 +267,6 @@ func (d *MethodCallDialog) callMethod() {
 			log.Error("Cannot unpack argument", "argument", arg, "input", item.GetText(), "error", err)
 			d.app.root.NotifyError(format.FineErrorMessage(
 				"Input type for argument '%s' is incorrect, should be '%s'.", arg.Name, arg.Type.String(), err))
-			d.spinner.StopAndHide()
 			return
 		}
 	}
@@ -281,13 +277,15 @@ func (d *MethodCallDialog) callMethod() {
 		signer = d.app.root.signer.GetSigner()
 		if signer == nil {
 			d.app.root.NotifyError(format.FineErrorMessage("Cannot call a non-constant method without a signer. Please signin at first."))
-			d.spinner.StopAndHide()
 			return
 		}
 	}
 
 	log.Info("Invoke contract method", "contract", d.contract.GetAddress(), "method", methodName, "args", args)
 
+	// start spinner
+	d.spinner.StartAndShow()
+
 	go func() {
 		var res []any
 		var err error
@@ -302,15 +300,15 @@ func (d *MethodCallDialog) callMethod() {
 		}
 
 		d.app.QueueUpdateDraw(func() {
+			// stop spinner
+			d.spinner.StopAndHide()
+
 			if err != nil {
 				log.Error("Method call is failed", "name", methodName, "args", args, "error", err)
 				d.app.root.NotifyError(format.FineErrorMessage("Cannot call contract method '%s'.", methodName, err))
 			} else {
 				d.result.SetText(fmt.Sprint(res...))
 			}
-
-			// calling finished
-			d.spinner.StopAndHide()
 		})
 	}()
 }

internal/view/query.go

@@ -49,7 +49,7 @@ func (d *QueryDialog) initLayout() {
 func (d *QueryDialog) handleKey(key tcell.Key) {
 	switch key {
 	case tcell.KeyEnter:
-		// start account query
+		// start spinner
 		d.setSpinnerRect()
 		d.spinner.StartAndShow()
 
@@ -58,6 +58,7 @@ func (d *QueryDialog) handleKey(key tcell.Key) {
 			if address != "" {
 				account, err := d.app.service.GetAccount(address)
 				d.app.QueueUpdateDraw(func() {
+					// stop spinner
 					d.spinner.StopAndHide()
 					d.Hide()
 

internal/view/transactions.go

@@ -81,7 +81,6 @@ func (t *TransactionList) SetBaseAccount(account *common.Address) {
 
 func (t *TransactionList) FilterAndPrependTransactions(txns common.Transactions) {
 	if t.base == nil {
-		t.PrependTransactions(txns)
 		return
 	}
 
@@ -114,16 +113,18 @@ func (t *TransactionList) LoadAsync(loader func() (common.Transactions, error))
 	// clear current content
 	t.Clear()
 
-	// display loader
+	// start loading animation
 	t.loader.Start()
 	t.loader.Display(true)
 
 	load := func() {
 		txns, err := loader()
 		t.app.QueueUpdateDraw(func() {
+			// stop loading animation
+			t.loader.Stop()
+			t.loader.Display(false)
+
 			if err == nil {
-				t.loader.Stop()
-				t.loader.Display(false)
 				if txns != nil {
 					t.SetTransactions(txns)
 				}