v4.2.4

Author: mytonwalletorg

changelogs/4.2.4.txt

@@ -0,0 +1 @@
+Bug fixes and performance improvements

mobile/android/air/SubModules/Ledger/src/main/java/org/mytonwallet/app_air/ledger/connectionManagers/LedgerBleManager.kt

@@ -95,7 +95,10 @@ object LedgerBleManager : ILedgerConnectionManager {
     ) {
         Handler(Looper.getMainLooper()).post {
             WalletCore.call(
-                ApiMethod.Other.WaitForLedgerApp(chain = MBlockchain.ton),
+                ApiMethod.Other.WaitForLedgerApp(
+                    chain = MBlockchain.ton,
+                    ApiMethod.Other.WaitForLedgerApp.Options(timeout = 2000)
+                ),
                 callback = { res, error ->
                     if (res != true || error != null) {
                         onUpdate(

mobile/android/air/SubModules/WalletCore/src/main/java/org/mytonwallet/app_air/walletcore/moshi/api/ApiMethod.kt

@@ -48,11 +48,19 @@ sealed class ApiMethod<T> {
                 .build()
         }
 
-        class WaitForLedgerApp(chain: MBlockchain) : ApiMethod<Boolean>() {
+        class WaitForLedgerApp(chain: MBlockchain, options: Options? = null) :
+            ApiMethod<Boolean>() {
+            @JsonClass(generateAdapter = true)
+            data class Options(
+                val timeout: Int? = null,
+                val attemptPause: Int? = null
+            )
+
             override val name: String = "waitForLedgerApp"
             override val type: Type = Boolean::class.java
             override val arguments: String = ArgumentsBuilder()
                 .string(chain.name)
+                .jsObject(options, Options::class.java)
                 .build()
         }
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "mytonwallet",
-  "version": "4.2.3",
+  "version": "4.2.4",
   "description": "The most feature-rich web wallet and browser extension for TON – with support of multi-accounts, tokens (jettons), NFT, TON DNS, TON Sites, TON Proxy, and TON Magic.",
   "main": "index.js",
   "scripts": {

package.json

@@ -1 +1 @@
-4.2.3
+4.2.4

public/version.txt

@@ -68,6 +68,7 @@ interface OwnProps {
   shouldUseSwapTokens?: boolean;
   shouldHideMyTokens?: boolean;
   shouldHideNotSupportedTokens?: boolean;
+  isSwapOut?: boolean;
   selectedChain?: ApiChain | ApiChain[];
   header?: TeactNode;
   onClose: NoneToVoidFunction;
@@ -513,12 +514,12 @@ function TokenSelector({
   );
 }
 
-export default memo(withGlobal<OwnProps>((global): StateProps => {
+export default memo(withGlobal<OwnProps>((global, ownProps): StateProps => {
   const { baseCurrency, isSensitiveDataHidden } = global.settings;
   const { isLoading, token } = global.settings.importToken ?? {};
   const { tokenInSlug, shouldShowAllPairs } = global.currentSwap ?? {};
   const pairsBySlug = global.swapPairs?.bySlug;
-  const userTokens = selectAvailableUserForSwapTokens(global);
+  const userTokens = selectAvailableUserForSwapTokens(global, ownProps.isSwapOut);
   const popularTokens = selectPopularTokens(global);
   const swapTokens = selectSwapTokens(global);
   const isMultichain = selectIsMultichainAccount(global, global.currentAccountId!);

src/components/common/TokenSelector.tsx

@@ -60,9 +60,11 @@ function OnRampWidgetModal({
 
   const dropdownItems = useMemo<DropdownItem<ApiBaseCurrency>[]>(
     () => Object.entries(CURRENCIES)
-      .filter(([currency]) => SUPPORTED_CURRENCIES.has(currency as ApiBaseCurrency))
+      .filter(([currency]) => {
+        return SUPPORTED_CURRENCIES.has(currency as ApiBaseCurrency) && (chain !== 'tron' || currency !== 'RUB');
+      })
       .map(([currency, { name }]) => ({ value: currency as ApiBaseCurrency, name })),
-    [],
+    [chain],
   );
 
   useEffect(() => {
@@ -89,11 +91,8 @@ function OnRampWidgetModal({
     const cardType = getCardType(chain, selectedCurrency);
 
     if (cardType === 'avanchange') {
-      if (chain === 'ton') {
-        setIframeSrc(buildAvanchangeUrl(address));
-      } else {
-        handleError(lang('Purchasing TRON with Russian Rubles is currently unavailable.'));
-      }
+      setIframeSrc(buildAvanchangeUrl(address));
+
       return;
     }
 

src/components/main/modals/OnRampWidgetModal.tsx

@@ -150,7 +150,7 @@ $iconGapSize: 1rem;
 
   &_compact {
     grid-template-columns: 1fr 1fr;
-    max-width: calc(66% + 1rem);
+    max-width: 15rem;
   }
 
   .container:global(.closing) > & {

src/components/main/sections/Header/AccountSelector.module.scss

@@ -273,6 +273,7 @@ function SwapModal({
             isActive={isActive}
             shouldUseSwapTokens
             shouldFilter={currentKey === SwapState.SelectTokenTo}
+            isSwapOut={currentKey === SwapState.SelectTokenTo}
             onTokenSelect={handleTokenSelect}
             onBack={handleBackClick}
             onClose={handleModalCloseWithReset}