use the updated sarafu-api that removes the publicKey from the GetPoolSwappableVouchers

Reviewed-on: #76

.env.example

@@ -21,3 +21,11 @@ LANGUAGES=eng, swa
 
 #Alias search domains
 ALIAS_SEARCH_DOMAINS=sarafu.local, sarafu.eth
+
+#Pool swap
+DEFAULT_POOL_NAME="Kenya ROLA Pool"
+DEFAULT_POOL_SYMBOL=ROLA
+DEFAULT_POOL_CONTRACT_ADDRESS=0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e
+DEFAULT_LIMITER_ADDRESS=
+DEFAULT_VOUCHER_REGISTRY=
+INCLUDE_STABLES_PARAM=false

config/config.go

@@ -25,7 +25,7 @@ const (
 	defaultSSHHost  string = "127.0.0.1"
 	defaultSSHPort  uint   = 7122
 	defaultHTTPHost string = "127.0.0.1"
-	defaultHTTPPort uint     = 7123
+	defaultHTTPPort uint   = 7123
 	defaultDomain          = "sarafu.local"
 )
 
@@ -52,7 +52,6 @@ func SearchDomains() []string {
 	return ParsedDomains
 }
 
-
 func Language() string {
 	return viseconfig.DefaultLanguage
 }
@@ -76,3 +75,15 @@ func PortSSH() uint {
 func ATEndpoint() string {
 	return env.GetEnv("AT_ENDPOINT", "/")
 }
+
+func DefaultPoolAddress() string {
+	return env.GetEnv("DEFAULT_POOL_CONTRACT_ADDRESS", "")
+}
+
+func DefaultPoolName() string {
+	return env.GetEnv("DEFAULT_POOL_NAME", "")
+}
+
+func DefaultPoolSymbol() string {
+	return env.GetEnv("DEFAULT_POOL_SYMBOL", "")
+}

go.mod

@@ -5,7 +5,7 @@ go 1.23.4
 require (
 	git.defalsify.org/vise.git v0.3.2-0.20250507172020-cb22240f1cb9
 	git.grassecon.net/grassrootseconomics/common v0.9.0-beta.1.0.20250417111317-2953f4c2f32e
-	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1
+	git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521124206-343d30a2f27c
 	git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306
 	git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694
 	github.com/alecthomas/assert/v2 v2.2.2

go.sum

@@ -12,6 +12,10 @@ git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517113706-
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517113706-ee434dba6980/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1 h1:0hvILlGkZnXO8o7nZth4xu77vAS4zVQ6Ae0rb5x/Idg=
 git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250517114512-050998ff82b1/go.mod h1:K/TPgZ4OhPHBQq2X0ab3JZs4YjiexzSURZcfHLs9Pf4=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30 h1:iZVmR/4xSoxahtkMBXs/z1HUSSnr+x1m+9AxXIgTvb0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250520125035-81fbc2574c30/go.mod h1:R7+mt27mhm4/LCutAHHv87pOsLxXEPO93KXnhP8H6W0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521124206-343d30a2f27c h1:c2cA5hcYnLgs7kR4fF5tp42W6VQClTukbfKoaeskZu0=
+git.grassecon.net/grassrootseconomics/sarafu-api v0.9.0-beta.1.0.20250521124206-343d30a2f27c/go.mod h1:R7+mt27mhm4/LCutAHHv87pOsLxXEPO93KXnhP8H6W0=
 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306 h1:Jo+yWysWw/N5BJQtAyEMN8ePVvAyPHv+JG4lQti+1N4=
 git.grassecon.net/grassrootseconomics/visedriver v0.9.0-beta.2.0.20250408094335-e2d1f65bb306/go.mod h1:FdLwYtzsjOIcDiW4uDgDYnB4Wdzq12uJUe0QHSSPbSo=
 git.grassecon.net/grassrootseconomics/visedriver-africastalking v0.0.0-20250129070628-5a539172c694 h1:DjJlBSz0S13acft5XZDWk7ZYnzElym0xLMYEVgyNJ+E=

handlers/application/menuhandler.go

@@ -2707,11 +2707,6 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
 	}
 
 	userStore := h.userdataStore
-	publicKey, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_PUBLIC_KEY)
-	if err != nil {
-		logg.ErrorCtxf(ctx, "failed to read publicKey entry with", "key", storedb.DATA_PUBLIC_KEY, "error", err)
-		return res, err
-	}
 
 	// get the active address and symbol
 	activeAddress, err := userStore.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_ADDRESS)
@@ -2738,9 +2733,9 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
 	}
 
 	defaultPool := dataserviceapi.PoolDetails{
-		PoolName:            "Kenya ROLA Pool",
-		PoolSymbol:          "ROLA",
-		PoolContractAdrress: "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
+		PoolName:            config.DefaultPoolName(),
+		PoolSymbol:          config.DefaultPoolSymbol(),
+		PoolContractAdrress: config.DefaultPoolAddress(),
 		LimiterAddress:      "",
 		VoucherRegistry:     "",
 	}
@@ -2762,19 +2757,22 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
 		return res, err
 	}
 
+	logg.InfoCtxf(ctx, "CheckTokenInPool", "response", r, "active_pool_address", activePoolAddress, "address", activeAddress)
+
 	if !r.CanSwapFrom {
 		res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
 		res.Content = l.Get(
-			"%s is not in the KENYA ROLA POOL. Please update your voucher and try again.",
+			"%s is not in %s. Please update your voucher and try again.",
 			activeSym,
+			config.DefaultPoolName(),
 		)
 		return res, nil
 	}
 
 	res.FlagReset = append(res.FlagReset, flag_incorrect_voucher)
 
-	// call the api using the activePoolAddress and publicKey to get a list of SwapToSymbolsData
-	swapToList, err := h.accountService.GetPoolSwappableVouchers(ctx, string(activePoolAddress), string(publicKey))
+	// call the api using the activePoolAddress to get a list of SwapToSymbolsData
+	swapToList, err := h.accountService.GetPoolSwappableVouchers(ctx, string(activePoolAddress))
 	if err != nil {
 		res.FlagSet = append(res.FlagSet, flag_api_error)
 		logg.ErrorCtxf(ctx, "failed on FetchTransactions", "error", err)

services/registration/locale/swa/default.po

@@ -37,5 +37,5 @@ msgstr "Ombi lako limetumwa. Utapokea SMS wakati %s %s yako itakapobadilishwa ku
 msgid "%s balance: %s\n"
 msgstr "%s salio: %s\n"
 
-msgid "%s is not in the KENYA ROLA POOL. Please update your voucher and try again."
-msgstr "%s haipo kwenye BWAWA LA KENYA ROLA. Tafadhali badilisha sarafu yako na ujaribu tena."
+msgid "%s is not in %s. Please update your voucher and try again."
+msgstr "%s haipo kwenye %s. Tafadhali badilisha sarafu yako na ujaribu tena."