Dockerfile

@@ -21,7 +21,7 @@ RUN make VISE_PATH=/build/go-vise -B
 WORKDIR /build/sarafu-vise
 RUN echo "Building on $BUILDPLATFORM, building for $TARGETPLATFORM"
 RUN go mod download
-RUN go build -tags logtrace,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
+RUN go build -tags logdebug,online -o sarafu-at -ldflags="-X main.build=${BUILD} -s -w" cmd/africastalking/main.go
 
 FROM debian:bookworm-slim
 

handlers/application/account_status.go

@@ -83,7 +83,6 @@ func (h *MenuHandlers) CheckAccountCreated(ctx context.Context, sym string, inpu
 // CheckBlockedStatus:
 // 1. Checks whether the DATA_SELF_PIN_RESET is 1 and sets the flag_account_pin_reset
 // 2. resets the account blocked flag if the PIN attempts have been reset by an admin.
-// 3. Sets key flags (language and PIN) if the data exists
 func (h *MenuHandlers) CheckBlockedStatus(ctx context.Context, sym string, input []byte) (resource.Result, error) {
 	var res resource.Result
 	store := h.userdataStore
@@ -91,30 +90,11 @@ func (h *MenuHandlers) CheckBlockedStatus(ctx context.Context, sym string, input
 	flag_account_blocked, _ := h.flagManager.GetFlag("flag_account_blocked")
 	flag_account_pin_reset, _ := h.flagManager.GetFlag("flag_account_pin_reset")
 
-	flag_pin_set, _ := h.flagManager.GetFlag("flag_pin_set")
-	flag_language_set, _ := h.flagManager.GetFlag("flag_language_set")
-	pinFlagSet := h.st.MatchFlag(flag_pin_set, true)
-	languageFlagSet := h.st.MatchFlag(flag_language_set, true)
-
 	sessionId, ok := ctx.Value("SessionId").(string)
 	if !ok {
 		return res, fmt.Errorf("missing session")
 	}
 
-	// only check the data if the flag isn't set
-	if !pinFlagSet {
-		accountPin, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_ACCOUNT_PIN)
-		if len(accountPin) > 0 {
-			res.FlagSet = append(res.FlagSet, flag_pin_set)
-		}
-	}
-	if !languageFlagSet {
-		languageCode, _ := store.ReadEntry(ctx, sessionId, storedb.DATA_SELECTED_LANGUAGE_CODE)
-		if len(languageCode) > 0 {
-			res.FlagSet = append(res.FlagSet, flag_language_set)
-		}
-	}
-
 	res.FlagReset = append(res.FlagReset, flag_account_pin_reset)
 
 	selfPinReset, err := store.ReadEntry(ctx, sessionId, storedb.DATA_SELF_PIN_RESET)

handlers/application/account_status_test.go

@@ -5,7 +5,6 @@ import (
 	"testing"
 
 	"git.defalsify.org/vise.git/resource"
-	"git.defalsify.org/vise.git/state"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/models"
 	"git.grassecon.net/grassrootseconomics/sarafu-api/testutil/mocks"
 	storedb "git.grassecon.net/grassrootseconomics/sarafu-vise/store/db"
@@ -94,24 +93,16 @@ func TestCheckBlockedStatus(t *testing.T) {
 	}
 	flag_account_blocked, _ := fm.GetFlag("flag_account_blocked")
 	flag_account_pin_reset, _ := fm.GetFlag("flag_account_pin_reset")
-	flag_pin_set, _ := fm.GetFlag("flag_pin_set")
-	flag_language_set, _ := fm.GetFlag("flag_language_set")
-
-	// Set the flag in the State
-	mockState := state.NewState(128)
 
 	h := &MenuHandlers{
 		userdataStore: store,
 		flagManager:   fm,
-		st:            mockState,
 	}
 
 	tests := []struct {
 		name                    string
 		currentWrongPinAttempts string
 		expectedResult          resource.Result
-		languageSet             bool
-		PinSet                  bool
 	}{
 		{
 			name:                    "Currently blocked account",
@@ -127,16 +118,6 @@ func TestCheckBlockedStatus(t *testing.T) {
 				FlagReset: []uint32{flag_account_pin_reset, flag_account_blocked},
 			},
 		},
-		{
-			name:                    "Valid account with reset language and PIN flags",
-			currentWrongPinAttempts: "0",
-			languageSet:             true,
-			PinSet:                  true,
-			expectedResult: resource.Result{
-				FlagReset: []uint32{flag_account_pin_reset, flag_account_blocked},
-				FlagSet:   []uint32{flag_pin_set, flag_language_set},
-			},
-		},
 	}
 
 	for _, tt := range tests {
@@ -145,18 +126,6 @@ func TestCheckBlockedStatus(t *testing.T) {
 				t.Fatal(err)
 			}
 
-			if tt.languageSet {
-				if err := store.WriteEntry(ctx, sessionId, storedb.DATA_SELECTED_LANGUAGE_CODE, []byte("eng")); err != nil {
-					t.Fatal(err)
-				}
-			}
-
-			if tt.PinSet {
-				if err := store.WriteEntry(ctx, sessionId, storedb.DATA_ACCOUNT_PIN, []byte("hasedPinValue")); err != nil {
-					t.Fatal(err)
-				}
-			}
-
 			res, err := h.CheckBlockedStatus(ctx, "", []byte(""))
 
 			assert.NoError(t, err)

handlers/application/vouchers.go

@@ -289,11 +289,8 @@ func (h *MenuHandlers) GetVoucherDetails(ctx context.Context, sym string, input
 	}
 	res.FlagReset = append(res.FlagReset, flag_api_error)
 
-	// sanitize invalid characters
-	symbol := strings.ReplaceAll(voucherData.TokenSymbol, "USD₮", "USDT")
-
 	res.Content = fmt.Sprintf(
-		"Name: %s\nSymbol: %s\nProduct: %s\nLocation: %s", voucherData.TokenName, symbol, voucherData.TokenCommodity, voucherData.TokenLocation,
+		"Name: %s\nSymbol: %s\nCommodity: %s\nLocation: %s", voucherData.TokenName, voucherData.TokenSymbol, voucherData.TokenCommodity, voucherData.TokenLocation,
 	)
 
 	return res, nil

handlers/application/vouchers_test.go

@@ -272,7 +272,7 @@ func TestGetVoucherDetails(t *testing.T) {
 		TokenCommodity: "Farming",
 	}
 	expectedResult.Content = fmt.Sprintf(
-		"Name: %s\nSymbol: %s\nProduct: %s\nLocation: %s", tokenDetails.TokenName, tokenDetails.TokenSymbol, tokenDetails.TokenCommodity, tokenDetails.TokenLocation,
+		"Name: %s\nSymbol: %s\nCommodity: %s\nLocation: %s", tokenDetails.TokenName, tokenDetails.TokenSymbol, tokenDetails.TokenCommodity, tokenDetails.TokenLocation,
 	)
 	mockAccountService.On("VoucherData", string(tokA_AAddress)).Return(tokenDetails, nil)
 	res, err := h.GetVoucherDetails(ctx, "SessionId", []byte(""))

store/vouchers.go

@@ -15,11 +15,6 @@ var (
 	logg = logging.NewVanilla().WithDomain("vouchers").WithContextKey("SessionId")
 )
 
-// symbolReplacements holds mappings of invalid symbols → valid ones
-var symbolReplacements = map[string]string{
-	"USD₮": "USDT",
-}
-
 // VoucherMetadata helps organize data fields
 type VoucherMetadata struct {
 	Symbols   string
@@ -28,24 +23,13 @@ type VoucherMetadata struct {
 	Addresses string
 }
 
-// sanitizeSymbol replaces known invalid token symbols with normalized ones
-func sanitizeSymbol(symbol string) string {
-	if replacement, ok := symbolReplacements[symbol]; ok {
-		return replacement
-	}
-	return symbol
-}
-
 // ProcessVouchers converts holdings into formatted strings
 func ProcessVouchers(holdings []dataserviceapi.TokenHoldings) VoucherMetadata {
 	var data VoucherMetadata
 	var symbols, balances, decimals, addresses []string
 
 	for i, h := range holdings {
-		// normalize token symbol before use
-		cleanSymbol := sanitizeSymbol(h.TokenSymbol)
-
-		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, cleanSymbol))
+		symbols = append(symbols, fmt.Sprintf("%d:%s", i+1, h.TokenSymbol))
 
 		// Scale down the balance
 		scaledBalance := ScaleDownBalance(h.Balance, h.TokenDecimals)

store/vouchers_test.go

@@ -61,14 +61,13 @@ func TestProcessVouchers(t *testing.T) {
 	holdings := []dataserviceapi.TokenHoldings{
 		{TokenAddress: "0xd4c288865Ce", TokenSymbol: "SRF", TokenDecimals: "6", Balance: "100000000"},
 		{TokenAddress: "0x41c188d63Qa", TokenSymbol: "MILO", TokenDecimals: "4", Balance: "200000000"},
-		{TokenAddress: "0x41c143d63Qa", TokenSymbol: "USD₮", TokenDecimals: "6", Balance: "300000000"},
 	}
 
 	expectedResult := VoucherMetadata{
-		Symbols:   "1:SRF\n2:MILO\n3:USDT",
-		Balances:  "1:100\n2:20000\n3:300",
-		Decimals:  "1:6\n2:4\n3:6",
-		Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa\n3:0x41c143d63Qa",
+		Symbols:   "1:SRF\n2:MILO",
+		Balances:  "1:100\n2:20000",
+		Decimals:  "1:6\n2:4",
+		Addresses: "1:0xd4c288865Ce\n2:0x41c188d63Qa",
 	}
 
 	result := ProcessVouchers(holdings)