diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 3f1111e70..f348dc2ec 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser index d2002741a..d5bf2f8b2 100644 Binary files a/.idea/caches/gradle_models.ser and b/.idea/caches/gradle_models.ser differ diff --git a/app/build.gradle b/app/build.gradle index 99a824fca..029eab7d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId = 'com.wagerrwallet' minSdkVersion 23 targetSdkVersion 28 - versionCode 250 - versionName "250" + versionCode 251 + versionName "251" multiDexEnabled true // Similar to other properties in the defaultConfig block, diff --git a/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java b/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java index bc98ae17c..0e09e91b9 100644 --- a/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java +++ b/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java @@ -346,7 +346,7 @@ public void afterTextChanged(Editable s) { } else { mTxNoBetBalance.setVisibility(View.VISIBLE); - mTxNoBetBalance.setText(String.format("Minimum bet is %d", getContext().getResources().getInteger(R.integer.min_bet_amount))); + mTxNoBetBalance.setText(String.format("Minimum bet is %d plus fees", getContext().getResources().getInteger(R.integer.min_bet_amount))); } mTxStatus = rootView.findViewById(R.id.tx_status); mTxDate = rootView.findViewById(R.id.tx_date); diff --git a/app/src/main/java/com/wagerrwallet/tools/manager/PromptManager.java b/app/src/main/java/com/wagerrwallet/tools/manager/PromptManager.java index 27d471a5a..158b83b83 100644 --- a/app/src/main/java/com/wagerrwallet/tools/manager/PromptManager.java +++ b/app/src/main/java/com/wagerrwallet/tools/manager/PromptManager.java @@ -148,6 +148,7 @@ public void onClick(View v) { public void run() { BRSharedPrefs.putStartHeight(app, BRSharedPrefs.getCurrentWalletIso(app), 0); BaseWalletManager wallet = WalletsMaster.getInstance(app).getCurrentWallet(app); + wallet.wipeData(app); wallet.getPeerManager().rescan(); BRSharedPrefs.putScanRecommended(app, BRSharedPrefs.getCurrentWalletIso(app), false); } diff --git a/app/src/main/java/com/wagerrwallet/tools/manager/SendManager.java b/app/src/main/java/com/wagerrwallet/tools/manager/SendManager.java index 609429e07..820dbc488 100644 --- a/app/src/main/java/com/wagerrwallet/tools/manager/SendManager.java +++ b/app/src/main/java/com/wagerrwallet/tools/manager/SendManager.java @@ -257,7 +257,7 @@ private static void showAdjustFee(final Activity app, final CryptoRequest item, BRReportsManager.reportBug(new RuntimeException("getMaxOutputAmount is -1, meaning _wallet is NULL")); return; } - if (maxAmountDouble == 0) { + if (maxAmountDouble == 0 || maxAmountDouble < item.amount.longValue() ) { BRDialog.showCustomDialog(app, app.getString(R.string.Alerts_sendFailure), "Insufficient amount for transaction fee", app.getString(R.string.Button_ok), null, new BRDialogView.BROnClickListener() { @Override public void onClick(BRDialogView brDialogView) {