Merge pull request #459 from Cypherock/wallet-extend-character-set

feat: Extend wallet name charset to alpha-numeric
Cypherock · Jan 20, 2024 · a8b02aa · a8b02aa
2 parents 693ee56 + a6b65dc
commit a8b02aa
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/common/coin_support/wallet.h b/common/coin_support/wallet.h
@@ -81,6 +81,9 @@
 /// Unsets the bit that corresponds to Arbitrary Data
 #define WALLET_UNSET_ARBITRARY_DATA(n) (n &= (~4))
 
+/// @brief Character set for wallet name
+#define WALLET_NAME_CHARSET ALPHA_NUMERIC
+
 typedef enum wallet_name_opt {
   WALLET_NAME_ONE = 1,
   WALLET_NAME_TWO,

diff --git a/src/level_three/add_wallet/tasks/tasks_arbitrary_data.c b/src/level_three/add_wallet/tasks/tasks_arbitrary_data.c
@@ -106,8 +106,11 @@ void tasks_arbitrary_data() {
 
   switch (flow_level.level_three) {
     case ARBITRARY_DATA_NAME_INPUT: {
-      input_text_init(
-          ALPHABET, ui_text_enter_wallet_name, 2, DATA_TYPE_TEXT, 15);
+      input_text_init(WALLET_NAME_CHARSET,
+                      ui_text_enter_wallet_name,
+                      2,
+                      DATA_TYPE_TEXT,
+                      15);
     } break;
 
     case ARBITRARY_DATA_NAME_CONFIRM: {

diff --git a/src/wallet/create_new_wallet_flow.c b/src/wallet/create_new_wallet_flow.c
@@ -141,8 +141,11 @@ new_wallet_state_e new_wallet_state_handler(new_wallet_state_e current_state) {
 
   switch (current_state) {
     case NAME_INPUT: {
-      input_text_init(
-          ALPHABET, ui_text_enter_wallet_name, 2, DATA_TYPE_TEXT, 15);
+      input_text_init(WALLET_NAME_CHARSET,
+                      ui_text_enter_wallet_name,
+                      2,
+                      DATA_TYPE_TEXT,
+                      15);
       next_state = get_state_on_input_scr(NAME_INPUT, EARLY_EXIT, TIMED_OUT);
 
       if (NAME_INPUT != next_state) {

diff --git a/src/wallet/restore_seed_phrase_flow.c b/src/wallet/restore_seed_phrase_flow.c
@@ -168,8 +168,11 @@ restore_wallet_state_e restore_wallet_state_handler(
 
   switch (current_state) {
     case NAME_INPUT: {
-      input_text_init(
-          ALPHABET, ui_text_enter_wallet_name, 2, DATA_TYPE_TEXT, 15);
+      input_text_init(WALLET_NAME_CHARSET,
+                      ui_text_enter_wallet_name,
+                      2,
+                      DATA_TYPE_TEXT,
+                      15);
       next_state = get_state_on_input_scr(NAME_INPUT, EARLY_EXIT, TIMED_OUT);
 
       if (NAME_INPUT != next_state) {