Fix empty balance from chain for contracts without state

MXzander · Jul 4, 2024 · c5f2504 · c5f2504
1 parent ee3cd0e
commit c5f2504
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 41 deletions.
diff --git a/package.json b/package.json
@@ -118,5 +118,6 @@
     "prettier": "^3.2.5",
     "typescript": "^5.3.3",
     "vite": "^5.2.11"
-  }
+  },
+  "packageManager": "pnpm@8.6.7+sha512.bd1216a43fcbe2985ff41936a3f3b64c347c7c5a099e962ba764caa9321917fa99dbfae02f7a8a5f31e87c781b5ec8a7c0ca12122833dbcb2a937a50fb230441"
 }
diff --git a/src/components/IndexPage/SessionsList.tsx b/src/components/IndexPage/SessionsList.tsx
@@ -82,7 +82,7 @@ export function SessionsList() {
                     className={'px-2'}
                     // className="cursor-pointer text-accent dark:text-accent-light"
                     onClick={async (e) => {
-                      if (e.ctrlKey) {
+                      if (e.ctrlKey || e.metaKey) {
                         e.preventDefault()
                         e.stopPropagation()
                         deleteTonConnectSession(s)
@@ -101,7 +101,7 @@ export function SessionsList() {
                       Your session will be deleted, and will disconnect from service
                     </AlertDialogDescription>
                     <AlertDialogDescription>
-                      To close session without confirm popup use Ctrl + Click
+                      To close session without confirm popup use Ctrl + Click or CMD + Click
                     </AlertDialogDescription>
                   </AlertDialogHeader>
                   <AlertDialogFooter>
@@ -125,7 +125,7 @@ export function SessionsList() {
               </div>
               <div className="flex">
                 <div>SubId:&nbsp;</div>
-                <div>{tonWallet?.subwalletId || 'Default'}</div>
+                <div>{tonWallet?.subwalletId.toString() || 'Default'}</div>
               </div>
             </div>
 

diff --git a/src/hooks/useEmulatedTxInfo.ts b/src/hooks/useEmulatedTxInfo.ts
diff --git a/src/store/tonConnect.ts b/src/store/tonConnect.ts
@@ -151,30 +151,35 @@ export async function setTonConnectSessionAutoSend({
 export async function deleteTonConnectSession(session: State<TonConnectSession>) {
   // const session =
 
-  await sendTonConnectMessage(
-    {
-      event: 'disconnect',
-      payload: {},
-      id: Date.now(),
-    },
-    session?.secretKey.get() || Buffer.from(''),
-    session?.userId?.get() || ''
-  )
-
-  const db = await getDatabase()
-  await db<ConnectMessageTransaction>('connect_message_transactions')
-    .where({
-      connect_session_id: session.id.get(),
-    })
-    .delete()
-  await db<ConnectSession>('connect_sessions')
-    .where({
-      id: session.id.get(),
-    })
-    .delete()
-
-  state.sessions.set(await getSessions())
-  await removeConnectMessages()
+  try {
+    await sendTonConnectMessage(
+      {
+        event: 'disconnect',
+        payload: {},
+        id: Date.now(),
+      },
+      session?.secretKey.get() || Buffer.from(''),
+      session?.userId?.get() || ''
+    )
+
+    const db = await getDatabase()
+    await db<ConnectMessageTransaction>('connect_message_transactions')
+      .where({
+        connect_session_id: session.id.get(),
+      })
+      .delete()
+    await db<ConnectSession>('connect_sessions')
+      .where({
+        id: session.id.get(),
+      })
+      .delete()
+
+    state.sessions.set(await getSessions())
+    await removeConnectMessages()
+  } catch (e) {
+    console.log('Delete session error', e)
+    throw e
+  }
 }
 
 export async function updateSessionEventId(id: number, eventId: number) {

diff --git a/src/utils/liteClientBlockchainStorage.ts b/src/utils/liteClientBlockchainStorage.ts
@@ -27,6 +27,7 @@ export class LiteClientBlockchainStorage implements BlockchainStorage {
         !account.state.storage.state.state.code
       ) {
         existing = SmartContract.empty(blockchain, address)
+        existing.balance = BigInt(account.balance.coins)
       } else {
         existing = SmartContract.create(blockchain, {
           address,