Merge branch 'master' into alfred/pool-swap

.env.example

@@ -21,10 +21,3 @@ 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=

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,6 +52,7 @@ func SearchDomains() []string {
 	return ParsedDomains
 }
 
+
 func Language() string {
 	return viseconfig.DefaultLanguage
 }
@@ -75,15 +76,3 @@ 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", "")
-}

handlers/application/menuhandler.go

@@ -2738,9 +2738,9 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
 	}
 
 	defaultPool := dataserviceapi.PoolDetails{
-		PoolName:            config.DefaultPoolName(),
-		PoolSymbol:          config.DefaultPoolSymbol(),
-		PoolContractAdrress: config.DefaultPoolAddress(),
+		PoolName:            "Kenya ROLA Pool",
+		PoolSymbol:          "ROLA",
+		PoolContractAdrress: "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e",
 		LimiterAddress:      "",
 		VoucherRegistry:     "",
 	}
@@ -2762,14 +2762,11 @@ 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 %s. Please update your voucher and try again.",
+			"%s is not in the KENYA ROLA POOL. Please update your voucher and try again.",
 			activeSym,
-			config.DefaultPoolName(),
 		)
 		return res, nil
 	}

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 %s. Please update your voucher and try again."
-msgstr "%s haipo kwenye %s. Tafadhali badilisha sarafu yako na ujaribu tena."
+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."