- added error message for insuficient funds when attempting to accept…

… a payment request - fixed payment request details not working on Windows - fixed denied payment request status bubble not updating in active chat
ixian-platform · Sep 16, 2024 · d9467b4 · d9467b4
1 parent fdc09aa
commit d9467b4
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 5 deletions.
diff --git a/Spixi/Network/StreamProcessor.cs b/Spixi/Network/StreamProcessor.cs
@@ -1107,7 +1107,7 @@ public static void handleRequestFundsResponse(byte[] id, Address sender_wallet,
 
             if (friend.chat_page != null)
             {
-                byte[] b_tx_id = Transaction.txIdLegacyToV8(tx_id);
+                byte[]? b_tx_id = !string.IsNullOrEmpty(tx_id) ? Transaction.txIdLegacyToV8(tx_id) : null;
                 friend.chat_page.updateRequestFundsStatus(msg_id, b_tx_id, status);
             }
         }

diff --git a/Spixi/Pages/Chat/SingleChatPage.xaml.cs b/Spixi/Pages/Chat/SingleChatPage.xaml.cs
@@ -721,6 +721,13 @@ public void onConfirmPaymentRequest(FriendMessage msg, string amount)
             // TODO: extract the date from the corresponding message
             DateTime dt = DateTime.Now;
             string date_text = String.Format("{0:t}", dt);
+
+            if (homePage != null)
+            {
+                homePage.onConfirmPaymentRequest(msg, friend, amount, date_text);
+                return;
+            }
+
             Navigation.PushAsync(new WalletContactRequestPage(msg, friend, amount, date_text), Config.defaultXamarinAnimations);
         }
 
@@ -1311,7 +1318,7 @@ public void updateTransactionStatus(string txid, bool verified)
             Utils.sendUiCommand(this, "updateTransactionStatus", txid, status, status_icon);
         }
 
-        public void updateRequestFundsStatus(byte[] msg_id, byte[] txid, string status)
+        public void updateRequestFundsStatus(byte[] msg_id, byte[]? txid, string status)
         {
             string status_icon = "fa-clock";
             bool enableView = true;

diff --git a/Spixi/Pages/Home/HomePage.xaml.cs b/Spixi/Pages/Home/HomePage.xaml.cs
@@ -395,6 +395,11 @@ public void onContactDetails(Friend friend)
             Navigation.PushAsync(new ContactDetails(friend, true), Config.defaultXamarinAnimations);
         }
 
+        public void onConfirmPaymentRequest(FriendMessage msg, Friend friend, string amount, string date_text)
+        {
+            Navigation.PushAsync(new WalletContactRequestPage(msg, friend, amount, date_text), Config.defaultXamarinAnimations);
+        }
+
         public async void quickScan()
         {
             var scanPage = new ScanPage();

diff --git a/Spixi/Pages/Wallet/WalletContactRequestPage.xaml.cs b/Spixi/Pages/Wallet/WalletContactRequestPage.xaml.cs
@@ -115,15 +115,31 @@ private void onDecline()
 
         private void onSend()
         {
+            IxiNumber fee = ConsensusConfig.forceTransactionPrice;
+            IxiNumber _amount = amount;
+
+            if (_amount < (long)0)
+            {
+                displaySpixiAlert(SpixiLocalization._SL("wallet-error-amount-title"), SpixiLocalization._SL("wallet-error-amount-text"), SpixiLocalization._SL("global-dialog-ok"));
+                return;
+            }
+
+            if (_amount + fee > Node.balance.balance)
+            {
+                string alert_body = String.Format(SpixiLocalization._SL("wallet-error-balance-text"), _amount + fee, Node.balance.balance);
+                displaySpixiAlert(SpixiLocalization._SL("wallet-error-balance-title"), alert_body, SpixiLocalization._SL("global-dialog-ok"));
+                return;
+            }
+
+
             string msg_id = Crypto.hashToString(requestMsg.id);
 
-            // send tx details to the request
+            // Send tx details to the request
             if (!requestMsg.message.StartsWith(":"))
             {
                 // Create an ixian transaction and send it to the dlt network
                 Address to = friend.walletAddress;
-
-                IxiNumber fee = ConsensusConfig.forceTransactionPrice;
+
                 Address from = IxianHandler.getWalletStorage().getPrimaryAddress();
                 Address pubKey = new Address(IxianHandler.getWalletStorage().getPrimaryPublicKey());