Fix: use the correct TokenDetails in the GetPoolSwappableVouchers

dev/api.go

@@ -852,18 +852,17 @@ func (das *DevAccountService) GetPoolSwappableFromVouchers(ctx context.Context,
 	return swapFromList, nil
 }
 
-func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
-	var swapToList []dataserviceapi.TokenHoldings
+func (das *DevAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
+	var swapToList []dataserviceapi.TokenDetails
 	_, ok := das.pools[poolAddress]
 	if !ok {
 		return nil, fmt.Errorf("Invalid pool address: %v", poolAddress)
 	}
 	for _, voucher := range das.vouchers {
-		swapToList = append(swapToList, dataserviceapi.TokenHoldings{
-			ContractAddress: voucher.Address,
-			TokenSymbol:     voucher.Symbol,
-			TokenDecimals:   string(defaultDecimals),
-			Balance:         fmt.Sprintf("%f", defaultVoucherBalance),
+		swapToList = append(swapToList, dataserviceapi.TokenDetails{
+			TokenAddress:  voucher.Address,
+			TokenSymbol:   voucher.Symbol,
+			TokenDecimals: defaultDecimals,
 		})
 	}
 	return swapToList, nil

go.mod

@@ -8,7 +8,7 @@ require (
 	git.grassecon.net/grassrootseconomics/visedriver v0.8.0-beta.10.0.20250122123424-6749c632b0a2
 	github.com/gofrs/uuid v4.4.0+incompatible
 	github.com/grassrootseconomics/eth-custodial v1.3.0-beta
-	github.com/grassrootseconomics/ussd-data-service v1.4.4-beta
+	github.com/grassrootseconomics/ussd-data-service v1.4.7-beta
 	github.com/stretchr/testify v1.9.0
 )
 

go.sum

@@ -22,6 +22,8 @@ github.com/grassrootseconomics/ussd-data-service v1.4.0-beta h1:4fMd/3h2ZIhRg4Gd
 github.com/grassrootseconomics/ussd-data-service v1.4.0-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
 github.com/grassrootseconomics/ussd-data-service v1.4.4-beta h1:turlyo0i3OLj29mWpWNoB/3Qao8qEngT/5d1jDWTZE4=
 github.com/grassrootseconomics/ussd-data-service v1.4.4-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
+github.com/grassrootseconomics/ussd-data-service v1.4.7-beta h1:yAe1YaOBsdxW2m20jnVU4F0kLmFr+mK/gHCWEdHmE90=
+github.com/grassrootseconomics/ussd-data-service v1.4.7-beta/go.mod h1:9sGnorpKaK76FmOGXoh/xv7x5siSFNYdXxQo9BKW4DI=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4 h1:U4kkNYryi/qfbBF8gh7Vsbuz+cVmhf5kt6pE9bYYyLo=
 github.com/graygnuorg/go-gdbm v0.0.0-20220711140707-71387d66dce4/go.mod h1:zpZDgZFzeq9s0MIeB1P50NIEWDFFHSFBohI/NbaTD/Y=
 github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM=

remote/account_service.go

@@ -23,7 +23,7 @@ type AccountService interface {
 	PoolDeposit(ctx context.Context, amount, from, poolAddress, tokenAddress string) (*models.PoolDepositResult, error)
 	FetchTopPools(ctx context.Context) ([]dataserviceapi.PoolDetails, error)
 	GetPoolSwappableFromVouchers(ctx context.Context, poolAddress, publicKey string) ([]dataserviceapi.TokenHoldings, error)
-	GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error)
+	GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error)
 	GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error)
 	PoolSwap(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapResult, error)
 	GetSwapFromTokenMaxLimit(ctx context.Context, poolAddress, fromTokenAddress, toTokenAddress, publicKey string) (*models.MaxLimitResult, error)

remote/http/service.go

@@ -389,7 +389,7 @@ func (as *HTTPAccountService) getPoolSwappableFromVouchers(ctx context.Context,
 	return r.PoolSwappableVouchers, nil
 }
 
-func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
 	svc := dev.NewDevAccountService(ctx, as.SS)
 	if as.UseApi {
 		return as.getPoolSwappableVouchers(ctx, poolAddress)
@@ -398,9 +398,9 @@ func (as *HTTPAccountService) GetPoolSwappableVouchers(ctx context.Context, pool
 	}
 }
 
-func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+func (as HTTPAccountService) getPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
 	var r struct {
-		PoolSwappableVouchers []dataserviceapi.TokenHoldings `json:"filtered"`
+		PoolSwappableVouchers []dataserviceapi.TokenDetails `json:"filtered"`
 	}
 
 	basePath, err := url.JoinPath(config.PoolSwappableVouchersURL, poolAddress, "to")

testutil/mocks/service_mock.go

@@ -86,9 +86,9 @@ func (m MockAccountService) GetPoolSwappableFromVouchers(ctx context.Context, po
 	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
 }
 
-func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
+func (m MockAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
 	args := m.Called(poolAddress)
-	return args.Get(0).([]dataserviceapi.TokenHoldings), args.Error(1)
+	return args.Get(0).([]dataserviceapi.TokenDetails), args.Error(1)
 }
 
 func (m MockAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {

testutil/testservice/account_service.go

@@ -89,8 +89,8 @@ func (m TestAccountService) GetPoolSwappableFromVouchers(ctx context.Context, po
 	return []dataserviceapi.TokenHoldings{}, nil
 }
 
-func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenHoldings, error) {
-	return []dataserviceapi.TokenHoldings{}, nil
+func (m TestAccountService) GetPoolSwappableVouchers(ctx context.Context, poolAddress string) ([]dataserviceapi.TokenDetails, error) {
+	return []dataserviceapi.TokenDetails{}, nil
 }
 
 func (m TestAccountService) GetPoolSwapQuote(ctx context.Context, amount, from, fromTokenAddress, poolAddress, toTokenAddress string) (*models.PoolSwapQuoteResult, error) {