Merge pull request #906 from orogvany/fix_send_panel

GUI: fix account ordering on select from account
semuxproject · May 25, 2018 · efd2e9d · efd2e9d
2 parents cda869e + f3682f4
commit efd2e9d
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/org/semux/gui/panel/SendPanel.java b/src/main/java/org/semux/gui/panel/SendPanel.java
@@ -431,8 +431,13 @@ protected void showAddressBook() {
      * @return
      */
     protected WalletAccount getSelectedAccount() {
-        int idx = selectFrom.getSelectedIndex();
-        return (idx == -1) ? null : model.getAccounts().get(idx);
+        AccountItem selected = (AccountItem) selectFrom.getSelectedItem();
+        return selected == null ? null
+                : model.getAccounts()
+                        .stream()
+                        .filter(walletAccount -> Arrays.equals(selected.address, walletAccount.getAddress()))
+                        .findFirst()
+                        .orElse(null);
     }
 
     /**