v1.17.16

changelogs/1.17.16.txt

@@ -0,0 +1 @@
+Bug fixes

mobile/plugins/native-bottom-sheet/README.md

@@ -16,6 +16,8 @@ npx cap sync
 * [`prepare()`](#prepare)
 * [`applyScrollPatch()`](#applyscrollpatch)
 * [`clearScrollPatch()`](#clearscrollpatch)
+* [`disable()`](#disable)
+* [`enable()`](#enable)
 * [`delegate(...)`](#delegate)
 * [`release(...)`](#release)
 * [`openSelf(...)`](#openself)
@@ -60,6 +62,24 @@ clearScrollPatch() => Promise<void>
 --------------------
 
 
+### disable()
+
+```typescript
+disable() => Promise<void>
+```
+
+--------------------
+
+
+### enable()
+
+```typescript
+enable() => Promise<void>
+```
+
+--------------------
+
+
 ### delegate(...)
 
 ```typescript

mobile/plugins/native-bottom-sheet/dist/docs.json

@@ -35,6 +35,26 @@
         "complexTypes": [],
         "slug": "clearscrollpatch"
       },
+      {
+        "name": "disable",
+        "signature": "() => Promise<void>",
+        "parameters": [],
+        "returns": "Promise<void>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "disable"
+      },
+      {
+        "name": "enable",
+        "signature": "() => Promise<void>",
+        "parameters": [],
+        "returns": "Promise<void>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "enable"
+      },
       {
         "name": "delegate",
         "signature": "(options: { key: BottomSheetKeys; globalJson: string; }) => Promise<void>",

mobile/plugins/native-bottom-sheet/dist/esm/definitions.d.ts

@@ -4,6 +4,8 @@ export interface BottomSheetPlugin {
     prepare(): Promise<void>;
     applyScrollPatch(): Promise<void>;
     clearScrollPatch(): Promise<void>;
+    disable(): Promise<void>;
+    enable(): Promise<void>;
     delegate(options: {
         key: BottomSheetKeys;
         globalJson: string;

mobile/plugins/native-bottom-sheet/ios/Plugin/BottomSheetPlugin.m

@@ -13,4 +13,6 @@
            CAP_PLUGIN_METHOD(openInMain, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(applyScrollPatch, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(clearScrollPatch, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(disable, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(enable, CAPPluginReturnPromise);
 )

mobile/plugins/native-bottom-sheet/ios/Plugin/BottomSheetPlugin.swift

@@ -61,6 +61,45 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
         }
     }
 
+    @objc func disable(_ call: CAPPluginCall) {
+        ensureLocalOrigin()
+        ensureDelegating()
+
+        DispatchQueue.main.async { [self] in
+            if let presentingVc = self.fpc.presentingViewController {
+                presentingVc.dismiss(animated: false) {
+                    call.resolve()
+                }
+            } else {
+                call.resolve()
+            }
+        }
+    }
+
+    @objc func enable(_ call: CAPPluginCall) {
+        ensureLocalOrigin()
+        ensureDelegating()
+
+        DispatchQueue.main.async { [self] in
+            if (self.fpc.presentingViewController != nil) {
+                call.resolve()
+                return
+            }
+
+            if let presentedVc = self.bridge!.viewController!.presentedViewController {
+                presentedVc.dismiss(animated: false) {
+                    self.bridge?.viewController?.present(self.fpc, animated: false) {
+                        call.resolve()
+                    }
+                }
+            } else {
+                self.bridge?.viewController?.present(self.fpc, animated: false) {
+                    call.resolve()
+                }
+            }
+        }
+    }
+
     @objc func applyScrollPatch(_ call: CAPPluginCall) {
         DispatchQueue.main.async { [self] in
             let topVc = bridge!.viewController!.parent!.presentingViewController as! CAPBridgeViewController

mobile/plugins/native-bottom-sheet/src/definitions.ts

@@ -27,6 +27,10 @@ export interface BottomSheetPlugin {
 
   clearScrollPatch(): Promise<void>;
 
+  disable(): Promise<void>;
+
+  enable(): Promise<void>;
+
   delegate(options: { key: BottomSheetKeys, globalJson: string }): Promise<void>;
 
   release(options: { key: BottomSheetKeys | '*' }): Promise<void>;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mytonwallet",
-  "version": "1.17.15",
+  "version": "1.17.16",
   "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": {

public/version.txt

@@ -1 +1 @@
-1.17.15
+1.17.16

src/api/blockchains/ton/util/tonapiio.ts

@@ -11,16 +11,19 @@ let apiByNetwork: Record<ApiNetwork, Api<unknown>> | undefined;
 
 function getApi(network: ApiNetwork) {
   if (!apiByNetwork) {
-    const headers = getEnvironment().apiHeaders;
+    const headers = {
+      ...getEnvironment().apiHeaders,
+      'Content-Type': 'application/json',
+    };
 
     apiByNetwork = {
       mainnet: new Api(new HttpClient({
         baseUrl: TONAPIIO_MAINNET_URL,
-        ...(headers && { baseApiParams: { headers } }),
+        baseApiParams: { headers },
       })),
       testnet: new Api(new HttpClient({
         baseUrl: TONAPIIO_TESTNET_URL,
-        ...(headers && { baseApiParams: { headers } }),
+        baseApiParams: { headers },
       })),
     };
   }

src/api/common/helpers.ts

@@ -1,4 +1,5 @@
 import type { ApiTransactionExtra } from '../blockchains/ton/types';
+import type { ApiDbSseConnection } from '../db';
 import type { StorageKey } from '../storages/types';
 import type {
   AccountIdParsed,
@@ -12,14 +13,16 @@ import type {
 import { IS_EXTENSION, MAIN_ACCOUNT_ID } from '../../config';
 import { buildAccountId, parseAccountId } from '../../util/account';
 import { toBase64Address } from '../blockchains/ton/util/tonweb';
+import { apiDb } from '../db';
+import { getEnvironment } from '../environment';
 import { storage } from '../storages';
 import idbStorage from '../storages/idb';
 import { getKnownAddresses, getScamMarkers } from './addresses';
 
 let localCounter = 0;
 const getNextLocalId = () => `${Date.now()}|${localCounter++}`;
 
-const actualStateVersion = 8;
+const actualStateVersion = 9;
 let migrationEnsurePromise: Promise<void>;
 
 export function resolveBlockchainKey(accountId: string) {
@@ -248,4 +251,29 @@ export async function migrateStorage(onUpdate: OnApiUpdate) {
     version = 8;
     await storage.setItem('stateVersion', version);
   }
+
+  if (version === 8) {
+    if (getEnvironment().isSseSupported) {
+      const dapps = await storage.getItem('dapps');
+
+      if (dapps) {
+        const items: ApiDbSseConnection[] = [];
+
+        for (const accountDapps of Object.values(dapps) as any[]) {
+          for (const dapp of Object.values(accountDapps) as any[]) {
+            if (dapp.sse?.appClientId) {
+              items.push({ clientId: dapp.sse?.appClientId });
+            }
+          }
+        }
+
+        if (items.length) {
+          await apiDb.sseConnections.bulkPut(items);
+        }
+      }
+
+      version = 9;
+      await storage.setItem('stateVersion', version);
+    }
+  }
 }

src/api/db.ts

@@ -8,16 +8,25 @@ export type ApiDbNft = ApiNft & {
   collectionAddress: string;
 };
 
+export type ApiDbSseConnection = {
+  clientId: string;
+};
+
 const DB_NANE = 'tables';
 
 export class ApiDb extends Dexie {
   nfts!: Table<ApiDbNft>;
 
+  sseConnections!: Table<ApiDbSseConnection>;
+
   constructor() {
     super(DB_NANE);
     this.version(1).stores({
       nfts: '[accountId+address], accountId, address, collectionAddress',
     });
+    this.version(2).stores({
+      sseConnections: '&clientId',
+    });
   }
 }
 

src/api/tonConnect/index.ts

@@ -107,11 +107,6 @@ export async function connect(
 
     await openExtensionPopup(true);
 
-    onPopupUpdate({
-      type: 'dappLoading',
-      connectionType: 'connect',
-    });
-
     let accountId = await getCurrentAccountOrFail();
     const isConnected = await isDappConnected(accountId, origin);
 
@@ -122,6 +117,11 @@ export async function connect(
     } | undefined;
 
     if (!isConnected || proof) {
+      onPopupUpdate({
+        type: 'dappLoading',
+        connectionType: 'connect',
+      });
+
       const { promiseId, promise } = createDappPromise();
 
       const dapp = {

src/api/tonConnect/sse.ts

@@ -16,6 +16,7 @@ import { logDebug, logDebugError } from '../../util/logs';
 import safeExec from '../../util/safeExec';
 import { getCurrentNetwork, waitLogin } from '../common/accounts';
 import { bytesToHex, handleFetchErrors } from '../common/utils';
+import { apiDb } from '../db';
 import {
   getDappsState,
   getSseLastEventId,
@@ -40,14 +41,19 @@ let sseDapps: SseDapp[] = [];
 export async function startSseConnection(url: string, deviceInfo: DeviceInfo): Promise<ReturnStrategy | undefined> {
   const params = new URL(url).searchParams;
 
-  const ret = params.get('ret') as ReturnStrategy | null;
+  const ret: ReturnStrategy = params.get('ret') || 'back';
+  const version = Number(params.get('v') as string);
+  const appClientId = params.get('id') as string;
+
+  if (!params.get('r')) {
+    return undefined;
+  }
 
-  if (!ret || !params.get('r')) {
+  if (await apiDb.sseConnections.get(appClientId)) {
+    // Avoid re-processing link
     return ret ?? undefined;
   }
 
-  const version = Number(params.get('v') as string);
-  const appClientId = params.get('id') as string;
   const connectRequest = JSON.parse(params.get('r') as string) as ConnectRequest;
   const { origin } = await tonConnect.fetchDappMetadata(connectRequest.manifestUrl);
 
@@ -79,6 +85,8 @@ export async function startSseConnection(url: string, deviceInfo: DeviceInfo): P
 
   await sendMessage(result, secretKey, clientId, appClientId);
 
+  await apiDb.sseConnections.put({ clientId: appClientId });
+
   if (result.event !== 'connect_error') {
     await resetupSseConnection();
   }

src/components/common/TokenSelector.tsx

@@ -243,6 +243,8 @@ function TokenSelector({
   }, [isActive]);
 
   const handleTokenClick = useLastCallback((selectedToken: Token) => {
+    searchInputRef.current?.blur();
+
     if (isPortrait) {
       onBack();
     } else {

src/components/main/sections/Content/Content.tsx

@@ -38,13 +38,15 @@ interface StateProps {
   isNftSupported: boolean;
   tokensCount: number;
   activeContentTab?: ContentTab;
+  currentTokenSlug?: string;
 }
 
 function Content({
   activeContentTab,
   tokensCount,
   onStakedTokenClick,
   isNftSupported,
+  currentTokenSlug,
 }: OwnProps & StateProps) {
   const {
     selectToken,
@@ -126,6 +128,13 @@ function Content({
     });
   }, [TABS, handleSwitchTab, activeTabIndex]);
 
+  useEffect(() => {
+    if (currentTokenSlug !== undefined) return;
+
+    setDefaultSwapParams({ tokenInSlug: undefined, tokenOutSlug: undefined });
+    changeTransferToken({ tokenSlug: TON_TOKEN_SLUG });
+  }, [currentTokenSlug]);
+
   const handleClickAsset = useLastCallback((slug: string) => {
     selectToken({ slug });
 
@@ -221,6 +230,7 @@ export default memo(
         tokensCount,
         isNftSupported: !isLedger,
         activeContentTab: accountState?.activeContentTab,
+        currentTokenSlug: accountState?.currentTokenSlug,
       };
     },
     (global, _, stickToFirst) => stickToFirst(global.currentAccountId),

src/components/receive/InvoiceModal.tsx

@@ -69,7 +69,7 @@ function InvoiceModal({
   const handleAmountInput = useLastCallback((stringValue?: string) => {
     setHasAmountError(false);
 
-    if (stringValue === undefined) {
+    if (!stringValue) {
       setAmount(undefined);
       return;
     }

src/components/staking/StakingInitial.tsx

@@ -226,7 +226,7 @@ function StakingInitial({
 
     const minusOneLink = (
       <a href="#" onClick={handleMinusOneClick} className={styles.balanceLink}>
-        {formatCurrency(toDecimal(ONE_TON), symbol)}
+        {formatCurrency(toDecimal(-ONE_TON), symbol)}
       </a>
     );