From 95a641f53f585c745e13c115c08c345075735760 Mon Sep 17 00:00:00 2001
From: pokkst <pokkst@protonmail.com>
Date: Mon, 19 Sep 2022 18:36:34 -0500
Subject: [PATCH] fee selection fixes

---
 .../net/mynero/wallet/data/PendingTx.java     | 39 -------------------
 .../dialog/SendBottomSheetDialog.java         |  4 +-
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 app/src/main/java/net/mynero/wallet/data/PendingTx.java

diff --git a/app/src/main/java/net/mynero/wallet/data/PendingTx.java b/app/src/main/java/net/mynero/wallet/data/PendingTx.java
deleted file mode 100644
index 8427a58..0000000
--- a/app/src/main/java/net/mynero/wallet/data/PendingTx.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2017 m2049r
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.mynero.wallet.data;
-
-import net.mynero.wallet.model.PendingTransaction;
-
-public class PendingTx {
-    final public PendingTransaction.Status status;
-    final public String error;
-    final public long amount;
-    final public long dust;
-    final public long fee;
-    final public String txId;
-    final public long txCount;
-
-    public PendingTx(PendingTransaction pendingTransaction) {
-        status = pendingTransaction.getStatus();
-        error = pendingTransaction.getErrorString();
-        amount = pendingTransaction.getAmount();
-        dust = pendingTransaction.getDust();
-        fee = pendingTransaction.getFee();
-        txId = pendingTransaction.getFirstTxId();
-        txCount = pendingTransaction.getTxCount();
-    }
-}
diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.java b/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.java
index 1285d87..3b47cf0 100644
--- a/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.java
+++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/SendBottomSheetDialog.java
@@ -144,7 +144,7 @@ public class SendBottomSheetDialog extends BottomSheetDialogFragment {
                 }
                 Toast.makeText(getActivity(), getString(R.string.creating_tx), Toast.LENGTH_SHORT).show();
                 createButton.setEnabled(false);
-                createTx(address, amount, sendAll, PendingTransaction.Priority.Priority_Default);
+                createTx(address, amount, sendAll, priority);
             } else if (!validAddress) {
                 Toast.makeText(getActivity(), getString(R.string.send_address_invalid), Toast.LENGTH_SHORT).show();
             } else {
@@ -219,7 +219,7 @@ public class SendBottomSheetDialog extends BottomSheetDialogFragment {
     private void createTx(String address, String amount, boolean sendAll, PendingTransaction.Priority feePriority) {
         AsyncTask.execute(() -> {
             PendingTransaction pendingTx = TxService.getInstance().createTx(address, amount, sendAll, feePriority);
-            if (pendingTx != null) {
+            if (pendingTx != null && pendingTx.getStatus() == PendingTransaction.Status.Status_Ok) {
                 _pendingTransaction.postValue(pendingTx);
             } else {
                 Activity activity = getActivity();