v3.3.3

changelogs/3.3.3.txt

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

jest.config.js

@@ -1,5 +1,7 @@
+const babelConfig = require('./babel.config');
+
 module.exports = {
-  setupFilesAfterEnv: ['./tests/init.js'],
+  setupFilesAfterEnv: ['./tests/init.ts'],
   moduleNameMapper: {
     '\\.(css|scss|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga|tgs)$':
       '<rootDir>/tests/staticFileMock.js',
@@ -11,10 +13,15 @@ module.exports = {
   ],
   testEnvironment: 'jest-environment-jsdom',
   transform: {
-    '\\.(jsx?|tsx?)$': 'babel-jest',
+    '\\.(jsx?|tsx?)$': ['babel-jest', {
+      ...babelConfig,
+      plugins: [...babelConfig.plugins, 'babel-plugin-transform-import-meta'],
+    }],
     '\\.txt$': 'jest-raw-loader',
   },
   transformIgnorePatterns: [
-    '/node_modules/(?!(axios)/)',
+    '/node_modules/(?!(axios|@capgo)/)',
   ],
+  // Fixes https://github.com/jestjs/jest/issues/11617 (expected to be fixed properly in Jest 30.0.0)
+  maxWorkers: 1,
 };

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

@@ -26,6 +26,7 @@ npx cap sync
 * [`closeSelf(...)`](#closeself)
 * [`toggleSelfFullSize(...)`](#toggleselffullsize)
 * [`openInMain(...)`](#openinmain)
+* [`isShown()`](#isshown)
 * [`addListener('delegate', ...)`](#addlistenerdelegate)
 * [`addListener('move', ...)`](#addlistenermove)
 * [`addListener('openInMain', ...)`](#addlisteneropeninmain)
@@ -178,6 +179,17 @@ openInMain(options: { key: BottomSheetKeys; }) => Promise<void>
 --------------------
 
 
+### isShown()
+
+```typescript
+isShown() => Promise<{ value: boolean; }>
+```
+
+**Returns:** <code>Promise&lt;{ value: boolean; }&gt;</code>
+
+--------------------
+
+
 ### addListener('delegate', ...)
 
 ```typescript
@@ -241,6 +253,6 @@ addListener(eventName: 'openInMain', handler: (options: { key: BottomSheetKeys;
 
 #### BottomSheetKeys
 
-<code>'initial' | 'receive' | 'invoice' | 'transfer' | 'swap' | 'stake' | 'unstake' | 'staking-info' | 'vesting-info' | 'vesting-confirm' | 'transaction-info' | 'swap-activity' | 'backup' | 'add-account' | 'settings' | 'qr-scanner' | 'dapp-connect' | 'dapp-transfer' | 'disclaimer' | 'backup-warning' | 'onramp-widget'</code>
+<code>'initial' | 'receive' | 'invoice' | 'transfer' | 'swap' | 'stake' | 'unstake' | 'staking-info' | 'staking-claim' | 'vesting-info' | 'vesting-confirm' | 'transaction-info' | 'swap-activity' | 'backup' | 'add-account' | 'settings' | 'qr-scanner' | 'dapp-connect' | 'dapp-transfer' | 'disclaimer' | 'backup-warning' | 'onramp-widget'</code>
 
 </docgen-api>

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

@@ -181,6 +181,16 @@
         ],
         "slug": "openinmain"
       },
+      {
+        "name": "isShown",
+        "signature": "() => Promise<{ value: boolean; }>",
+        "parameters": [],
+        "returns": "Promise<{ value: boolean; }>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "isshown"
+      },
       {
         "name": "addListener",
         "signature": "(eventName: 'delegate', handler: (options: { key: BottomSheetKeys; globalJson: string; }) => void) => Promise<PluginListenerHandle> & PluginListenerHandle",
@@ -312,6 +322,10 @@
           "text": "'staking-info'",
           "complexTypes": []
         },
+        {
+          "text": "'staking-claim'",
+          "complexTypes": []
+        },
         {
           "text": "'vesting-info'",
           "complexTypes": []

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

@@ -1,4 +1,4 @@
-import { PluginListenerHandle } from '@capacitor/core';
+import type { PluginListenerHandle } from '@capacitor/core';
 export declare type BottomSheetKeys = 'initial' | 'receive' | 'invoice' | 'transfer' | 'swap' | 'stake' | 'unstake' | 'staking-info' | 'staking-claim' | 'vesting-info' | 'vesting-confirm' | 'transaction-info' | 'swap-activity' | 'backup' | 'add-account' | 'settings' | 'qr-scanner' | 'dapp-connect' | 'dapp-transfer' | 'disclaimer' | 'backup-warning' | 'onramp-widget';
 export interface BottomSheetPlugin {
     prepare(): Promise<void>;
@@ -29,6 +29,9 @@ export interface BottomSheetPlugin {
     openInMain(options: {
         key: BottomSheetKeys;
     }): Promise<void>;
+    isShown(): Promise<{
+        value: boolean;
+    }>;
     addListener(eventName: 'delegate', handler: (options: {
         key: BottomSheetKeys;
         globalJson: string;

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

@@ -17,4 +17,5 @@
            CAP_PLUGIN_METHOD(enable, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(hide, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(show, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(isShown, CAPPluginReturnPromise);
 )

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

@@ -289,6 +289,10 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
         }
     }
 
+    @objc func isShown(_ call: CAPPluginCall) {
+        call.resolve(["value": fpc.state != .hidden])
+    }
+
     // Extra security level, potentially redundant
     private func ensureLocalOrigin() {
         DispatchQueue.main.sync { [self] in

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

@@ -1,4 +1,4 @@
-import { PluginListenerHandle } from '@capacitor/core';
+import type { PluginListenerHandle } from '@capacitor/core';
 
 export type BottomSheetKeys =
   'initial'
@@ -9,6 +9,7 @@ export type BottomSheetKeys =
   | 'stake'
   | 'unstake'
   | 'staking-info'
+  | 'staking-claim'
   | 'vesting-info'
   | 'vesting-confirm'
   | 'transaction-info'
@@ -50,6 +51,8 @@ export interface BottomSheetPlugin {
 
   openInMain(options: { key: BottomSheetKeys }): Promise<void>;
 
+  isShown(): Promise<{ value: boolean }>;
+
   addListener(
     eventName: 'delegate',
     handler: (options: { key: BottomSheetKeys, globalJson: string }) => void,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mytonwallet",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "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": {
@@ -120,6 +120,7 @@
     "@webpack-cli/serve": "2.0.5",
     "autoprefixer": "10.4.20",
     "babel-loader": "9.2.1",
+    "babel-plugin-transform-import-meta": "2.3.2",
     "before-build-webpack": "0.2.15",
     "browserlist": "1.0.1",
     "concurrently": "7.6.0",

public/version.txt

@@ -1 +1 @@
-3.3.2
+3.3.3

src/api/chains/ton/swap.ts

@@ -16,6 +16,7 @@ import { assert } from '../../../util/assert';
 import { fromDecimal } from '../../../util/decimals';
 import { logDebugError } from '../../../util/logs';
 import { pause } from '../../../util/schedulers';
+import { isTokenTransferPayload } from '../../../util/ton/transfer';
 import { parseTxId } from './util';
 import { parsePayloadBase64 } from './util/metadata';
 import { resolveTokenWalletAddress, toBase64Address } from './util/tonCore';
@@ -77,7 +78,7 @@ export async function validateDexSwapTransfers(
       assert(mainTransfer.toAddress === token.tokenAddress);
     } else {
       assert(mainTransfer.toAddress === walletAddress);
-      assert(['tokens:transfer', 'tokens:transfer-non-standard'].includes(parsedPayload.type));
+      assert(isTokenTransferPayload(parsedPayload));
 
       ({ amount: tokenAmount, destination } = parsedPayload as ApiTokensTransferPayload);
       assert(tokenAmount <= maxAmount);
@@ -94,7 +95,7 @@ export async function validateDexSwapTransfers(
 
       assert(feeTransfer.amount + mainTransfer.amount < maxTonAmount);
       assert(feeTransfer.toAddress === walletAddress);
-      assert(['tokens:transfer', 'tokens:transfer-non-standard'].includes(feePayload.type));
+      assert(isTokenTransferPayload(feePayload));
 
       const { amount: tokenFeeAmount, destination: feeDestination } = feePayload as ApiTokensTransferPayload;