v1.18.8

changelogs/1.18.8.txt

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

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

@@ -22,7 +22,7 @@ npx cap sync
 * [`release(...)`](#release)
 * [`openSelf(...)`](#openself)
 * [`closeSelf(...)`](#closeself)
-* [`setFullSize(...)`](#setfullsize)
+* [`toggleSelfFullSize(...)`](#toggleselffullsize)
 * [`openInMain(...)`](#openinmain)
 * [`addListener('delegate', ...)`](#addlistenerdelegate)
 * [`addListener('move', ...)`](#addlistenermove)
@@ -132,15 +132,15 @@ closeSelf(options: { key: BottomSheetKeys; }) => Promise<void>
 --------------------
 
 
-### setFullSize(...)
+### toggleSelfFullSize(...)
 
 ```typescript
-setFullSize(options: { isEnabled: boolean; }) => Promise<void>
+toggleSelfFullSize(options: { isFullSize: boolean; }) => Promise<void>
 ```
 
-| Param         | Type                                 |
-| ------------- | ------------------------------------ |
-| **`options`** | <code>{ isEnabled: boolean; }</code> |
+| Param         | Type                                  |
+| ------------- | ------------------------------------- |
+| **`options`** | <code>{ isFullSize: boolean; }</code> |
 
 --------------------
 

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

@@ -128,20 +128,20 @@
         "slug": "closeself"
       },
       {
-        "name": "setFullSize",
-        "signature": "(options: { isEnabled: boolean; }) => Promise<void>",
+        "name": "toggleSelfFullSize",
+        "signature": "(options: { isFullSize: boolean; }) => Promise<void>",
         "parameters": [
           {
             "name": "options",
             "docs": "",
-            "type": "{ isEnabled: boolean; }"
+            "type": "{ isFullSize: boolean; }"
           }
         ],
         "returns": "Promise<void>",
         "tags": [],
         "docs": "",
         "complexTypes": [],
-        "slug": "setfullsize"
+        "slug": "toggleselffullsize"
       },
       {
         "name": "openInMain",

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

@@ -21,8 +21,8 @@ export interface BottomSheetPlugin {
     closeSelf(options: {
         key: BottomSheetKeys;
     }): Promise<void>;
-    setFullSize(options: {
-        isEnabled: boolean;
+    toggleSelfFullSize(options: {
+        isFullSize: boolean;
     }): Promise<void>;
     openInMain(options: {
         key: BottomSheetKeys;

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

@@ -9,7 +9,7 @@
            CAP_PLUGIN_METHOD(release, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(openSelf, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(closeSelf, CAPPluginReturnPromise);
-           CAP_PLUGIN_METHOD(setFullSize, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(toggleSelfFullSize, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(openInMain, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(applyScrollPatch, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(clearScrollPatch, CAPPluginReturnPromise);

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

@@ -22,7 +22,7 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
     public var currentOpenSelfCall: CAPPluginCall?
     var currentHalfY: CGFloat?
     var prevStatusBarStyle: UIStatusBarStyle?
-    var wasHalfSize = true
+    public var isHalfSize = false
 
     @objc func prepare(_ call: CAPPluginCall) {
         ensureLocalOrigin()
@@ -192,7 +192,7 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
         }
     }
 
-    @objc func setFullSize(_ call: CAPPluginCall) {
+    @objc func toggleSelfFullSize(_ call: CAPPluginCall) {
         ensureLocalOrigin()
         ensureDelegated()
 
@@ -205,25 +205,19 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
 
             let topVc = self.bridge!.viewController!.parent!.presentingViewController as! CAPBridgeViewController
             let topBottomSheetPlugin = topVc.bridge!.plugin(withName: "BottomSheet") as! BottomSheetPlugin
-            let isFullSizeEnabled = call.getBool("isEnabled") == true
-            let layout = topBottomSheetPlugin.fpc.layout as! MyPanelLayout
 
-            if isFullSizeEnabled {
-                if layout.anchors[.full] != nil {
-                    return
-                }
+            if !topBottomSheetPlugin.isHalfSize {
+                return
+            }
 
-                wasHalfSize = true
-                layout.anchors[.full] = layout.fullAnchor
-                topBottomSheetPlugin.animateTo(to: .full)
-            } else {
-                if !wasHalfSize {
-                    return
-                }
+            let isFullSize = call.getBool("isFullSize") == true
+            let layout = topBottomSheetPlugin.fpc.layout as! MyPanelLayout
 
-                layout.anchors[.full] = nil
-                topBottomSheetPlugin.animateTo(to: .half)
+            if isFullSize && layout.anchors[.full] == nil {
+                layout.anchors[.full] = layout.fullAnchor
             }
+
+            topBottomSheetPlugin.animateTo(to: isFullSize ? .full : .half)
         }
     }
 
@@ -269,12 +263,14 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
             currentHalfY = screenHeight - screenHeight * newFractionalInset
             toggleExtraScroll(false)
             animateTo(to: .half)
+            isHalfSize = true
         } else {
             layout.anchors[.half] = nil
             layout.anchors[.full] = layout.fullAnchor
             currentHalfY = screenHeight - screenHeight * HALF_FRACTIONAL_INSET
             toggleExtraScroll(true)
             animateTo(to: .full)
+            isHalfSize = false
         }
     }
 
@@ -285,7 +281,7 @@ public class BottomSheetPlugin: CAPPlugin, FloatingPanelControllerDelegate {
             return
         }
 
-        wasHalfSize = false
+        isHalfSize = false
         animateTo(to: .hidden)
     }
 

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

@@ -40,7 +40,7 @@ export interface BottomSheetPlugin {
 
   closeSelf(options: { key: BottomSheetKeys }): Promise<void>;
 
-  setFullSize(options: { isEnabled: boolean }): Promise<void>;
+  toggleSelfFullSize(options: { isFullSize: boolean }): Promise<void>;
 
   openInMain(options: { key: BottomSheetKeys }): Promise<void>;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "mytonwallet",
-  "version": "1.18.7",
+  "version": "1.18.8",
   "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.18.7
+1.18.8

src/api/common/helpers.ts

@@ -279,10 +279,10 @@ export async function migrateStorage(onUpdate: OnApiUpdate) {
           await apiDb.sseConnections.bulkPut(items);
         }
       }
-
-      version = 9;
-      await storage.setItem('stateVersion', version);
     }
+
+    version = 9;
+    await storage.setItem('stateVersion', version);
   }
 
   if (version === 9) {

src/components/swap/Swap.module.scss

@@ -264,6 +264,8 @@
 }
 
 .footerBlock {
+  --background-color: var(--color-background-window);
+
   display: flex;
   flex-direction: column;
   gap: 1rem;
@@ -273,6 +275,8 @@
 }
 
 .footerBlockStatic {
+  --background-color: var(--color-background-first);
+
   margin-top: 2rem;
 }
 
@@ -409,7 +413,7 @@
   height: 2.75rem;
 
   :global(.Transition_slide) {
-    background: var(--color-background-first);
+    background: var(--background-color);
   }
 }
 

src/components/ui/Modal.tsx

@@ -103,8 +103,8 @@ function Modal({
   useEffect(() => {
     if (!IS_DELEGATED_BOTTOM_SHEET || !isCompact) return;
 
-    // Expand NBS to full size for a compact modal window inside NBS
-    BottomSheet.setFullSize({ isEnabled: !!isOpen });
+    // Expand NBS to full size for a compact modal inside NBS
+    BottomSheet.toggleSelfFullSize({ isFullSize: !!isOpen });
   }, [isCompact, isOpen]);
 
   useEffect(

src/hooks/useDelegatedBottomSheet.ts

@@ -99,7 +99,7 @@ export function useDelegatedBottomSheet(
     // Skip initial opening
     if (forceFullNative !== undefined && prevForceFullNative === undefined) return;
 
-    BottomSheet.setFullSize({ isEnabled: forceFullNative });
+    BottomSheet.toggleSelfFullSize({ isFullSize: forceFullNative });
   }, [forceFullNative, isDelegatedAndOpen]);
 
   useLayoutEffect(() => {
@@ -121,7 +121,7 @@ export function useDelegatedBottomSheet(
 
       preventScrollOnFocus(dialogEl);
 
-      BottomSheet.setFullSize({ isEnabled: true });
+      BottomSheet.toggleSelfFullSize({ isFullSize: true });
     }
 
     function onBlur(e: FocusEvent) {
@@ -131,7 +131,7 @@ export function useDelegatedBottomSheet(
 
       blurTimeout = window.setTimeout(() => {
         blurTimeout = undefined;
-        BottomSheet.setFullSize({ isEnabled: false });
+        BottomSheet.toggleSelfFullSize({ isFullSize: false });
       }, BLUR_TIMEOUT);
     }
 

src/styles/brilliant-icons.css

@@ -1,7 +1,7 @@
 @font-face {
     font-family: "brilliant-icons";
-    src: url("./brilliant-icons.woff?3fc0a837f7566a3ce86e0bd263244e2c") format("woff"),
-url("./brilliant-icons.woff2?3fc0a837f7566a3ce86e0bd263244e2c") format("woff2");
+    src: url("./brilliant-icons.woff?d636859954b719dfc53722a9306dc08e") format("woff"),
+url("./brilliant-icons.woff2?d636859954b719dfc53722a9306dc08e") format("woff2");
     font-weight: normal;
     font-style: normal;
 }