From ab6e24e7f3b6e7f311a32599d8a403767d544f4a Mon Sep 17 00:00:00 2001
From: EggPool <dev@eggpool.net>
Date: Tue, 11 Dec 2018 17:46:13 +0100
Subject: [PATCH] Fixes

---
 History.md                       | 3 +++
 wallet/themes/material/base.html | 3 ++-
 wallet/wallet.py                 | 8 +++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/History.md b/History.md
index 3585667..5209118 100644
--- a/History.md
+++ b/History.md
@@ -1,5 +1,8 @@
 # History
 
+## 0.0.65 - 2018-12-11
+
+Incremental fixes to wallet creation location and small template tweak.
 
 ## 0.0.64 - 2018-12-11
 
diff --git a/wallet/themes/material/base.html b/wallet/themes/material/base.html
index 924306f..c640aa4 100644
--- a/wallet/themes/material/base.html
+++ b/wallet/themes/material/base.html
@@ -141,7 +141,8 @@
                             </div>
                         </li>
                         <li class="nav-item">
-                            <a class="nav-link" href="/wallet/info">
+                            <a class="nav-link" href="/wallet/info" title="{{ _('Wallet') }}">
+                                <i class="material-icons">account_balance_wallet</i>
                                 <i class="material-icons">lock_open</i>
                                 <!-- todo: lock if wallet is encrypted and locked , other icon if no wallet, and if wallet is in clear -->
                                 <p class="d-lg-none d-md-block">
diff --git a/wallet/wallet.py b/wallet/wallet.py
index 64e5999..83bfbc5 100644
--- a/wallet/wallet.py
+++ b/wallet/wallet.py
@@ -30,7 +30,7 @@
 from bismuthclient import bismuthclient
 from bismuthclient.bismuthutil import BismuthUtil
 
-__version__ = '0.0.64'  #
+__version__ = '0.0.65'  #
 
 define("port", default=8888, help="run on the given port", type=int)
 define("debug", default=False, help="debug mode", type=bool)
@@ -145,6 +145,7 @@ async def get(self):
         if not self.bismuth_vars['address']:
             self.bismuth_vars['address'] = 'None'
             self.redirect("/wallet/load")
+            return
         self.bismuth_vars['transactions'] = self.bismuth.latest_transactions(5, for_display=True)
         self.render("home.html", bismuth=self.bismuth_vars)
         # self.app_log.info("> home")
@@ -280,7 +281,7 @@ async def load(self, params=None):
             self.redirect("/wallet/info")
 
     async def info(self, params=None):
-        wallet_info = self.bismuth.wallet('wallets')
+        wallet_info = self.bismuth.wallet()
         self.render("wallet_info.html", wallet=wallet_info, bismuth=self.bismuth_vars)
 
     async def create(self, params=None):
@@ -289,7 +290,8 @@ async def create(self, params=None):
         _ = self.locale.translate
         wallet = param.replace('wallet=', '')
         wallet = wallet.replace('.der', '')  # just in case the user added .der
-        file_name = 'wallets/{}.der'.format(wallet)
+        wallet_dir = self.bismuth.user_subdir(BISMUTH_PRIVATE_DIR)
+        file_name = os.path.join(wallet_dir,'{}.der'.format(wallet))
         if os.path.isfile(file_name):
             self.render("message.html", type="warning", title=_("Error"), message=_("This file already exists: {}.der").format(wallet), bismuth=self.bismuth_vars)
         else: