Add "Buy BSQ" button next to trade fee selector

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

@@ -446,10 +446,10 @@ offerbook.info.roundedFiatVolume=The amount was rounded to increase the privacy
 offerbook.info.accountCreated.headline=Congratulations
 offerbook.info.accountCreated.message=You''ve just successfully created a BSQ payment account.\n\
   Your account can be found under Account > Altcoins Accounts > {0} and your BSQ wallet under DAO > BSQ Wallet.\n\n
-offerbook.info.accountCreated.tradeInstant=As you've chosen to take a BSQ instant offer a BSQ instant account was created for you. \
-  For instant trading it is required that both trading peers are online to be able \
-  to complete the trade in less than 1 hour.\n\n
-offerbook.info.accountCreated.takeOffer=You can no proceed to take this offer after closing this popup.
+offerbook.info.accountCreated.tradeInstant=You've chosen to take a BSQ instant offer, so a BSQ instant payment account was created for you. \
+  Be aware that instant trades are meant to be completed within 1 hour, \
+  so you should be online and available for the next 1 hour.\n\n
+offerbook.info.accountCreated.takeOffer=You can now proceed to take this offer after closing this popup.
 
 offerbook.bsqSwap.createOffer=Create Bsq swap offer
 

desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java

@@ -613,6 +613,11 @@ public void setOfferActionHandler(OfferView.OfferActionHandler offerActionHandle
 
     public void onTabSelected(boolean isSelected) {
         model.onTabSelected(isSelected);
+
+        if (isSelected) {
+            updateCurrencyComboBoxFromModel();
+            root.requestFocus();
+        }
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////

desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java

@@ -226,16 +226,7 @@ public OfferBookViewModel(User user,
     protected void activate() {
         filteredItems.addListener(filterItemsListener);
 
-        String code = direction == OfferDirection.BUY ? preferences.getBuyScreenCurrencyCode() : preferences.getSellScreenCurrencyCode();
-        if (code != null && !code.isEmpty() && !isShowAllEntry(code) &&
-                CurrencyUtil.getTradeCurrency(code).isPresent()) {
-            showAllTradeCurrenciesProperty.set(false);
-            selectedTradeCurrency = CurrencyUtil.getTradeCurrency(code).get();
-        } else {
-            showAllTradeCurrenciesProperty.set(true);
-            selectedTradeCurrency = GlobalSettings.getDefaultTradeCurrency();
-        }
-        tradeCurrencyCode.set(selectedTradeCurrency.getCode());
+        updateSelectedTradeCurrency();
 
         if (user != null) {
             disableMatchToggle.set(user.getPaymentAccounts() == null || user.getPaymentAccounts().isEmpty());
@@ -269,6 +260,11 @@ void initWithDirection(OfferDirection direction) {
     void onTabSelected(boolean isSelected) {
         this.isTabSelected = isSelected;
         setMarketPriceFeedCurrency();
+
+        if (isTabSelected) {
+            updateSelectedTradeCurrency();
+            filterOffers();
+        }
     }
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -703,4 +699,17 @@ public void onCreateOffer() {
     public void onTakeOffer(Offer offer) {
         offerActionHandler.onTakeOffer(offer);
     }
+
+    private void updateSelectedTradeCurrency() {
+        String code = direction == OfferDirection.BUY ? preferences.getBuyScreenCurrencyCode() : preferences.getSellScreenCurrencyCode();
+        if (code != null && !code.isEmpty() && !isShowAllEntry(code) &&
+                CurrencyUtil.getTradeCurrency(code).isPresent()) {
+            showAllTradeCurrenciesProperty.set(false);
+            selectedTradeCurrency = CurrencyUtil.getTradeCurrency(code).get();
+        } else {
+            showAllTradeCurrenciesProperty.set(true);
+            selectedTradeCurrency = GlobalSettings.getDefaultTradeCurrency();
+        }
+        tradeCurrencyCode.set(selectedTradeCurrency.getCode());
+    }
 }