add-space-after-colon #211

						
				@@ -122,6 +123,7 @@ func main() {

					flag.UintVar(&size, "s", 160, "max size of output")

					flag.StringVar(&host, "h", initializers.GetEnv("HOST", "127.0.0.1"), "http host")

					flag.UintVar(&port, "p", initializers.GetEnvUint("PORT", 7123), "http port")

					flag.StringVar(&separator, "sep", ": ", "custom separator for the menu")

lash commented

2024-12-12 20:52:09 +01:00

this is probably more a config thing than an arg thing?

Alfred-mk commented

2024-12-12 23:11:33 +01:00

This has been resolved

Alfred-mk marked this conversation as resolved

common/vouchers.go Outdated

						
				@@ -25,3 +25,3 @@

					for i, h := range holdings {

						symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))

						symbols = append(symbols, fmt.Sprintf("%d: %s", i+1, h.TokenSymbol))

lash commented

2024-12-12 20:53:08 +01:00

won't this break if separator is set to something else by config/arg?

Alfred-mk marked this conversation as resolved

internal/handlers/ussd/menuhandler.go Outdated

						
				@@ -1901,3 +1901,3 @@

						}

						formattedTransactions = append(formattedTransactions, fmt.Sprintf("%d:%s %s %s %s", i+1, status, value, sym, date))

						formattedTransactions = append(formattedTransactions, fmt.Sprintf("%d: %s %s %s %s", i+1, status, value, sym, date))

lash commented

2024-12-12 20:53:47 +01:00

same here, will break

Alfred-mk commented

2024-12-13 09:44:28 +01:00

This has been resolved

Alfred-mk added 1 commit 2024-12-12 23:11:12 +01:00

set the separator as a config and not an arg f38ea59569

Alfred-mk marked the pull request as work in progress 2024-12-13 08:54:03 +01:00

Alfred-mk added 4 commits 2024-12-13 09:44:10 +01:00

set the separator as a var and add it to the context 64c1fe5276

properly format the vouchers df5e5f1a4b

use the MenuSeparator 5cd791aae7

updated tests 7aea2af9a1

Alfred-mk marked the pull request as ready for review 2024-12-13 09:44:38 +01:00

lash requested changes 2024-12-13 09:52:12 +01:00

internal/handlers/ussd/menuhandler.go Outdated

						
				@@ -1676,6 +1676,11 @@ func (h *Handlers) CheckVouchers(ctx context.Context, sym string, input []byte)

				func (h *Handlers) GetVoucherList(ctx context.Context, sym string, input []byte) (resource.Result, error) {

					var res resource.Result

					menuSeparator, ok := ctx.Value("MenuSeparator").(string)

lash commented

2024-12-13 09:51:43 +01:00

why wouldnt this be set directly as a property in the handler?

Alfred-mk commented

2024-12-13 11:19:54 +01:00

It would be easier setting it in the context for use by downstream functions, similar to how the database is set.

Also. it won't be used by most of the handler functions. It's only usable by functions that generate custom menu items (such as the voucher list and transfers list)

It would be easier setting it in the context for use by downstream functions, similar to how the database is set. Also. it won't be used by most of the handler functions. It's only usable by functions that generate custom menu items (such as the voucher list and transfers list)

lash commented

2024-12-13 16:23:46 +01:00

ref phone conversation, let store a function pointer in the handlers that does the translation with the separator selected :)

Alfred-mk commented

2024-12-18 20:35:04 +01:00

This has been done. The function is passed from the LocalHandlerService to the Handlers

Alfred-mk marked the pull request as work in progress 2024-12-18 08:12:20 +01:00

Alfred-mk added 3 commits 2024-12-18 19:59:17 +01:00

remove the MenuSeparator from the context 17ba6a06ba

add the replaceSeparator func and pass it to the Handler struct d08afff443

use the replaceSeparator func to format the generated menus fda68231ea

Alfred-mk added 2 commits 2024-12-18 20:25:54 +01:00

updated test ecfdab47a8

use a common mockReplaceSeparator func 055c2db790

Alfred-mk added 1 commit 2024-12-18 20:30:48 +01:00

Merge branch 'master' into add-space-after-colon 97fcdda12f

Alfred-mk marked the pull request as ready for review 2024-12-18 20:35:12 +01:00

lash requested changes 2024-12-19 09:42:31 +01:00

internal/handlers/ussd/menuhandler.go Outdated

						
				@@ -102,0 +100,4 @@

						accountService:   accountService,

						prefixDb:         prefixDb,

						profile:          &models.Profile{Max: 6},

						ReplaceSeparator: replaceSeparator,