grassrootseconomics/sarafu-vise
8
0
Fork 0
Code Issues 15 Pull Requests 2 Actions 2 Packages Projects Releases Wiki Activity

Merge pull request 'default-env-pool' (#76) from default-env-pool into master
Some checks failed
release / docker (push) Has been cancelled
Details

Browse Source 
Reviewed-on: #76
This commit is contained in:
Alfred Kamanda 2025-05-20 12:18:30 +02:00
commit 1d23a0cc4b
4 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.env.example
View File

@ -21,3 +21,10 @@ LANGUAGES=eng, swa
#Alias search domains #Alias search domains
ALIAS_SEARCH_DOMAINS=sarafu.local, sarafu.eth 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=

15
config/config.go
View File

@ -25,7 +25,7 @@ const (
defaultSSHHost string = "127.0.0.1" defaultSSHHost string = "127.0.0.1"
defaultSSHPort uint = 7122 defaultSSHPort uint = 7122
defaultHTTPHost string = "127.0.0.1" defaultHTTPHost string = "127.0.0.1"
defaultHTTPPort uint = 7123 defaultHTTPPort uint = 7123
defaultDomain = "sarafu.local" defaultDomain = "sarafu.local"
) )
@ -52,7 +52,6 @@ func SearchDomains() []string {
return ParsedDomains return ParsedDomains
} }
func Language() string { func Language() string {
return viseconfig.DefaultLanguage return viseconfig.DefaultLanguage
} }
@ -76,3 +75,15 @@ func PortSSH() uint {
func ATEndpoint() string { func ATEndpoint() string {
return env.GetEnv("AT_ENDPOINT", "/") 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", "")
}

9
handlers/application/menuhandler.go
View File

@ -2738,9 +2738,9 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
} }
defaultPool := dataserviceapi.PoolDetails{ defaultPool := dataserviceapi.PoolDetails{
PoolName: "Kenya ROLA Pool", PoolName: config.DefaultPoolName(),
PoolSymbol: "ROLA", PoolSymbol: config.DefaultPoolSymbol(),
PoolContractAdrress: "0x48a953cA5cf5298bc6f6Af3C608351f537AAcb9e", PoolContractAdrress: config.DefaultPoolAddress(),
LimiterAddress: "", LimiterAddress: "",
VoucherRegistry: "", VoucherRegistry: "",
} }
@ -2765,8 +2765,9 @@ func (h *MenuHandlers) LoadSwapToList(ctx context.Context, sym string, input []b
if !r.CanSwapFrom { if !r.CanSwapFrom {
res.FlagSet = append(res.FlagSet, flag_incorrect_voucher) res.FlagSet = append(res.FlagSet, flag_incorrect_voucher)
res.Content = l.Get( 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, activeSym,
config.DefaultPoolName(),
) )
return res, nil return res, nil
} }

4
services/registration/locale/swa/default.po
View File

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