From fcfedbcfae37aebadf59352b1cbf4076d608805f Mon Sep 17 00:00:00 2001 From: m2049r Date: Thu, 14 Jun 2018 22:00:15 +0200 Subject: [PATCH] Fix balance (#313) * new version * fix balance --- app/build.gradle | 4 ++-- app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 23828f3..557fc28 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "com.m2049r.xmrwallet" minSdkVersion 21 targetSdkVersion 25 - versionCode 94 - versionName "1.5.4 'CrAzY Nacho'" + versionCode 95 + versionName "1.5.5 'Accounts Nacho'" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java index f457563..f382af0 100644 --- a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java +++ b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java @@ -963,8 +963,7 @@ public class WalletActivity extends SecureActivity implements WalletFragment.Lis tvName.setText(wallet.getName()); final TextView tvBalance = (TextView) accountsView.getHeaderView(0).findViewById(R.id.tvBalance); tvBalance.setText(getString(R.string.accounts_balance, - Helper.getDisplayAmount(wallet.getBalanceAll() + wallet.getUnlockedBalanceAll(), - 5))); + Helper.getDisplayAmount(wallet.getBalanceAll(), 5))); Menu menu = accountsView.getMenu(); menu.removeGroup(R.id.accounts_list); for (int i = 0; i < wallet.numAccounts(); i++) {