improve sort of assets

internal/handler/wallet/get_all_assets.go

@@ -53,21 +53,28 @@ func (g *getAllAssets) Handle(params operations.GetAllAssetsParams) middleware.R
 
 	assetsWithBalance = append(assetsWithBalance, userAssetData...)
 
-	// sort AssetsWithBalance by name
 	sort.Slice(assetsWithBalance, func(i, j int) bool {
 		if assetsWithBalance[i].AssetInfo.Symbol == "MAS" {
 			return true
 		}
 		if assetsWithBalance[j].AssetInfo.Symbol == "MAS" {
 			return false
 		}
-		if assetsWithBalance[i].DollarValue == nil {
-			return false
+
+		valueI := assetsWithBalance[i].DollarValue
+		valueJ := assetsWithBalance[j].DollarValue
+
+		if (valueI == nil || *valueI == 0) && (valueJ == nil || *valueJ == 0) {
+			return assetsWithBalance[i].AssetInfo.Symbol < assetsWithBalance[j].AssetInfo.Symbol
 		}
-		if assetsWithBalance[j].DollarValue == nil {
+		if valueI == nil || *valueI == 0 {
 			return false
 		}
-		return *assetsWithBalance[i].DollarValue > *assetsWithBalance[j].DollarValue
+		if valueJ == nil || *valueJ == 0 {
+			return true
+		}
+
+		return *valueI > *valueJ
 	})
 
 	// Return the list of assets with balance