grassrootseconomics/sarafu-vise
8
0
Fork 0
Code Issues 16 Pull Requests 5 Actions 1 Packages Projects Releases Wiki Activity

ens #32

Merged
lash merged 21 commits from ens into master 2025-03-07 06:00:18 +01:00
Conversation 0 Commits 21 Files Changed 32 +33 -7
1 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3e422f269f - Show all commits

40
handlers/application/menuhandler.go
View File

@ -1441,8 +1441,13 @@ func (h *MenuHandlers) ShowBlockedAccount(ctx context.Context, sym string, input
// CheckBalance retrieves the balance of the active voucher and sets
// the balance as the result content.
func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byte) (resource.Result, error) {
var res resource.Result
var err error
var (
res resource.Result
err error
alias string
content string
)
sessionId, ok := ctx.Value("SessionId").(string)
if !ok {
@ -1455,12 +1460,27 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
store := h.userdataStore
accAlias, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_ALIAS)
if err != nil {
if !db.IsNotFound(err) {
logg.ErrorCtxf(ctx, "failed to read account alias entry with", "key", storedb.DATA_ACCOUNT_ALIAS, "error", err)
return res, err
}
} else {
alias = strings.Split(string(accAlias), ".")[0]
}
// get the active sym and active balance
activeSym, err := store.ReadEntry(ctx, sessionId, storedb.DATA_ACTIVE_SYM)
if err != nil {
if db.IsNotFound(err) {
balance := "0.00"
res.Content = l.Get("Balance: %s\n", balance)
if alias != "" {
content = l.Get("Alias: %s\nBalance: %s\n", alias, balance)
} else {
content = l.Get("Balance: %s\n", balance)
}
res.Content = content
return res, nil
}
@ -1484,7 +1504,12 @@ func (h *MenuHandlers) CheckBalance(ctx context.Context, sym string, input []byt
// Format to 2 decimal places
balStr := fmt.Sprintf("%.2f %s", balFloat, activeSym)
res.Content = l.Get("Balance: %s\n", balStr)
if alias != "" {
lash commented 2025-02-28 23:14:14 +01:00
Outdated
Review
Copy Link

DRY?

DRY?
carlos commented 2025-03-03 10:55:30 +01:00
Outdated
Review
Copy Link

Commit: e97d4be296 aims to resolve this. The CheckBalance should possibly be refactored further maybe? Currently it not only loads the balance,but also the user alias if set.

Commit: e97d4be296ee2dd35197b28aabb7487fc3061886 aims to resolve this. The `CheckBalance` should possibly be refactored further maybe? Currently it not only loads the balance,but also the user alias if set.
content = l.Get("Alias: %s\nBalance: %s\n", alias, balStr)
} else {
content = l.Get("Balance: %s\n", balStr)
}
res.Content = content
return res, nil
}
@ -2420,7 +2445,8 @@ func (h *MenuHandlers) constructAccountAlias(ctx context.Context) error {
}
return nil
}
//RequestCustomAlias requests an ENS based alias name based on a user's input,then saves it as temporary value
// RequestCustomAlias requests an ENS based alias name based on a user's input,then saves it as temporary value
func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
var res resource.Result
sessionId, ok := ctx.Value("SessionId").(string)
@ -2464,7 +2490,7 @@ func (h *MenuHandlers) RequestCustomAlias(ctx context.Context, sym string, input
return res, nil
}
//GetSuggestedAlias loads and displays the suggested alias name from the temporary value
// GetSuggestedAlias loads and displays the suggested alias name from the temporary value
func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
var res resource.Result
store := h.userdataStore
@ -2481,7 +2507,7 @@ func (h *MenuHandlers) GetSuggestedAlias(ctx context.Context, sym string, input
return res, nil
}
//ConfirmNewAlias reads the suggested alias from the temporary value and confirms it as the new account alias.
// ConfirmNewAlias reads the suggested alias from the temporary value and confirms it as the new account alias.
func (h *MenuHandlers) ConfirmNewAlias(ctx context.Context, sym string, input []byte) (resource.Result, error) {
var res resource.Result
store := h.userdataStore