change generic message when amount+fees<balance, wipe db when resyncing

wagerr · Nov 30, 2019 · 1007f8b · 1007f8b
1 parent 70abbc3
commit 1007f8b
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git 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
@@ -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
@@ -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
@@ -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) {