status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(wallet) fix GetMultiTransactions for to_amount nil 

Updates status-desktop #11233
This commit is contained in:
Stefan 2023-07-04 14:53:26 +01:00 committed by Stefan Dunca
parent 293fa9d248
commit 3b0f4ee2c1
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/wallet/activity/activity_test.go
View File

@ -838,7 +838,7 @@ func TestGetActivityEntriesCheckToAndFrom(t *testing.T) {
deps, close := setupTestActivityDB(t)
defer close()
// Adds 6 transactions from which 4 are filered out
// Adds 6 transactions from which 4 are filtered out
td, _, _ := fillTestData(t, deps.db)
// Add extra transactions to test To address

25
services/wallet/transfer/transaction.go
View File

@ -381,16 +381,15 @@ func (tm *TransactionManager) GetMultiTransactions(ctx context.Context, ids []Mu
var multiTransactions []*MultiTransaction
for rows.Next() {
multiTransaction := &MultiTransaction{}
var fromAmount string
var toAmount string
var fromAmountDB, toAmountDB sql.NullString
err := rows.Scan(
&multiTransaction.ID,
&multiTransaction.FromAddress,
&multiTransaction.FromAsset,
&fromAmount,
&fromAmountDB,
&multiTransaction.ToAddress,
&multiTransaction.ToAsset,
&toAmount,
&toAmountDB,
&multiTransaction.Type,
&multiTransaction.Timestamp,
)
@ -398,16 +397,18 @@ func (tm *TransactionManager) GetMultiTransactions(ctx context.Context, ids []Mu
return nil, err
}
multiTransaction.FromAmount = new(hexutil.Big)
_, ok := (*big.Int)(multiTransaction.FromAmount).SetString(fromAmount, 0)
if !ok {
return nil, errors.New("failed to convert fromAmount to big.Int: " + fromAmount)
if fromAmountDB.Valid {
multiTransaction.FromAmount = new(hexutil.Big)
if _, ok := (*big.Int)(multiTransaction.FromAmount).SetString(fromAmountDB.String, 0); !ok {
return nil, errors.New("failed to convert fromAmountDB.String to big.Int: " + fromAmountDB.String)
}
}
multiTransaction.ToAmount = new(hexutil.Big)
_, ok = (*big.Int)(multiTransaction.ToAmount).SetString(toAmount, 0)
if !ok {
return nil, errors.New("failed to convert toAmount to big.Int: " + toAmount)
if toAmountDB.Valid {
multiTransaction.ToAmount = new(hexutil.Big)
if _, ok := (*big.Int)(multiTransaction.ToAmount).SetString(toAmountDB.String, 0); !ok {
return nil, errors.New("failed to convert fromAmountDB.String to big.Int: " + toAmountDB.String)
}
}
multiTransactions = append(multiTransactions, multiTransaction)