Draft: initial user flow for creating a wallet

commands.py

@@ -3,7 +3,7 @@ from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup
 from telegram.ext import CallbackContext
 
 from database import AppUser, AppState, AppWallet, AppWalletRequest, AppUserWallet
-from util import generate_wallets
+from util import generate_wallets, get_wallet_name
 
 
 def generate_message(state_id, extra_menu=None):
@@ -83,14 +83,15 @@ def choose_wallet(update: Update, context: CallbackContext):
     user = AppUser.get(telegram_id=telegram_user.id, nickname=telegram_user.full_name)
     user_wallets = AppUserWallet.select().where(AppUserWallet.user_id == user)
     user.set_state(5)
-    menu = [[InlineKeyboardButton(uw.wallet_id.name, callback_data=uw.wallet_id.name)] for uw in user_wallets]
+    menu = [[InlineKeyboardButton(uw.wallet_id.name, callback_data=get_wallet_name(uw.wallet_id.id, uw.user_id.id))] for uw in user_wallets]
     reply_msg, reply_markup = generate_message(5, menu)
     update.effective_message.reply_text(reply_msg, reply_markup=reply_markup)
     pass
 
 
 def wallet_options(update: Update, context: CallbackContext, user: AppUser):
-    print("We are in the wallet options")
+    query = update.callback_query.data
+    print("We are in the wallet options: " + query)
     next_state = user.next_state()
     reply_msg, reply_markup = generate_message(next_state)
     update.effective_message.reply_text(reply_msg, reply_markup=reply_markup)
@@ -145,7 +146,7 @@ def name_wallet(update: Update, context: CallbackContext, user: AppUser):
         for request in wallet_requests:
             update.effective_message.reply_text("Hi, please join this wallet as co-signer.\n"
                                                 "Wallet name= {}\n"
-                                                "https://t.me/BitcoinLibTestbot?start={}".format(variables['wallet_name'], request["token"]))
+                                                "https://t.me/BitcoinLibTestbot&start={}".format(variables['wallet_name'], request["token"]))
 
         next_state = user.next_state()
         reply_msg, reply_markup = generate_message(next_state)