Merge pull request #2000 from ripcurlx/release-test-fixes

Redesign: Bug fixes that came up during release testing

core/src/main/resources/i18n/displayStrings.properties

@@ -958,7 +958,7 @@ account.tab.account=Account
 account.info.headline=Welcome to your Bisq Account
 account.info.msg=Here you can add trading accounts for national currencies & altcoins, select arbitrators and create a backup of your wallet & account data.\n\n\
 An empty Bitcoin wallet was created the first time you started Bisq.\n\
-We recommend that you write down your Bitcoin wallet seed words (see button on the left) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\n\
+We recommend that you write down your Bitcoin wallet seed words (see tab on the top) and consider adding a password before funding. Bitcoin deposits and withdrawals are managed in the \"Funds\" section.\n\n\
 Privacy & Security:\n\
 Bisq is a decentralized exchange – meaning all of your data is kept on your computer - there are no servers and we have no access to your personal info, your funds or even your IP address. Data such as bank account numbers, altcoin & Bitcoin addresses, etc are only shared with your trading partner to fulfill trades you initiate (in case of a dispute the arbitrator will see the same data as your trading peer).
 

desktop/src/main/java/bisq/desktop/app/SystemTray.java

@@ -52,7 +52,8 @@ public class SystemTray {
 
     private static final String ICON_HI_RES = "/images/system_tray_icon@2x.png";
     private static final String ICON_LO_RES = "/images/system_tray_icon.png";
-    private static final String ICON_WINDOWS = "/images/system_tray_icon_windows.png";
+    private static final String ICON_WINDOWS_LO_RES = "/images/system_tray_icon_windows.png";
+    private static final String ICON_WINDOWS_HI_RES = "/images/system_tray_icon_windows@2x.png";
     private static final String ICON_LINUX = "/images/system_tray_icon_linux.png";
 
 
@@ -98,7 +99,7 @@ public class SystemTray {
         if (Utilities.isOSX())
             path = ImageUtil.isRetina() ? ICON_HI_RES : ICON_LO_RES;
         else if (Utilities.isWindows())
-            path = ICON_WINDOWS;
+            path = ImageUtil.isRetina() ? ICON_WINDOWS_HI_RES : ICON_WINDOWS_LO_RES;
         else
             path = ICON_LINUX;
 

desktop/src/main/java/bisq/desktop/components/paymentmethods/BankForm.java

@@ -311,11 +311,17 @@ abstract class BankForm extends GeneralBankForm {
             validateInput(countryCode);
 
             holderNameInputTextField.resetValidation();
+            holderNameInputTextField.validate();
             bankNameInputTextField.resetValidation();
+            bankNameInputTextField.validate();
             bankIdInputTextField.resetValidation();
+            bankIdInputTextField.validate();
             branchIdInputTextField.resetValidation();
+            branchIdInputTextField.validate();
             accountNrInputTextField.resetValidation();
+            accountNrInputTextField.validate();
             nationalAccountIdInputTextField.resetValidation();
+            nationalAccountIdInputTextField.validate();
 
             boolean requiresHolderId = BankUtil.isHolderIdRequired(countryCode);
             if (requiresHolderId) {

desktop/src/main/java/bisq/desktop/components/paymentmethods/CashDepositForm.java

@@ -358,6 +358,14 @@ public class CashDepositForm extends GeneralBankForm {
             accountNrInputTextField.resetValidation();
             nationalAccountIdInputTextField.resetValidation();
 
+            holderNameInputTextField.validate();
+            emailInputTextField.validate();
+            bankNameInputTextField.validate();
+            bankIdInputTextField.validate();
+            branchIdInputTextField.validate();
+            accountNrInputTextField.validate();
+            nationalAccountIdInputTextField.validate();
+
             boolean requiresHolderId = BankUtil.isHolderIdRequired(countryCode);
             if (requiresHolderId) {
                 holderNameInputTextField.minWidthProperty().unbind();

desktop/src/main/java/bisq/desktop/components/paymentmethods/GeneralBankForm.java

@@ -101,7 +101,7 @@ public abstract class GeneralBankForm extends PaymentMethodForm {
     }
 
     void validateInput(String countryCode) {
-        if (BankUtil.useValidation(countryCode) && !validatorsApplied) {
+        if (BankUtil.useValidation(countryCode)) {
             validatorsApplied = true;
             if (useHolderID)
                 holderIdInputTextField.setValidator(inputValidator);

desktop/src/main/java/bisq/desktop/main/account/AccountView.java

@@ -202,6 +202,14 @@ public class AccountView extends ActivatableView<TabPane, Void> {
     private void loadView(Class<? extends View> viewClass) {
         View view = viewLoader.load(viewClass);
 
+        if (selectedTab != null && selectedTab.getContent() != null) {
+            if (selectedTab.getContent() instanceof ScrollPane) {
+                ((ScrollPane) selectedTab.getContent()).setContent(null);
+            } else {
+                selectedTab.setContent(null);
+            }
+        }
+
         if (view instanceof ArbitratorRegistrationView) {
             if (arbitratorRegistrationTab != null) {
                 selectedTab = arbitratorRegistrationTab;

desktop/src/main/java/bisq/desktop/util/validation/BranchIdValidator.java

@@ -72,8 +72,7 @@ public final class BranchIdValidator extends BankValidator {
     }
 
     private String getLabel() {
-        String label = BankUtil.getBranchIdLabel(countryCode);
+        return BankUtil.getBranchIdLabel(countryCode);
-        return label.substring(0, label.length() - 1);
     }
 
 }