diff --git a/package-lock.json b/package-lock.json
index b994a0f..7813742 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18,7 +18,7 @@
         "@testing-library/jest-dom": "^5.16.4",
         "@testing-library/react": "^13.3.0",
         "@testing-library/user-event": "^13.5.0",
-        "@tonconnect/ui-react": "^1.0.0-beta.6",
+        "@ton-defi.org/ton-connection": "^0.8.1",
         "@types/jest": "^27.5.1",
         "@types/node": "^16.11.36",
         "@types/react": "^18.0.9",
@@ -3513,6 +3513,11 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@openland/patterns": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@openland/patterns/-/patterns-0.0.2.tgz",
+      "integrity": "sha512-ttgJELwtG8cIER1JeWjkIMg3e+MlAL6n4wFPSNPoBCl+5t3G/HIz9kolvxBmN5/3RXEgh68NnePzGiUBaUHmRQ=="
+    },
     "node_modules/@orbs-network/ton-access": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/@orbs-network/ton-access/-/ton-access-2.2.2.tgz",
@@ -4194,61 +4199,60 @@
         "@testing-library/dom": ">=7.21.4"
       }
     },
-    "node_modules/@tonconnect/isomorphic-eventsource": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@tonconnect/isomorphic-eventsource/-/isomorphic-eventsource-0.0.1.tgz",
-      "integrity": "sha512-ODk48pMlqLSOvu3fM0R1sdlz/Cv2y4hSfwtXmLq9ky9+H7ZQfw/16ElpIJ69B4lUvHycxrueNgrRtF9PJHoGMw==",
+    "node_modules/@ton-defi.org/ton-connection": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@ton-defi.org/ton-connection/-/ton-connection-0.8.1.tgz",
+      "integrity": "sha512-p3uHra5Ye8P6a4xUz7aP6wPFilEDiivHASI69VGenbnGTEE0LFizUQWnhdkwTiUh/YanJWnza8CTgXZc2EPbvA==",
       "dependencies": {
-        "eventsource": "^2.0.2"
+        "@aws-crypto/sha256-js": "^2.0.1",
+        "@tonconnect/sdk": "^2.0.7",
+        "axios-request-throttle": "^1.0.0",
+        "dotenv": "^16.0.0",
+        "ton": "^12.1.5",
+        "ton-contracts": "^3.1.0",
+        "ton-crypto": "^3.1.0",
+        "ton-x": "^2.0.0-beta9"
+      },
+      "engines": {
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/@tonconnect/isomorphic-fetch": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/@tonconnect/isomorphic-fetch/-/isomorphic-fetch-0.0.2.tgz",
-      "integrity": "sha512-DAyA4oL7MqbBo9k8+8E+YiWsGCYi6UMhDTcsZjhgzhESkBNG6b+NBkpb1KH4oi0xDZQoknFtY9XogJLuQtSMQQ==",
+    "node_modules/@ton-defi.org/ton-connection/node_modules/dotenv": {
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz",
+      "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@ton-defi.org/ton-connection/node_modules/ton-crypto": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ton-crypto/-/ton-crypto-3.2.0.tgz",
+      "integrity": "sha512-fltdBNQ45gARMuGMEOjPZWPJ5eSql8p3CA0Dj7tPv5lhU5ziT8SxXLAzDraR9HJ8YpjBHLVvYyhMLRiEwxgtMQ==",
       "dependencies": {
-        "node-fetch": "^2.6.9"
+        "jssha": "3.2.0",
+        "ton-crypto-primitives": "2.0.0",
+        "tweetnacl": "1.0.3"
       }
     },
     "node_modules/@tonconnect/protocol": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@tonconnect/protocol/-/protocol-2.2.5.tgz",
-      "integrity": "sha512-kR0E+CWZl6JrE/30283v+sRiAvEu21t1xOLFx6f/BxlCNLY2wki39+L32+iicX8gn/Ig99L1flr9TAI9QW9bnQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tonconnect/protocol/-/protocol-2.0.1.tgz",
+      "integrity": "sha512-jkSj6EKjIlHnJxrtxdlO7KqVJe41yrIgqamGZiqziKH6iwx0m9YyKvuIREd6CmWY2jbsev3BvBWqPp9KH6HrRw==",
       "dependencies": {
-        "tweetnacl": "^1.0.3",
         "tweetnacl-util": "^0.15.1"
       }
     },
     "node_modules/@tonconnect/sdk": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@tonconnect/sdk/-/sdk-2.1.3.tgz",
-      "integrity": "sha512-LxHJr96NvGTqj4qSKYPPS/7fMlUpHNyj5bCNlzY5xMW8JmdgPj+jXxm5wEI00xBWy478dbE9ZaBhLMLH1V2wZw==",
-      "dependencies": {
-        "@tonconnect/isomorphic-eventsource": "^0.0.1",
-        "@tonconnect/isomorphic-fetch": "^0.0.2",
-        "@tonconnect/protocol": "^2.2.5"
-      }
-    },
-    "node_modules/@tonconnect/ui": {
-      "version": "1.0.0-beta.5",
-      "resolved": "https://registry.npmjs.org/@tonconnect/ui/-/ui-1.0.0-beta.5.tgz",
-      "integrity": "sha512-F1Z/GAsuebvmMSS5SkY90DyIYogUYNx+b7I8A2LF8nbwDVA0ImsN6oOiOl5PzOhBlNZru8LXJuUUfqgDv1ZHuw==",
-      "dependencies": {
-        "@tonconnect/sdk": "^2.1.3",
-        "classnames": "^2.3.2",
-        "deepmerge": "^4.2.2"
-      }
-    },
-    "node_modules/@tonconnect/ui-react": {
-      "version": "1.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@tonconnect/ui-react/-/ui-react-1.0.0-beta.6.tgz",
-      "integrity": "sha512-j4ziq+5JHmAI74XXodjIomqvLKEwfomJ4mv1LulYWs7izNBDwlpzIW/Un0UzsGZq9fjnuJ/A2Xb9M30j9ucOEg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@tonconnect/sdk/-/sdk-2.0.7.tgz",
+      "integrity": "sha512-MDbA5RhkVbSQQYXsLuVXLATROSQgDJSIx9Y2HIPohfU44PH6vaJ1cBrv9nogIoAQUM2tNuBXC0w+RcFT+eRTCg==",
       "dependencies": {
-        "@tonconnect/ui": "^1.0.0-beta.5"
-      },
-      "peerDependencies": {
-        "react": ">=17.0.0",
-        "react-dom": ">=17.0.0"
+        "@tonconnect/protocol": "^2.0.1",
+        "deepmerge": "^4.2.2",
+        "eventsource": "^2.0.2",
+        "node-fetch": "^2.6.7",
+        "tweetnacl": "^1.0.3"
       }
     },
     "node_modules/@tootallnate/once": {
@@ -4272,6 +4276,15 @@
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
       "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
     },
+    "node_modules/@types/axios": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz",
+      "integrity": "sha512-KqQnQbdYE54D7oa/UmYVMZKq7CO4l8DEENzOKc4aBRwxCXSlJXGz83flFx5L7AWrOQnmuN3kVsRdt+GZPPjiVQ==",
+      "deprecated": "This is a stub types definition for axios (https://github.com/mzabriskie/axios). axios provides its own type definitions, so you don't need @types/axios installed!",
+      "dependencies": {
+        "axios": "*"
+      }
+    },
     "node_modules/@types/babel__core": {
       "version": "7.1.19",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
@@ -4313,7 +4326,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.0.tgz",
       "integrity": "sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA==",
-      "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -5582,6 +5594,18 @@
         "follow-redirects": "^1.14.7"
       }
     },
+    "node_modules/axios-request-throttle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/axios-request-throttle/-/axios-request-throttle-1.0.0.tgz",
+      "integrity": "sha512-NYh7kZkgSJZyIohqrvQEzr4uygqbxXb769kbphkwgYNAJm5eDg33mqHLA2pwHKC1uqbTfNpmjmzWdUdo+ptBWg==",
+      "dependencies": {
+        "@types/axios": "^0.14.0",
+        "promise-throttle": "^1.1.2"
+      },
+      "peerDependencies": {
+        "axios": "*"
+      }
+    },
     "node_modules/axobject-query": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -6482,11 +6506,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/classnames": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
-      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
-    },
     "node_modules/clean-css": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
@@ -14005,9 +14024,9 @@
       }
     },
     "node_modules/node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "dependencies": {
         "whatwg-url": "^5.0.0"
       },
@@ -16125,6 +16144,11 @@
         "asap": "~2.0.6"
       }
     },
+    "node_modules/promise-throttle": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/promise-throttle/-/promise-throttle-1.1.2.tgz",
+      "integrity": "sha512-dij7vjyXNewuuN/gyr+TX2KRjw48mbV5FEtgyXaIoJjGYAKT0au23/voNvy9eS4UNJjx2KUdEcO5Yyfc1h7vWQ=="
+    },
     "node_modules/prompts": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -18914,6 +18938,18 @@
         "tweetnacl": "1.0.3"
       }
     },
+    "node_modules/ton-contracts": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ton-contracts/-/ton-contracts-3.1.0.tgz",
+      "integrity": "sha512-nT1CAdKsCS/XA/PMczJOgX42Cr2ZQa4NIwSifbd9M1Ukws4l7VjjFXQYPoWhEb2m43oqZqj3NO8X3WojWvFarA==",
+      "dependencies": {
+        "@openland/patterns": "^0.0.2"
+      },
+      "peerDependencies": {
+        "ton": ">=9.1.0",
+        "ton-crypto": ">=1.6.0"
+      }
+    },
     "node_modules/ton-crypto": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ton-crypto/-/ton-crypto-2.1.0.tgz",
@@ -18932,6 +18968,89 @@
         "jssha": "3.2.0"
       }
     },
+    "node_modules/ton-x": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ton-x/-/ton-x-2.0.0.tgz",
+      "integrity": "sha512-APzTmKydNVre2IaDuC8gxmVK/TcJpA5jUER+OrwxKDwRWckzFFzElxVHu6AGilljRHYd45At4QDoHTfsBkUuZA==",
+      "dependencies": {
+        "@types/bn.js": "^5.1.0",
+        "axios": "^0.27.0",
+        "bn.js": "^5.2.0",
+        "fp-ts": "^2.12.0",
+        "io-ts": "^2.2.16",
+        "teslabot": "^1.5.0",
+        "ton": "9.8.0",
+        "ton-crypto": "^3.0.0"
+      }
+    },
+    "node_modules/ton-x/node_modules/axios": {
+      "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+      "dependencies": {
+        "follow-redirects": "^1.14.9",
+        "form-data": "^4.0.0"
+      }
+    },
+    "node_modules/ton-x/node_modules/form-data": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/ton-x/node_modules/ton": {
+      "version": "9.8.0",
+      "resolved": "https://registry.npmjs.org/ton/-/ton-9.8.0.tgz",
+      "integrity": "sha512-aH/7ODiEulPRZracSfQ4KeaV6iDmzjn14+YMsZ9x0sNlzhtP4blMIFXPJFp4BOc4INb5vTrfA0u+JtOoXlBO0A==",
+      "dependencies": {
+        "axios": "^0.25.0",
+        "bn.js": "5.2.0",
+        "dataloader": "^2.0.0",
+        "ethjs-unit": "0.1.6",
+        "fp-ts": "^2.11.1",
+        "io-ts": "^2.2.16",
+        "io-ts-reporters": "^2.0.0",
+        "symbol.inspect": "1.0.1",
+        "teslabot": "^1.3.0",
+        "ton-crypto": "2.1.0",
+        "tweetnacl": "1.0.3"
+      }
+    },
+    "node_modules/ton-x/node_modules/ton-crypto": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/ton-crypto/-/ton-crypto-3.2.0.tgz",
+      "integrity": "sha512-fltdBNQ45gARMuGMEOjPZWPJ5eSql8p3CA0Dj7tPv5lhU5ziT8SxXLAzDraR9HJ8YpjBHLVvYyhMLRiEwxgtMQ==",
+      "dependencies": {
+        "jssha": "3.2.0",
+        "ton-crypto-primitives": "2.0.0",
+        "tweetnacl": "1.0.3"
+      }
+    },
+    "node_modules/ton-x/node_modules/ton/node_modules/axios": {
+      "version": "0.25.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+      "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+      "dependencies": {
+        "follow-redirects": "^1.14.7"
+      }
+    },
+    "node_modules/ton-x/node_modules/ton/node_modules/ton-crypto": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ton-crypto/-/ton-crypto-2.1.0.tgz",
+      "integrity": "sha512-PZnmCOShfgq9tCRM8E7hG8nCkpkOyZvDLPXmZN92ZEBrfTT0NKKf0imndkxG5DkgWMjc6IKfgpnEaJDH9qN6ZQ==",
+      "dependencies": {
+        "jssha": "3.2.0",
+        "ton-crypto-primitives": "2.0.0",
+        "tweetnacl": "1.0.3"
+      }
+    },
     "node_modules/tough-cookie": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
@@ -22941,6 +23060,11 @@
         "fastq": "^1.6.0"
       }
     },
+    "@openland/patterns": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/@openland/patterns/-/patterns-0.0.2.tgz",
+      "integrity": "sha512-ttgJELwtG8cIER1JeWjkIMg3e+MlAL6n4wFPSNPoBCl+5t3G/HIz9kolvxBmN5/3RXEgh68NnePzGiUBaUHmRQ=="
+    },
     "@orbs-network/ton-access": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/@orbs-network/ton-access/-/ton-access-2.2.2.tgz",
@@ -23376,57 +23500,56 @@
         "@babel/runtime": "^7.12.5"
       }
     },
-    "@tonconnect/isomorphic-eventsource": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/@tonconnect/isomorphic-eventsource/-/isomorphic-eventsource-0.0.1.tgz",
-      "integrity": "sha512-ODk48pMlqLSOvu3fM0R1sdlz/Cv2y4hSfwtXmLq9ky9+H7ZQfw/16ElpIJ69B4lUvHycxrueNgrRtF9PJHoGMw==",
-      "requires": {
-        "eventsource": "^2.0.2"
-      }
-    },
-    "@tonconnect/isomorphic-fetch": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/@tonconnect/isomorphic-fetch/-/isomorphic-fetch-0.0.2.tgz",
-      "integrity": "sha512-DAyA4oL7MqbBo9k8+8E+YiWsGCYi6UMhDTcsZjhgzhESkBNG6b+NBkpb1KH4oi0xDZQoknFtY9XogJLuQtSMQQ==",
+    "@ton-defi.org/ton-connection": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@ton-defi.org/ton-connection/-/ton-connection-0.8.1.tgz",
+      "integrity": "sha512-p3uHra5Ye8P6a4xUz7aP6wPFilEDiivHASI69VGenbnGTEE0LFizUQWnhdkwTiUh/YanJWnza8CTgXZc2EPbvA==",
       "requires": {
-        "node-fetch": "^2.6.9"
+        "@aws-crypto/sha256-js": "^2.0.1",
+        "@tonconnect/sdk": "^2.0.7",
+        "axios-request-throttle": "^1.0.0",
+        "dotenv": "^16.0.0",
+        "ton": "^12.1.5",
+        "ton-contracts": "^3.1.0",
+        "ton-crypto": "^3.1.0",
+        "ton-x": "^2.0.0-beta9"
+      },
+      "dependencies": {
+        "dotenv": {
+          "version": "16.0.3",
+          "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz",
+          "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ=="
+        },
+        "ton-crypto": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ton-crypto/-/ton-crypto-3.2.0.tgz",
+          "integrity": "sha512-fltdBNQ45gARMuGMEOjPZWPJ5eSql8p3CA0Dj7tPv5lhU5ziT8SxXLAzDraR9HJ8YpjBHLVvYyhMLRiEwxgtMQ==",
+          "requires": {
+            "jssha": "3.2.0",
+            "ton-crypto-primitives": "2.0.0",
+            "tweetnacl": "1.0.3"
+          }
+        }
       }
     },
     "@tonconnect/protocol": {
-      "version": "2.2.5",
-      "resolved": "https://registry.npmjs.org/@tonconnect/protocol/-/protocol-2.2.5.tgz",
-      "integrity": "sha512-kR0E+CWZl6JrE/30283v+sRiAvEu21t1xOLFx6f/BxlCNLY2wki39+L32+iicX8gn/Ig99L1flr9TAI9QW9bnQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tonconnect/protocol/-/protocol-2.0.1.tgz",
+      "integrity": "sha512-jkSj6EKjIlHnJxrtxdlO7KqVJe41yrIgqamGZiqziKH6iwx0m9YyKvuIREd6CmWY2jbsev3BvBWqPp9KH6HrRw==",
       "requires": {
-        "tweetnacl": "^1.0.3",
         "tweetnacl-util": "^0.15.1"
       }
     },
     "@tonconnect/sdk": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/@tonconnect/sdk/-/sdk-2.1.3.tgz",
-      "integrity": "sha512-LxHJr96NvGTqj4qSKYPPS/7fMlUpHNyj5bCNlzY5xMW8JmdgPj+jXxm5wEI00xBWy478dbE9ZaBhLMLH1V2wZw==",
-      "requires": {
-        "@tonconnect/isomorphic-eventsource": "^0.0.1",
-        "@tonconnect/isomorphic-fetch": "^0.0.2",
-        "@tonconnect/protocol": "^2.2.5"
-      }
-    },
-    "@tonconnect/ui": {
-      "version": "1.0.0-beta.5",
-      "resolved": "https://registry.npmjs.org/@tonconnect/ui/-/ui-1.0.0-beta.5.tgz",
-      "integrity": "sha512-F1Z/GAsuebvmMSS5SkY90DyIYogUYNx+b7I8A2LF8nbwDVA0ImsN6oOiOl5PzOhBlNZru8LXJuUUfqgDv1ZHuw==",
-      "requires": {
-        "@tonconnect/sdk": "^2.1.3",
-        "classnames": "^2.3.2",
-        "deepmerge": "^4.2.2"
-      }
-    },
-    "@tonconnect/ui-react": {
-      "version": "1.0.0-beta.6",
-      "resolved": "https://registry.npmjs.org/@tonconnect/ui-react/-/ui-react-1.0.0-beta.6.tgz",
-      "integrity": "sha512-j4ziq+5JHmAI74XXodjIomqvLKEwfomJ4mv1LulYWs7izNBDwlpzIW/Un0UzsGZq9fjnuJ/A2Xb9M30j9ucOEg==",
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/@tonconnect/sdk/-/sdk-2.0.7.tgz",
+      "integrity": "sha512-MDbA5RhkVbSQQYXsLuVXLATROSQgDJSIx9Y2HIPohfU44PH6vaJ1cBrv9nogIoAQUM2tNuBXC0w+RcFT+eRTCg==",
       "requires": {
-        "@tonconnect/ui": "^1.0.0-beta.5"
+        "@tonconnect/protocol": "^2.0.1",
+        "deepmerge": "^4.2.2",
+        "eventsource": "^2.0.2",
+        "node-fetch": "^2.6.7",
+        "tweetnacl": "^1.0.3"
       }
     },
     "@tootallnate/once": {
@@ -23444,6 +23567,14 @@
       "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz",
       "integrity": "sha512-HnYpAE1Y6kRyKM/XkEuiRQhTHvkzMBurTHnpFLYLBGPIylZNPs9jJcuOOYWxPLJCSEtmZT0Y8rHDokKN7rRTig=="
     },
+    "@types/axios": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz",
+      "integrity": "sha512-KqQnQbdYE54D7oa/UmYVMZKq7CO4l8DEENzOKc4aBRwxCXSlJXGz83flFx5L7AWrOQnmuN3kVsRdt+GZPPjiVQ==",
+      "requires": {
+        "axios": "*"
+      }
+    },
     "@types/babel__core": {
       "version": "7.1.19",
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz",
@@ -23485,7 +23616,6 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.0.tgz",
       "integrity": "sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA==",
-      "dev": true,
       "requires": {
         "@types/node": "*"
       }
@@ -24479,6 +24609,15 @@
         "follow-redirects": "^1.14.7"
       }
     },
+    "axios-request-throttle": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/axios-request-throttle/-/axios-request-throttle-1.0.0.tgz",
+      "integrity": "sha512-NYh7kZkgSJZyIohqrvQEzr4uygqbxXb769kbphkwgYNAJm5eDg33mqHLA2pwHKC1uqbTfNpmjmzWdUdo+ptBWg==",
+      "requires": {
+        "@types/axios": "^0.14.0",
+        "promise-throttle": "^1.1.2"
+      }
+    },
     "axobject-query": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.2.0.tgz",
@@ -25149,11 +25288,6 @@
         }
       }
     },
-    "classnames": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz",
-      "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw=="
-    },
     "clean-css": {
       "version": "5.3.0",
       "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.0.tgz",
@@ -30542,9 +30676,9 @@
       }
     },
     "node-fetch": {
-      "version": "2.6.11",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.11.tgz",
-      "integrity": "sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==",
+      "version": "2.6.7",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
+      "integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
       "requires": {
         "whatwg-url": "^5.0.0"
       },
@@ -31888,6 +32022,11 @@
         "asap": "~2.0.6"
       }
     },
+    "promise-throttle": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/promise-throttle/-/promise-throttle-1.1.2.tgz",
+      "integrity": "sha512-dij7vjyXNewuuN/gyr+TX2KRjw48mbV5FEtgyXaIoJjGYAKT0au23/voNvy9eS4UNJjx2KUdEcO5Yyfc1h7vWQ=="
+    },
     "prompts": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -33982,6 +34121,14 @@
         "tweetnacl": "1.0.3"
       }
     },
+    "ton-contracts": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/ton-contracts/-/ton-contracts-3.1.0.tgz",
+      "integrity": "sha512-nT1CAdKsCS/XA/PMczJOgX42Cr2ZQa4NIwSifbd9M1Ukws4l7VjjFXQYPoWhEb2m43oqZqj3NO8X3WojWvFarA==",
+      "requires": {
+        "@openland/patterns": "^0.0.2"
+      }
+    },
     "ton-crypto": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/ton-crypto/-/ton-crypto-2.1.0.tgz",
@@ -34000,6 +34147,90 @@
         "jssha": "3.2.0"
       }
     },
+    "ton-x": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ton-x/-/ton-x-2.0.0.tgz",
+      "integrity": "sha512-APzTmKydNVre2IaDuC8gxmVK/TcJpA5jUER+OrwxKDwRWckzFFzElxVHu6AGilljRHYd45At4QDoHTfsBkUuZA==",
+      "requires": {
+        "@types/bn.js": "^5.1.0",
+        "axios": "^0.27.0",
+        "bn.js": "^5.2.0",
+        "fp-ts": "^2.12.0",
+        "io-ts": "^2.2.16",
+        "teslabot": "^1.5.0",
+        "ton": "9.8.0",
+        "ton-crypto": "^3.0.0"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.27.2",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+          "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
+          "requires": {
+            "follow-redirects": "^1.14.9",
+            "form-data": "^4.0.0"
+          }
+        },
+        "form-data": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+          "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.8",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "ton": {
+          "version": "9.8.0",
+          "resolved": "https://registry.npmjs.org/ton/-/ton-9.8.0.tgz",
+          "integrity": "sha512-aH/7ODiEulPRZracSfQ4KeaV6iDmzjn14+YMsZ9x0sNlzhtP4blMIFXPJFp4BOc4INb5vTrfA0u+JtOoXlBO0A==",
+          "requires": {
+            "axios": "^0.25.0",
+            "bn.js": "5.2.0",
+            "dataloader": "^2.0.0",
+            "ethjs-unit": "0.1.6",
+            "fp-ts": "^2.11.1",
+            "io-ts": "^2.2.16",
+            "io-ts-reporters": "^2.0.0",
+            "symbol.inspect": "1.0.1",
+            "teslabot": "^1.3.0",
+            "ton-crypto": "2.1.0",
+            "tweetnacl": "1.0.3"
+          },
+          "dependencies": {
+            "axios": {
+              "version": "0.25.0",
+              "resolved": "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz",
+              "integrity": "sha512-cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==",
+              "requires": {
+                "follow-redirects": "^1.14.7"
+              }
+            },
+            "ton-crypto": {
+              "version": "2.1.0",
+              "resolved": "https://registry.npmjs.org/ton-crypto/-/ton-crypto-2.1.0.tgz",
+              "integrity": "sha512-PZnmCOShfgq9tCRM8E7hG8nCkpkOyZvDLPXmZN92ZEBrfTT0NKKf0imndkxG5DkgWMjc6IKfgpnEaJDH9qN6ZQ==",
+              "requires": {
+                "jssha": "3.2.0",
+                "ton-crypto-primitives": "2.0.0",
+                "tweetnacl": "1.0.3"
+              }
+            }
+          }
+        },
+        "ton-crypto": {
+          "version": "3.2.0",
+          "resolved": "https://registry.npmjs.org/ton-crypto/-/ton-crypto-3.2.0.tgz",
+          "integrity": "sha512-fltdBNQ45gARMuGMEOjPZWPJ5eSql8p3CA0Dj7tPv5lhU5ziT8SxXLAzDraR9HJ8YpjBHLVvYyhMLRiEwxgtMQ==",
+          "requires": {
+            "jssha": "3.2.0",
+            "ton-crypto-primitives": "2.0.0",
+            "tweetnacl": "1.0.3"
+          }
+        }
+      }
+    },
     "tough-cookie": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz",
diff --git a/package.json b/package.json
index 7d539bd..e6fd843 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.3.0",
     "@testing-library/user-event": "^13.5.0",
-    "@tonconnect/ui-react": "^1.0.0-beta.6",
+    "@ton-defi.org/ton-connection": "^0.8.1",
     "@types/jest": "^27.5.1",
     "@types/node": "^16.11.36",
     "@types/react": "^18.0.9",
diff --git a/src/App.tsx b/src/App.tsx
index 1d872cc..0eb1d33 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,9 +1,11 @@
 import { styled } from "@mui/material";
 import { Box } from "@mui/system";
 import { createContext, useEffect } from "react";
+import useConnectionStore from "store/connection-store/useConnectionStore";
 import { APP_GRID, ROUTES } from "consts";
 import { Navigate, Outlet, Route, Routes, useLocation } from "react-router-dom";
 import { DeployerPage, Jetton } from "pages";
+import ConnectPopup from "components/connectPopup";
 import analytics from "services/analytics";
 import { Footer } from "components/footer";
 import { Header } from "components/header";
@@ -78,6 +80,7 @@ const ContentWrapper = ({ children }: ContentWrapperProps) => {
 };
 
 const App = () => {
+  const { connectOnLoad } = useConnectionStore();
   const { resetJetton } = useJettonLogo();
   const location = useLocation();
 
@@ -85,6 +88,10 @@ const App = () => {
     resetJetton();
   }, [location.pathname]);
 
+  useEffect(() => {
+    connectOnLoad();
+  }, []);
+
   return (
     <AppWrapper>
       <EnvContext.Provider
@@ -113,6 +120,7 @@ const App = () => {
           </Routes>
         </ScreensWrapper>
       </EnvContext.Provider>
+      <ConnectPopup />
       <FooterBox mt={5}>
         <Footer />
       </FooterBox>
diff --git a/src/components/TxLoader.tsx b/src/components/TxLoader.tsx
new file mode 100644
index 0000000..c862f90
--- /dev/null
+++ b/src/components/TxLoader.tsx
@@ -0,0 +1,44 @@
+import Backdrop from "@mui/material/Backdrop";
+import CircularProgress from "@mui/material/CircularProgress";
+import { styled, Typography } from "@mui/material";
+import { Box } from "@mui/system";
+import { ReactNode } from "react";
+import { isMobile } from "react-device-detect";
+import { Providers } from "lib/env-profiles";
+import useConnectionStore from "store/connection-store/useConnectionStore";
+
+interface Props {
+  open: boolean;
+  children?: ReactNode;
+}
+
+const StyledContainer = styled(Box)({
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "center",
+  gap: 10,
+});
+
+function TxLoader({ open, children }: Props) {
+  const { adapterId } = useConnectionStore();
+  const showReminderInLoader = !isMobile && adapterId === Providers.TON_HUB;
+
+  return (
+    <Backdrop
+      sx={{
+        color: "#fff",
+        zIndex: 9999999,
+      }}
+      open={open}>
+      <StyledContainer>
+        <CircularProgress color="inherit" />
+        {children}
+        {showReminderInLoader && (
+          <Typography>Please check tonhub wallet for pending notification</Typography>
+        )}
+      </StyledContainer>
+    </Backdrop>
+  );
+}
+
+export default TxLoader;
diff --git a/src/components/connectPopup/AdaptersList.tsx b/src/components/connectPopup/AdaptersList.tsx
new file mode 100644
index 0000000..d598609
--- /dev/null
+++ b/src/components/connectPopup/AdaptersList.tsx
@@ -0,0 +1,125 @@
+import { ListItem, List, ListItemButton, Box, Typography, Fade } from "@mui/material";
+import { useTheme, Theme } from "@mui/material/styles";
+import { styled } from "@mui/system";
+import TonhubImg from "assets/icons/tonhub.png";
+import ChromeExtImg from "assets/icons/chrome.svg";
+import OpenMaskImg from "assets/icons/openmask-logo.svg";
+import { Providers } from "lib/env-profiles";
+import { isMobile } from "react-device-detect";
+import Header from "./Header";
+import { useNetwork } from "../../lib/hooks/useNetwork";
+
+const StyledListItem = styled(ListItem)({
+  background: "white",
+  width: "100%",
+});
+const StyledList = styled(List)({
+  width: "100%",
+  display: "flex",
+  flexDirection: "column",
+  gap: 30,
+  padding: 0,
+});
+
+const StyledListItemButton = styled(ListItemButton)({
+  padding: 0,
+});
+
+const StyledIcon = styled("img")({
+  width: "40px",
+  height: "40px",
+  objectFit: "cover",
+  marginRight: "24px",
+});
+
+const StyledListItemRight = styled(Box)(({ theme }: { theme: Theme }) => ({
+  "& h5": {
+    color: theme.palette.secondary.main,
+    fontSize: "18px",
+    fontWeight: "500",
+    marginBottom: "5px",
+  },
+  "& p": {
+    color: theme.palette.secondary.main,
+    fontSize: "14px",
+    opacity: "0.7",
+  },
+}));
+
+interface Props {
+  // todo sy any
+  select: (adapter: Providers) => void;
+  open: boolean;
+  onClose: () => void;
+  adapters: { type: Providers }[];
+}
+
+const adapterConfig = {
+  [Providers.TON_HUB]: {
+    name: "Tonhub",
+    icon: TonhubImg,
+    mobileCompatible: true,
+    testnetCompatible: false, // When TC2 is available this distinction becomes obsolete
+  },
+  [Providers.TONKEEPER]: {
+    name: "Tonkeeper",
+    icon: "https://tonkeeper.com/assets/tonconnect-icon.png", // TODO
+    mobileCompatible: true,
+    testnetCompatible: true,
+  },
+
+  [Providers.EXTENSION]: {
+    name: "Google Chrome Plugin",
+    icon: ChromeExtImg,
+    mobileCompatible: false,
+    testnetCompatible: true,
+  },
+  [Providers.OPEN_MASK]: {
+    name: "OpenMask",
+    icon: OpenMaskImg,
+    mobileCompatible: false,
+    testnetCompatible: true,
+  },
+};
+
+function AdaptersList({ onClose, select, open, adapters }: Props) {
+  const theme = useTheme();
+  const { network } = useNetwork();
+
+  if (!open) {
+    return null;
+  }
+
+  return (
+    <Fade in>
+      <Box>
+        <Header title="Select Wallet" onClose={onClose} />
+        <StyledList>
+          {adapters
+            .filter(
+              (a) =>
+                (!isMobile || adapterConfig[a.type].mobileCompatible) &&
+                (network === "mainnet" || adapterConfig[a.type].testnetCompatible),
+            )
+            .map((adapter) => {
+              const { type } = adapter;
+              const { icon, name } = adapterConfig[type];
+
+              return (
+                <StyledListItem disablePadding key={type}>
+                  <StyledListItemButton onClick={() => select(type)}>
+                    <StyledIcon src={icon} />
+                    <StyledListItemRight theme={theme}>
+                      <Typography variant="h5">{name}</Typography>
+                    </StyledListItemRight>
+                  </StyledListItemButton>
+                </StyledListItem>
+              );
+            })}
+        </StyledList>
+      </Box>
+    </Fade>
+  );
+}
+
+export default AdaptersList;
diff --git a/src/components/connectPopup/ConnectQR.tsx b/src/components/connectPopup/ConnectQR.tsx
new file mode 100644
index 0000000..693e357
--- /dev/null
+++ b/src/components/connectPopup/ConnectQR.tsx
@@ -0,0 +1,67 @@
+import { Box } from "@mui/material";
+import { QRCodeSVG } from "qrcode.react";
+
+import Fade from "@mui/material/Fade";
+import CircularProgress from "@mui/material/CircularProgress";
+import { styled } from "@mui/system";
+import TonhubQr from "assets/icons/tonhub-qr.png";
+import Header from "./Header";
+
+const StyledContainer = styled(Box)({
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "center",
+});
+
+const StyledQrBox = styled(Box)({
+  width: 260,
+  height: 260,
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "center",
+});
+
+interface Props {
+  onClose: () => void;
+  link: string | null;
+  open: boolean;
+  walletName: string;
+}
+
+function QR({ onClose, link, open, walletName }: Props) {
+  if (!open) {
+    return null;
+  }
+
+  return (
+    <Fade in>
+      <StyledContainer>
+        <Header title={`Connect to ${walletName}`} onClose={onClose} />
+        <StyledQrBox>
+          {link ? (
+            <span>
+              <QRCodeSVG
+                value={link}
+                size={260}
+                bgColor={"#ffffff"}
+                fgColor={"#002457"}
+                level={"L"}
+                includeMargin={false}
+                imageSettings={{
+                  src: TonhubQr,
+                  height: 50,
+                  width: 50,
+                  excavate: true,
+                }}
+              />
+            </span>
+          ) : (
+            <CircularProgress />
+          )}
+        </StyledQrBox>
+      </StyledContainer>
+    </Fade>
+  );
+}
+
+export default QR;
diff --git a/src/components/connectPopup/Header.tsx b/src/components/connectPopup/Header.tsx
new file mode 100644
index 0000000..68b24eb
--- /dev/null
+++ b/src/components/connectPopup/Header.tsx
@@ -0,0 +1,48 @@
+import { Box, IconButton, styled, Typography, useTheme } from "@mui/material";
+import CloseRoundedIcon from "@mui/icons-material/CloseRounded";
+
+const StyledContainer = styled(Box)({
+  display: "flex",
+  alignItems: "center",
+  justifyContent: "space-between",
+  position: "relative",
+  paddingBottom: 10,
+  marginBottom: 20,
+  width: "100%",
+  "& h4": {
+    fontSize: 18,
+    fontWeight: 400,
+  },
+});
+
+const StyledSeparator = styled(Box)(({ theme }) => ({
+  position: "absolute",
+  left: 0,
+  bottom: 0,
+  width: "100%",
+  height: 1,
+  background: theme.palette.text.primary,
+  opacity: 0.2,
+}));
+
+interface Props {
+  title: string;
+  onClose?: () => void;
+}
+
+function Header({ title, onClose }: Props) {
+  const theme = useTheme();
+  return (
+    <StyledContainer>
+      <Typography variant="h4">{title}</Typography>
+      {onClose && (
+        <IconButton onClick={onClose} sx={{ padding: 0 }}>
+          <CloseRoundedIcon style={{ color: theme.palette.text.primary }} />
+        </IconButton>
+      )}
+      <StyledSeparator />
+    </StyledContainer>
+  );
+}
+
+export default Header;
diff --git a/src/components/connectPopup/index.tsx b/src/components/connectPopup/index.tsx
new file mode 100644
index 0000000..3bb5c07
--- /dev/null
+++ b/src/components/connectPopup/index.tsx
@@ -0,0 +1,79 @@
+import { styled } from "@mui/material";
+import { Box } from "@mui/system";
+import { delay } from "@ton-defi.org/ton-connection";
+import { Popup } from "components/Popup";
+import { providers, Providers } from "lib/env-profiles";
+import { useState } from "react";
+import { isMobile } from "react-device-detect";
+import useConnectionStore from "store/connection-store/useConnectionStore";
+import AdaptersList from "./AdaptersList";
+import QR from "./ConnectQR";
+
+const SyledContainer = styled(Box)({
+  position: "relative",
+  display: "flex",
+  flexDirection: "column",
+  alignItems: "center",
+  background: "white",
+  width: "fit-content",
+});
+
+function ConnectPopup() {
+  const [sessionLink, setSessionLink] = useState<string | null>(null);
+  const [showQr, setShowQr] = useState(false);
+  const [selectedProvider, setSelectedProvider] = useState<Providers | null>(null);
+  const { connect, resetState, toggleConnect, showConnect } = useConnectionStore();
+
+  const onSelect = async (provider: Providers) => {
+    setSelectedProvider(provider);
+    setSessionLink(null);
+    const onSessionLinkCreated = (value: string) => {
+      if (isMobile) {
+        // @ts-ignore
+        window.location = value;
+      } else {
+        setSessionLink(value);
+      }
+    };
+    try {
+      if ((provider === Providers.TON_HUB || provider === Providers.TONKEEPER) && !isMobile) {
+        setShowQr(true);
+      }
+      await connect(provider, onSessionLinkCreated);
+      toggleConnect(false);
+    } catch (error) {
+      console.log(error);
+      resetState();
+    } finally {
+      setShowQr(false);
+      setSessionLink(null);
+    }
+  };
+
+  const onCancel = () => {
+    setShowQr(false);
+  };
+
+  const close = async () => {
+    toggleConnect(false);
+    await delay(200);
+    setShowQr(false);
+    setSessionLink(null);
+  };
+
+  return (
+    <Popup open={showConnect} onClose={close} maxWidth={360} hideCloseButton paddingTop>
+      <SyledContainer>
+        <AdaptersList adapters={providers} onClose={close} open={!showQr} select={onSelect} />
+        <QR
+          open={showQr}
+          walletName={selectedProvider ?? ""}
+          link={sessionLink}
+          onClose={onCancel}
+        />
+      </SyledContainer>
+    </Popup>
+  );
+}
+
+export default ConnectPopup;
diff --git a/src/components/form/Form.tsx b/src/components/form/Form.tsx
index b41a284..15007f5 100644
--- a/src/components/form/Form.tsx
+++ b/src/components/form/Form.tsx
@@ -1,5 +1,6 @@
 import useNotification from "hooks/useNotification";
 import { useForm } from "react-hook-form";
+import useConnectionStore from "store/connection-store/useConnectionStore";
 import { Box, Tooltip, useMediaQuery } from "@mui/material";
 import React, { useCallback, useEffect, useState } from "react";
 import { AppButton } from "components/appButton";
@@ -19,8 +20,6 @@ import { StyledTopImg } from "pages/jetton/styled";
 import LoadingImage from "components/LoadingImage";
 import { AppHeading } from "components/appHeading";
 import { useJettonAddress } from "hooks/useJettonAddress";
-import { useTonAddress } from "@tonconnect/ui-react";
-import { onConnect } from "utils";
 
 interface FormProps {
   onSubmit: (values: any) => Promise<void>;
@@ -29,7 +28,6 @@ interface FormProps {
   submitText: string;
   defaultValues?: {};
   onCancel?: () => void;
-  isLoading?: boolean;
 }
 
 export function Form({
@@ -39,10 +37,9 @@ export function Form({
   submitText,
   defaultValues,
   onCancel,
-  isLoading,
 }: FormProps) {
   const { showNotification } = useNotification();
-  const address = useTonAddress();
+  const { address, toggleConnect } = useConnectionStore();
   const { jettonLogo, setIconHover } = useJettonLogo();
   const [logoAlertPopup, setLogoAlertPopup] = useState(false);
   const [editLogoPopup, setEditLogoPopup] = useState(false);
@@ -184,7 +181,7 @@ export function Form({
             width={150}
             fontWeight={700}
             type="button"
-            onClick={onConnect}
+            onClick={() => toggleConnect(true)}
             background="#0088CC">
             Connect wallet
           </AppButton>
@@ -202,7 +199,7 @@ export function Form({
               </Box>
             )}
             <Box sx={{ width: 110, height: 44 }} ml={2}>
-              <AppButton disabled={jettonLogo.isLoading} type="submit" loading={isLoading}>
+              <AppButton disabled={jettonLogo.isLoading} type="submit">
                 {submitText}
               </AppButton>
             </Box>
diff --git a/src/components/header/headerMenu/HeaderMenu.tsx b/src/components/header/headerMenu/HeaderMenu.tsx
index 2879707..193fe60 100644
--- a/src/components/header/headerMenu/HeaderMenu.tsx
+++ b/src/components/header/headerMenu/HeaderMenu.tsx
@@ -1,4 +1,5 @@
-import { Box, Drawer, IconButton, styled } from "@mui/material";
+import { Drawer, IconButton } from "@mui/material";
+import WalletConnector from "components/header/walletConnector/WalletConnector";
 import githubIcon from "assets/icons/github-logo.svg";
 import CloseRoundedIcon from "@mui/icons-material/CloseRounded";
 import { AppLogo } from "components/appLogo";
@@ -9,7 +10,6 @@ import {
   AppMenu,
   HeaderTypography,
 } from "./styled";
-import { TonConnectButton } from "@tonconnect/ui-react";
 
 interface MenuProps {
   closeMenu?: () => void;
@@ -30,12 +30,10 @@ const MobileMenu: React.FC<MenuProps> = ({ closeMenu, showMenu }) => {
   );
 };
 
-const HeaderMenu: React.FC<MenuProps> = (props) => {
+const HeaderMenu: React.FC<MenuProps> = () => {
   return (
     <AppMenu>
-      <div onClick={props.closeMenu}>
-        <StyledTonConnectButton />
-      </div>
+      <WalletConnector />
       <IconButton
         sx={{ padding: 0, ml: 1.5 }}
         href="https://github.com/ton-blockchain/minter"
@@ -47,16 +45,4 @@ const HeaderMenu: React.FC<MenuProps> = (props) => {
   );
 };
 
-const StyledTonConnectButton = styled(TonConnectButton)(({ theme }) => ({
-  button: {
-    background: theme.palette.primary.main,
-    "*": { color: "white" },
-    svg: {
-      "*": {
-        stroke: "white",
-      },
-    },
-  },
-}));
-
 export { HeaderMenu, MobileMenu };
diff --git a/src/components/header/walletConnector/WalletConnector.tsx b/src/components/header/walletConnector/WalletConnector.tsx
new file mode 100644
index 0000000..9df9709
--- /dev/null
+++ b/src/components/header/walletConnector/WalletConnector.tsx
@@ -0,0 +1,56 @@
+import { ClickAwayListener, Typography } from "@mui/material";
+import { useState } from "react";
+import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
+import { ArrowDropUp } from "@mui/icons-material";
+import PowerSettingsNewIcon from "@mui/icons-material/PowerSettingsNew";
+import useConnectionStore from "store/connection-store/useConnectionStore";
+import { makeElipsisAddress } from "helpers";
+import {
+  DisconnectButton,
+  WalletButtonContent,
+  WalletWrapper,
+} from "components/header/walletConnector/styled";
+import { AppButton } from "components/appButton";
+
+const WalletConnector = () => {
+  const [showDisconnect, setShowDisconnect] = useState(false);
+  const { disconnect, address, toggleConnect } = useConnectionStore();
+
+  const onDisconnect = () => {
+    setShowDisconnect(false);
+    disconnect();
+  };
+
+  const onClickAway = () => {
+    if (showDisconnect) {
+      setShowDisconnect(false);
+    }
+  };
+
+  return (
+    <WalletWrapper>
+      {address ? (
+        <AppButton width={150} height={44} transparent onClick={() => setShowDisconnect(true)}>
+          <WalletButtonContent>
+            {makeElipsisAddress(address, 4)}
+            {showDisconnect ? <ArrowDropUp /> : <ArrowDropDownIcon />}
+          </WalletButtonContent>
+        </AppButton>
+      ) : (
+        <AppButton width={150} height={44} onClick={() => toggleConnect(true)}>
+          <WalletButtonContent fontWeight={700}>Connect Wallet</WalletButtonContent>
+        </AppButton>
+      )}
+      {showDisconnect && (
+        <ClickAwayListener onClickAway={onClickAway}>
+          <DisconnectButton onClick={onDisconnect}>
+            <PowerSettingsNewIcon style={{ width: 15, height: 15 }} />
+            <Typography>Disconnect</Typography>
+          </DisconnectButton>
+        </ClickAwayListener>
+      )}
+    </WalletWrapper>
+  );
+};
+
+export default WalletConnector;
diff --git a/src/components/header/walletConnector/index.ts b/src/components/header/walletConnector/index.ts
new file mode 100644
index 0000000..363a991
--- /dev/null
+++ b/src/components/header/walletConnector/index.ts
@@ -0,0 +1 @@
+export * from "./WalletConnector";
diff --git a/src/components/header/walletConnector/styled.tsx b/src/components/header/walletConnector/styled.tsx
new file mode 100644
index 0000000..b76f7db
--- /dev/null
+++ b/src/components/header/walletConnector/styled.tsx
@@ -0,0 +1,46 @@
+import { Box, styled } from "@mui/material";
+
+const WalletWrapper = styled(Box)({
+  position: "relative",
+  display: "flex",
+  alignItems: "center",
+
+  "& p": {
+    paddingRight: 10,
+    fontSize: 12,
+    whiteSpace: "nowrap",
+    overflow: "hidden",
+    textOverflow: "ellipsis",
+  },
+});
+
+const WalletButtonContent = styled(Box)({
+  display: "flex",
+  justifyContent: "space-between",
+  alignItems: "center",
+  fontSize: 14,
+  fontWeight: 700,
+});
+
+const DisconnectButton = styled("button")({
+  zIndex: 4,
+  display: "flex",
+  alignItems: "center",
+  position: "absolute",
+  right: 0,
+  filter: "drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.1))",
+  background: "white",
+  border: "none",
+  height: 35,
+  width: "100%",
+  borderRadius: 20,
+  gap: 10,
+  justifyContent: "center",
+  top: "calc(100% + 10px)",
+  cursor: "pointer",
+  "& p": {
+    fontSize: 12,
+  },
+});
+
+export { WalletWrapper, WalletButtonContent, DisconnectButton };
diff --git a/src/index.tsx b/src/index.tsx
index 8158cf0..0527b2c 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -12,7 +12,6 @@ import { ThemeProvider } from "@mui/material/styles";
 import { ThemeProvider as MakeStylesProvider } from "@mui/material";
 import theme from "theme";
 import { SnackbarProvider } from "notistack";
-import { TonConnectUIProvider } from "@tonconnect/ui-react";
 
 const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement);
 root.render(
@@ -22,9 +21,7 @@ root.render(
         <CssBaseline />
         <Router>
           <SnackbarProvider maxSnack={3}>
-            <TonConnectUIProvider manifestUrl="https://minter.ton.org/tonconnect-manifest.json">
-              <App />
-            </TonConnectUIProvider>
+            <App />
           </SnackbarProvider>
         </Router>
       </MakeStylesProvider>
diff --git a/src/lib/contract-deployer.ts b/src/lib/contract-deployer.ts
index bd8e7f9..12ca2f9 100644
--- a/src/lib/contract-deployer.ts
+++ b/src/lib/contract-deployer.ts
@@ -1,6 +1,6 @@
 import BN from "bn.js";
-import { Address, beginCell, Cell, contractAddress, StateInit } from "ton";
-import { SendTransactionRequest, TonConnectUI } from "@tonconnect/ui-react";
+import { Address, Cell, contractAddress, StateInit } from "ton";
+import { TonConnection } from "@ton-defi.org/ton-connection";
 
 interface ContractDeployDetails {
   deployer: Address;
@@ -22,25 +22,17 @@ export class ContractDeployer {
 
   async deployContract(
     params: ContractDeployDetails,
-    tonConnection: TonConnectUI,
+    tonConnection: TonConnection,
   ): Promise<Address> {
     const _contractAddress = this.addressForContract(params);
-    let cell = new Cell();
-    new StateInit({ data: params.data, code: params.code }).writeTo(cell);
-    if (!params.dryRun) {
-      const tx: SendTransactionRequest = {
-        validUntil: Date.now() + 5 * 60 * 1000,
-        messages: [
-          {
-            address: _contractAddress.toString(),
-            amount: params.value.toString(),
-            stateInit: cell.toBoc().toString("base64"),
-            payload: params.message?.toBoc().toString("base64"),
-          },
-        ],
-      };
 
-      await tonConnection.sendTransaction(tx);
+    if (!params.dryRun) {
+      await tonConnection.requestTransaction({
+        to: _contractAddress,
+        value: params.value,
+        stateInit: new StateInit({ data: params.data, code: params.code }),
+        message: params.message,
+      });
     }
 
     return _contractAddress;
diff --git a/src/lib/deploy-controller.ts b/src/lib/deploy-controller.ts
index f6e7e5d..e05f5dd 100644
--- a/src/lib/deploy-controller.ts
+++ b/src/lib/deploy-controller.ts
@@ -3,6 +3,7 @@ import { Address, beginCell, Cell, toNano } from "ton";
 import { ContractDeployer } from "./contract-deployer";
 
 import { createDeployParams, waitForContractDeploy, waitForSeqno } from "./utils";
+import { TonConnection } from "@ton-defi.org/ton-connection";
 import { zeroAddress } from "./utils";
 import {
   buildJettonOnchainMetadata,
@@ -14,7 +15,6 @@ import {
 import { readJettonMetadata, changeAdminBody, JettonMetaDataKeys } from "./jetton-minter";
 import { getClient } from "./get-ton-client";
 import { cellToAddress, makeGetCall } from "./make-get-call";
-import { SendTransactionRequest, TonConnectUI } from "@tonconnect/ui-react";
 
 export const JETTON_DEPLOY_GAS = toNano(0.25);
 
@@ -44,11 +44,7 @@ export interface JettonDeployParams {
 }
 
 class JettonDeployController {
-  async createJetton(
-    params: JettonDeployParams,
-    tonConnection: TonConnectUI,
-    walletAddress: string,
-  ): Promise<Address> {
+  async createJetton(params: JettonDeployParams, tonConnection: TonConnection): Promise<Address> {
     const contractDeployer = new ContractDeployer();
     const tc = await getClient();
 
@@ -87,129 +83,86 @@ class JettonDeployController {
     return contractAddr;
   }
 
-  async burnAdmin(contractAddress: Address, tonConnection: TonConnectUI, walletAddress: string) {
+  async burnAdmin(contractAddress: Address, tonConnection: TonConnection) {
     // @ts-ignore
+    const { address } = await tonConnection.connect();
     const tc = await getClient();
     const waiter = await waitForSeqno(
       tc.openWalletFromAddress({
-        source: Address.parse(walletAddress),
+        source: Address.parse(address),
       }),
     );
 
-    const tx: SendTransactionRequest = {
-      validUntil: Date.now() + 5 * 60 * 1000,
-      messages: [
-        {
-          address: contractAddress.toString(),
-          amount: toNano(0.01).toString(),
-          stateInit: undefined,
-          payload: changeAdminBody(zeroAddress()).toBoc().toString("base64"),
-        },
-      ],
-    };
-
-    await tonConnection.sendTransaction(tx);
+    await tonConnection.requestTransaction({
+      to: contractAddress,
+      value: toNano(0.01),
+      message: changeAdminBody(zeroAddress()),
+    });
 
     await waiter();
   }
 
-  async mint(
-    tonConnection: TonConnectUI,
-    jettonMaster: Address,
-    amount: BN,
-    walletAddress: string,
-  ) {
+  async mint(tonConnection: TonConnection, jettonMaster: Address, amount: BN) {
+    const { address } = await tonConnection.connect();
     const tc = await getClient();
     const waiter = await waitForSeqno(
       tc.openWalletFromAddress({
-        source: Address.parse(walletAddress),
+        source: Address.parse(address),
       }),
     );
-
-    const tx: SendTransactionRequest = {
-      validUntil: Date.now() + 5 * 60 * 1000,
-      messages: [
-        {
-          address: jettonMaster.toString(),
-          amount: toNano(0.04).toString(),
-          stateInit: undefined,
-          payload: mintBody(Address.parse(walletAddress), amount, toNano(0.02), 0)
-            .toBoc()
-            .toString("base64"),
-        },
-      ],
-    };
-
-    await tonConnection.sendTransaction(tx);
+    await tonConnection.requestTransaction({
+      to: jettonMaster,
+      value: toNano(0.04),
+      message: mintBody(Address.parse(address), amount, toNano(0.02), 0),
+    });
     await waiter();
   }
 
   async transfer(
-    tonConnection: TonConnectUI,
+    tonConnection: TonConnection,
     amount: BN,
     toAddress: string,
     fromAddress: string,
     ownerJettonWallet: string,
   ) {
+    const { address } = await tonConnection.connect();
     const tc = await getClient();
 
     const waiter = await waitForSeqno(
       tc.openWalletFromAddress({
-        source: Address.parse(fromAddress),
+        source: Address.parse(address),
       }),
     );
 
-    const tx: SendTransactionRequest = {
-      validUntil: Date.now() + 5 * 60 * 1000,
-      messages: [
-        {
-          address: ownerJettonWallet,
-          amount: toNano(0.05).toString(),
-          stateInit: undefined,
-          payload: transfer(Address.parse(toAddress), Address.parse(fromAddress), amount)
-            .toBoc()
-            .toString("base64"),
-        },
-      ],
-    };
-
-    await tonConnection.sendTransaction(tx);
+    await tonConnection.requestTransaction({
+      to: Address.parse(ownerJettonWallet),
+      value: toNano(0.05),
+      message: transfer(Address.parse(toAddress), Address.parse(fromAddress), amount),
+    });
 
     await waiter();
   }
 
-  async burnJettons(
-    tonConnection: TonConnectUI,
-    amount: BN,
-    jettonAddress: string,
-    walletAddress: string,
-  ) {
+  async burnJettons(tonConnection: TonConnection, amount: BN, jettonAddress: string) {
+    const { address } = await tonConnection.connect();
     const tc = await getClient();
 
     const waiter = await waitForSeqno(
       tc.openWalletFromAddress({
-        source: Address.parse(walletAddress),
+        source: Address.parse(address),
       }),
     );
 
-    const tx: SendTransactionRequest = {
-      validUntil: Date.now() + 5 * 60 * 1000,
-      messages: [
-        {
-          address: jettonAddress,
-          amount: toNano(0.031).toString(),
-          stateInit: undefined,
-          payload: burn(amount, Address.parse(walletAddress)).toBoc().toString("base64"),
-        },
-      ],
-    };
-
-    await tonConnection.sendTransaction(tx);
+    await tonConnection.requestTransaction({
+      to: Address.parse(jettonAddress),
+      value: toNano(0.031),
+      message: burn(amount, Address.parse(address)),
+    });
 
     await waiter();
   }
 
-  async getJettonDetails(contractAddr: Address, owner: Address) {
+  async getJettonDetails(contractAddr: Address, owner: Address, tonConnection: TonConnection) {
     const tc = await getClient();
     const minter = await makeGetCall(
       contractAddr,
@@ -261,29 +214,21 @@ class JettonDeployController {
     data: {
       [s in JettonMetaDataKeys]?: string | undefined;
     },
-    connection: TonConnectUI,
-    walletAddress: string,
+    connection: TonConnection,
   ) {
+    const { address } = await connection.connect();
     const tc = await getClient();
     const waiter = await waitForSeqno(
       tc.openWalletFromAddress({
-        source: Address.parse(walletAddress),
+        source: Address.parse(address),
       }),
     );
-    const body = updateMetadataBody(buildJettonOnchainMetadata(data));
-    const tx: SendTransactionRequest = {
-      validUntil: Date.now() + 5 * 60 * 1000,
-      messages: [
-        {
-          address: contractAddress.toString(),
-          amount: toNano(0.01).toString(),
-          stateInit: undefined,
-          payload: body.toBoc().toString("base64"),
-        },
-      ],
-    };
 
-    await connection.sendTransaction(tx);
+    await connection.requestTransaction({
+      to: contractAddress,
+      message: updateMetadataBody(buildJettonOnchainMetadata(data)),
+      value: toNano(0.01),
+    });
 
     await waiter();
   }
@@ -293,29 +238,21 @@ class JettonDeployController {
     data: {
       [s in JettonMetaDataKeys]?: string | undefined;
     },
-    connection: TonConnectUI,
-    walltAddress: string,
+    connection: TonConnection,
   ) {
+    const { address } = await connection.connect();
     const tc = await getClient();
     const waiter = await waitForSeqno(
       tc.openWalletFromAddress({
-        source: Address.parse(walltAddress),
+        source: Address.parse(address),
       }),
     );
 
-    const tx: SendTransactionRequest = {
-      validUntil: Date.now() + 5 * 60 * 1000,
-      messages: [
-        {
-          address: contractAddress.toString(),
-          amount: toNano(0.01).toString(),
-          stateInit: undefined,
-          payload: updateMetadataBody(buildJettonOnchainMetadata(data)).toBoc().toString("base64"),
-        },
-      ],
-    };
-
-    await connection.sendTransaction(tx);
+    await connection.requestTransaction({
+      to: contractAddress,
+      message: updateMetadataBody(buildJettonOnchainMetadata(data)),
+      value: toNano(0.01),
+    });
 
     await waiter();
   }
diff --git a/src/pages/deployer/index.tsx b/src/pages/deployer/index.tsx
index 8aeb653..2e2af9d 100644
--- a/src/pages/deployer/index.tsx
+++ b/src/pages/deployer/index.tsx
@@ -1,5 +1,6 @@
 import { useState } from "react";
 import { Address } from "ton";
+import useConnectionStore from "store/connection-store/useConnectionStore";
 import { Box, Fade, Link, Typography } from "@mui/material";
 import { jettonDeployController, JettonDeployParams } from "lib/deploy-controller";
 import WalletConnection from "services/wallet-connection";
@@ -7,6 +8,7 @@ import { createDeployParams } from "lib/utils";
 import { ContractDeployer } from "lib/contract-deployer";
 import { Link as ReactRouterLink } from "react-router-dom";
 import { ROUTES } from "consts";
+import TxLoader from "components/TxLoader";
 import useNotification from "hooks/useNotification";
 import {
   FormWrapper,
@@ -22,7 +24,6 @@ import { offchainFormSpec, onchainFormSpec } from "./data";
 import { Form } from "components/form";
 import { GithubButton } from "pages/deployer/githubButton";
 import { useNavigatePreserveQuery } from "lib/hooks/useNavigatePreserveQuery";
-import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
 
 const DEFAULT_DECIMALS = 9;
 
@@ -38,13 +39,14 @@ async function fetchDecimalsOffchain(url: string): Promise<{ decimals?: string }
 
 function DeployerPage() {
   const { showNotification } = useNotification();
-  const walletAddress = useTonAddress();
-  const [tonconnect] = useTonConnectUI();
+  const { address } = useConnectionStore();
   const [isLoading, setIsLoading] = useState(false);
   const navigate = useNavigatePreserveQuery();
 
   async function deployContract(data: any) {
-    if (!walletAddress || !tonconnect) {
+    const connection = WalletConnection.getConnection();
+
+    if (!address || !connection) {
       throw new Error("Wallet not connected");
     }
 
@@ -57,7 +59,7 @@ function DeployerPage() {
     }
 
     const params: JettonDeployParams = {
-      owner: Address.parse(walletAddress),
+      owner: Address.parse(address),
       onchainMetaData: {
         name: data.name,
         symbol: data.symbol,
@@ -89,7 +91,7 @@ function DeployerPage() {
     }
 
     try {
-      const result = await jettonDeployController.createJetton(params, tonconnect, walletAddress);
+      const result = await jettonDeployController.createJetton(params, connection);
       analytics.sendEvent(
         AnalyticsCategory.DEPLOYER_PAGE,
         AnalyticsAction.DEPLOY,
@@ -108,6 +110,11 @@ function DeployerPage() {
 
   return (
     <Screen>
+      <TxLoader open={isLoading}>
+        <StyledTxLoaderContent>
+          <Typography>Deploying... Check your wallet for a pending transaction</Typography>
+        </StyledTxLoaderContent>
+      </TxLoader>
       <ScreenContent removeBackground>
         <Fade in>
           <Box>
@@ -116,12 +123,7 @@ function DeployerPage() {
             </Box>
             <FormWrapper>
               <SubHeadingWrapper>
-                <Form
-                  isLoading={isLoading}
-                  submitText="Deploy"
-                  onSubmit={deployContract}
-                  inputs={formSpec}
-                />
+                <Form submitText="Deploy" onSubmit={deployContract} inputs={formSpec} />
               </SubHeadingWrapper>
               <Box sx={{ flex: 4 }}>
                 <Description />
diff --git a/src/pages/jetton/FaultyDeploy.tsx b/src/pages/jetton/FaultyDeploy.tsx
index 369b90b..95e1797 100644
--- a/src/pages/jetton/FaultyDeploy.tsx
+++ b/src/pages/jetton/FaultyDeploy.tsx
@@ -2,14 +2,17 @@ import { Box, Typography } from "@mui/material";
 import { styled } from "@mui/system";
 import WarningAmberRoundedIcon from "@mui/icons-material/WarningAmberRounded";
 import { Popup } from "components/Popup";
+import useConnectionStore from "store/connection-store/useConnectionStore";
 import useJettonStore from "store/jetton-store/useJettonStore";
 import { useState } from "react";
+import TxLoader from "components/TxLoader";
 import { jettonDeployController } from "lib/deploy-controller";
 import { Address } from "ton";
+import WalletConnection from "services/wallet-connection";
 import { AppButton } from "components/appButton";
-import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
 
 function FaultyDeploy() {
+  const { address } = useConnectionStore();
   const {
     jettonMaster,
     getJettonDetails,
@@ -21,8 +24,6 @@ function FaultyDeploy() {
     jettonImage,
   } = useJettonStore();
   const [isLoading, setIsLoading] = useState(false);
-  const [tonconnect] = useTonConnectUI();
-  const address = useTonAddress();
 
   const onSubmit = async () => {
     if (!address || !jettonMaster) {
@@ -38,8 +39,7 @@ function FaultyDeploy() {
           description,
           image: jettonImage,
         },
-        tonconnect,
-        address,
+        WalletConnection.getConnection(),
       );
       await getJettonDetails();
     } catch (error) {
@@ -51,6 +51,9 @@ function FaultyDeploy() {
 
   return (
     <>
+      <TxLoader open={isLoading}>
+        <Typography>Loading...</Typography>
+      </TxLoader>
       <Popup
         maxWidth={380}
         open={!!isJettonDeployerFaultyOnChainData && isAdmin && !isLoading}
diff --git a/src/pages/jetton/actions/BurnJettonsAction.tsx b/src/pages/jetton/actions/BurnJettonsAction.tsx
index 3c93d2e..6250b34 100644
--- a/src/pages/jetton/actions/BurnJettonsAction.tsx
+++ b/src/pages/jetton/actions/BurnJettonsAction.tsx
@@ -4,13 +4,13 @@ import { Popup } from "components/Popup";
 import useNotification from "hooks/useNotification";
 import { jettonDeployController } from "lib/deploy-controller";
 import { useState } from "react";
+import WalletConnection from "services/wallet-connection";
 import useJettonStore from "store/jetton-store/useJettonStore";
 import { AppButton } from "components/appButton";
 import { AppNumberInput } from "components/appInput";
 import { toDecimalsBN } from "utils";
 import { useRecoilState } from "recoil";
 import { jettonActionsState } from "pages/jetton/actions/jettonActions";
-import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
 
 function BurnJettonsAction() {
   const [amount, setAmount] = useState<number | undefined>(undefined);
@@ -25,9 +25,8 @@ function BurnJettonsAction() {
     decimals,
   } = useJettonStore();
   const { showNotification } = useNotification();
-  const [actionInProgress, setActionInProgress] = useState(false);
-  const [tonconnect] = useTonConnectUI();
-  const walletAddress = useTonAddress();
+  const [actionInProgress, setActionInProgress] = useRecoilState(jettonActionsState);
+
   if (!balance || !isMyWallet) {
     return null;
   }
@@ -57,12 +56,8 @@ function BurnJettonsAction() {
 
     try {
       setActionInProgress(true);
-      await jettonDeployController.burnJettons(
-        tonconnect,
-        valueDecimals,
-        jettonWalletAddress!,
-        walletAddress,
-      );
+      const connection = WalletConnection.getConnection();
+      await jettonDeployController.burnJettons(connection, valueDecimals, jettonWalletAddress!);
       const message = `Successfully burned ${amount.toLocaleString()} ${symbol}`;
       showNotification(message, "success");
       getJettonDetails();
@@ -94,7 +89,7 @@ function BurnJettonsAction() {
           <AppButton onClick={onBurn}>Submit</AppButton>
         </>
       </Popup>
-      <AppButton loading={actionInProgress} transparent={true} onClick={() => setOpen(true)}>
+      <AppButton transparent={true} onClick={() => setOpen(true)}>
         Burn
       </AppButton>
     </>
diff --git a/src/pages/jetton/actions/ConnectAction.tsx b/src/pages/jetton/actions/ConnectAction.tsx
index 3f3dafe..d00725a 100644
--- a/src/pages/jetton/actions/ConnectAction.tsx
+++ b/src/pages/jetton/actions/ConnectAction.tsx
@@ -1,8 +1,18 @@
+import useConnectionStore from "store/connection-store/useConnectionStore";
 import { AppButton } from "components/appButton";
-import { onConnect } from "utils";
 
 function ConnectAction() {
-  return <AppButton onClick={onConnect}>Connect wallet</AppButton>;
+  const { address, toggleConnect } = useConnectionStore();
+
+  if (address) {
+    return null;
+  }
+
+  return (
+    <AppButton fontWeight={700} width={150} height={44} onClick={() => toggleConnect(true)}>
+      Connect wallet
+    </AppButton>
+  );
 }
 
 export default ConnectAction;
diff --git a/src/pages/jetton/actions/MintJettonsAction.tsx b/src/pages/jetton/actions/MintJettonsAction.tsx
index cba8cca..cf9c16b 100644
--- a/src/pages/jetton/actions/MintJettonsAction.tsx
+++ b/src/pages/jetton/actions/MintJettonsAction.tsx
@@ -12,16 +12,14 @@ import { AppButton } from "components/appButton";
 import { AppNumberInput } from "components/appInput";
 import { useRecoilState } from "recoil";
 import { jettonActionsState } from "pages/jetton/actions/jettonActions";
-import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
 
 function MintJettonsAction() {
   const [amount, setAmount] = useState<number | undefined>(undefined);
   const [open, setOpen] = useState(false);
-  const [actionInProgress, setActionInProgress] = useState(false);
-  const [tonconnect] = useTonConnectUI();
+  const [actionInProgress, setActionInProgress] = useRecoilState(jettonActionsState);
+
   const { jettonMaster, isAdmin, symbol, getJettonDetails, isMyWallet, decimals } =
     useJettonStore();
-  const walletAddress = useTonAddress();
   const { showNotification } = useNotification();
 
   if (!isAdmin || !isMyWallet) {
@@ -41,12 +39,8 @@ function MintJettonsAction() {
 
     try {
       setActionInProgress(true);
-      await jettonDeployController.mint(
-        tonconnect,
-        Address.parse(jettonMaster),
-        value,
-        walletAddress,
-      );
+      const connection = WalletConnection.getConnection();
+      await jettonDeployController.mint(connection, Address.parse(jettonMaster), value);
       setOpen(false);
       const message = (
         <>
@@ -84,7 +78,7 @@ function MintJettonsAction() {
           <AppButton onClick={onMint}>Submit</AppButton>
         </>
       </Popup>
-      <AppButton loading={actionInProgress} transparent={true} onClick={() => setOpen(true)}>
+      <AppButton transparent={true} onClick={() => setOpen(true)}>
         Mint
       </AppButton>
     </>
diff --git a/src/pages/jetton/actions/RevokeOwnershipAction.tsx b/src/pages/jetton/actions/RevokeOwnershipAction.tsx
index ce632a4..3368fc3 100644
--- a/src/pages/jetton/actions/RevokeOwnershipAction.tsx
+++ b/src/pages/jetton/actions/RevokeOwnershipAction.tsx
@@ -13,15 +13,12 @@ import { Typography } from "@mui/material";
 import bullet from "assets/icons/bullet.svg";
 import error from "assets/icons/error-notification.svg";
 import { Box } from "@mui/system";
-import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
 
 function RevokeOwnershipAction() {
-  const [actionInProgress, setActionInProgress] = useState(false);
+  const setActionInProgress = useSetRecoilState(jettonActionsState);
   const [showAlert, setShowAlert] = useState(false);
   const { jettonMaster, isAdmin, getJettonDetails, isMyWallet, symbol, isImageBroken } =
     useJettonStore();
-  const walletAddress = useTonAddress();
-  const [tonconnect] = useTonConnectUI();
   const { showNotification } = useNotification();
   if (!isAdmin || !isMyWallet) {
     return null;
@@ -40,8 +37,7 @@ function RevokeOwnershipAction() {
       setActionInProgress(true);
       await jettonDeployController.burnAdmin(
         Address.parse(jettonMaster),
-        tonconnect,
-        walletAddress,
+        WalletConnection.getConnection(),
       );
       getJettonDetails();
       showNotification("Ownership revoked successfully", "success");
@@ -117,12 +113,12 @@ function RevokeOwnershipAction() {
               Cancel
             </AppButton>
           </Box>
-          <AppButton loading={actionInProgress} width={100} onClick={onSubmit}>
+          <AppButton width={100} onClick={onSubmit}>
             Revoke
           </AppButton>
         </CenteringWrapper>
       </Popup>
-      <AppButton loading={actionInProgress} transparent={true} onClick={onClick}>
+      <AppButton transparent={true} onClick={onClick}>
         Revoke ownership
       </AppButton>
     </>
diff --git a/src/pages/jetton/actions/UpdateMetadata.tsx b/src/pages/jetton/actions/UpdateMetadata.tsx
index 5f6e1ea..858007c 100644
--- a/src/pages/jetton/actions/UpdateMetadata.tsx
+++ b/src/pages/jetton/actions/UpdateMetadata.tsx
@@ -8,8 +8,6 @@ import { Address } from "ton";
 import useNotification from "hooks/useNotification";
 import { useSetRecoilState } from "recoil";
 import { jettonActionsState } from "pages/jetton/actions/jettonActions";
-import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
-import { useState } from "react";
 
 const inputsName = ["name", "symbol", "decimals", "tokenImage", "description"];
 
@@ -47,10 +45,9 @@ interface UpdateMetadataProps {
 function UpdateMetadata({ setOpen }: UpdateMetadataProps) {
   const store = useJettonStore();
   const { isAdmin, getJettonDetails, jettonMaster } = store;
-  const [actionInProgress, setActionInProgress] = useState(false);
+  const setActionInProgress = useSetRecoilState(jettonActionsState);
   const { showNotification } = useNotification();
-  const [tonconnect] = useTonConnectUI();
-  const walltAddress = useTonAddress();
+
   if (!isAdmin) {
     return null;
   }
@@ -71,8 +68,7 @@ function UpdateMetadata({ setOpen }: UpdateMetadataProps) {
           image: values.tokenImage,
           decimals: parseInt(values.decimals).toFixed(0),
         },
-        tonconnect,
-        walltAddress,
+        WalletConnection.getConnection(),
       );
       await getJettonDetails();
       setOpen(false);
@@ -94,7 +90,6 @@ function UpdateMetadata({ setOpen }: UpdateMetadataProps) {
       disableExample={true}
       onSubmit={onSubmit}
       inputs={inputs}
-      isLoading={actionInProgress}
       defaultValues={defaultValues}
       onCancel={() => setOpen(false)}
     />
diff --git a/src/pages/jetton/actions/transfer/TransferAction.tsx b/src/pages/jetton/actions/transfer/TransferAction.tsx
index 2291825..d4b40de 100644
--- a/src/pages/jetton/actions/transfer/TransferAction.tsx
+++ b/src/pages/jetton/actions/transfer/TransferAction.tsx
@@ -1,6 +1,8 @@
 import useNotification from "hooks/useNotification";
 import { jettonDeployController } from "lib/deploy-controller";
 import { useState } from "react";
+import WalletConnection from "services/wallet-connection";
+import useConnectionStore from "store/connection-store/useConnectionStore";
 import useJettonStore from "store/jetton-store/useJettonStore";
 import { AppButton } from "components/appButton";
 import { validateTransfer } from "./utils";
@@ -8,9 +10,8 @@ import { ButtonWrapper, TransferContent, TransferWrapper } from "./styled";
 import { AppHeading } from "components/appHeading";
 import { AppNumberInput, AppTextInput } from "components/appInput";
 import { toDecimalsBN } from "utils";
-import { useRecoilState, useSetRecoilState } from "recoil";
+import { useSetRecoilState } from "recoil";
 import { jettonActionsState } from "pages/jetton/actions/jettonActions";
-import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
 
 export const TransferAction = () => {
   const { balance, symbol, jettonWalletAddress, getJettonDetails, isMyWallet, decimals } =
@@ -19,9 +20,8 @@ export const TransferAction = () => {
   const [toAddress, setToAddress] = useState<string | undefined>(undefined);
   const [amount, setAmount] = useState<number | undefined>(undefined);
   const { showNotification } = useNotification();
-  const connectedWalletAddress = useTonAddress();
-  const [tonconnect] = useTonConnectUI();
-  const [actionInProgress, setActionInProgress] = useRecoilState(jettonActionsState);
+  const { address: connectedWalletAddress } = useConnectionStore();
+  const setActionInProgress = useSetRecoilState(jettonActionsState);
 
   if (!balance || !jettonWalletAddress || !isMyWallet) {
     return null;
@@ -42,8 +42,9 @@ export const TransferAction = () => {
 
     setActionInProgress(true);
     try {
+      const connection = WalletConnection.getConnection();
       await jettonDeployController.transfer(
-        tonconnect,
+        connection,
         toDecimalsBN(amount!.toString(), decimals!),
         toAddress!,
         connectedWalletAddress!,
@@ -91,11 +92,7 @@ export const TransferAction = () => {
         />
       </TransferContent>
       <ButtonWrapper>
-        <AppButton
-          disabled={!(toAddress && amount)}
-          onClick={onSubmit}
-          height={50}
-          loading={actionInProgress}>
+        <AppButton disabled={!(toAddress && amount)} onClick={onSubmit} height={50}>
           Transfer {symbol}
         </AppButton>
       </ButtonWrapper>
diff --git a/src/pages/jetton/index.tsx b/src/pages/jetton/index.tsx
index 44afee2..6349a9e 100644
--- a/src/pages/jetton/index.tsx
+++ b/src/pages/jetton/index.tsx
@@ -1,29 +1,30 @@
 import { useEffect } from "react";
+import useConnectionStore from "store/connection-store/useConnectionStore";
 import { ScreenContent, Screen } from "components/Screen";
 import useJettonStore from "store/jetton-store/useJettonStore";
 import FaultyDeploy from "./FaultyDeploy";
 import { StyledContainer } from "pages/jetton/styled";
 import { Wallet } from "pages/jetton/wallet";
 import { Token } from "pages/jetton/dataRow/token";
+import TxLoader from "components/TxLoader";
 import { Typography } from "@mui/material";
 import { useRecoilValue } from "recoil";
 import { jettonActionsState } from "pages/jetton/actions/jettonActions";
 import { useJettonAddress } from "hooks/useJettonAddress";
 import useNotification from "hooks/useNotification";
-import { useTonAddress } from "@tonconnect/ui-react";
 
 export const Jetton = () => {
+  const { address, isConnecting } = useConnectionStore();
   const actionInProgress = useRecoilValue(jettonActionsState);
   const { getJettonDetails } = useJettonStore();
   const { isAddressEmpty, jettonAddress } = useJettonAddress();
   const { showNotification } = useNotification();
-  const address = useTonAddress();
 
   useEffect(() => {
-    if (jettonAddress) {
+    if (jettonAddress && !isConnecting) {
       getJettonDetails();
     }
-  }, [jettonAddress, address]);
+  }, [jettonAddress, getJettonDetails, address, isConnecting]);
 
   useEffect(() => {
     !isAddressEmpty && !jettonAddress && showNotification("Invalid jetton address", "error");
@@ -31,6 +32,9 @@ export const Jetton = () => {
 
   return (
     <Screen>
+      <TxLoader open={actionInProgress}>
+        <Typography>Loading... Check your wallet for a pending transaction</Typography>
+      </TxLoader>
       <FaultyDeploy />
       <ScreenContent>
         <StyledContainer>
diff --git a/src/services/wallet-connection.ts b/src/services/wallet-connection.ts
index 9d11d0c..84fa219 100644
--- a/src/services/wallet-connection.ts
+++ b/src/services/wallet-connection.ts
@@ -1,9 +1,72 @@
+import {
+  ChromeExtensionWalletProvider,
+  TonConnection,
+  TonhubProvider,
+  TonkeeperProvider,
+  OpenMaskWalletProvider,
+} from "@ton-defi.org/ton-connection";
+import { Providers } from "lib/env-profiles";
 import { Address } from "ton";
+
 class WalletConnection {
+  private static connection?: TonConnection;
+
+  private constructor() {}
+
+  public static getConnection() {
+    if (!this.connection) {
+      throw new Error("Connection missing");
+    }
+    return this.connection;
+  }
+
   public static isContractDeployed(contractAddr: Address) {
     return false; // TODO fix
     // return this.connection?._tonClient.isContractDeployed(contractAddr);
   }
+
+  public static async connect(
+    providerId: Providers,
+    onLinkReady: (link: string) => void,
+    isTestnet: boolean,
+    onTransactionLinkReady?: (link: string) => void,
+  ) {
+    let prov;
+
+    switch (providerId) {
+      case Providers.TON_HUB:
+        prov = new TonhubProvider({
+          onSessionLinkReady: onLinkReady,
+          isSandbox: isTestnet,
+          persistenceProvider: localStorage,
+          onTransactionLinkReady,
+        });
+        break;
+      case Providers.EXTENSION:
+        prov = new ChromeExtensionWalletProvider();
+        break;
+      case Providers.TONKEEPER:
+        prov = new TonkeeperProvider({
+          manifestUrl: "https://minter.ton.org/tonconnect-manifest.json",
+          onSessionLinkReady: (l) => {
+            onLinkReady(l);
+          },
+        });
+        break;
+      case Providers.OPEN_MASK:
+        prov = new OpenMaskWalletProvider();
+        break;
+      default:
+        throw new Error("UNKNOWN PROVIDER");
+    }
+
+    this.connection = new TonConnection(prov);
+    return this.connection.connect();
+  }
+
+  public static async disconnect() {
+    await this.connection?.disconnect();
+  }
 }
 
 export default WalletConnection;
diff --git a/src/store/connection-store/index.ts b/src/store/connection-store/index.ts
new file mode 100644
index 0000000..7550d93
--- /dev/null
+++ b/src/store/connection-store/index.ts
@@ -0,0 +1,38 @@
+import { atom, selector } from "recoil";
+import { Wallet } from "@ton-defi.org/ton-connection";
+import { Providers } from "lib/env-profiles";
+
+export interface ConnectionStateAtom {
+  address: string | null;
+  wallet: Wallet | null;
+  adapterId: Providers | null;
+  isConnecting: boolean;
+  showConnect: boolean;
+}
+
+const connectionStateAtom = atom<ConnectionStateAtom>({
+  key: "connectionStateAtom",
+  default: {
+    address: null,
+    wallet: null,
+    adapterId: null,
+    isConnecting: true,
+    showConnect: false,
+  },
+});
+
+const connectWalletSelector = selector<ConnectionStateAtom>({
+  key: "connectWalletSelector",
+  get: ({ get }) => get(connectionStateAtom),
+  set: ({ set, get }, newValue: any) => {
+    const state = get(connectionStateAtom);
+
+    set(connectionStateAtom, {
+      ...state,
+      address: newValue.address,
+      wallet: newValue.wallet,
+    });
+  },
+});
+
+export { connectionStateAtom, connectWalletSelector };
diff --git a/src/store/connection-store/useConnectionStore.ts b/src/store/connection-store/useConnectionStore.ts
new file mode 100644
index 0000000..d5b5698
--- /dev/null
+++ b/src/store/connection-store/useConnectionStore.ts
@@ -0,0 +1,91 @@
+import { useRecoilState, useResetRecoilState } from "recoil";
+import { connectionStateAtom } from ".";
+import { Providers } from "lib/env-profiles";
+import WalletConnection from "services/wallet-connection";
+import { LOCAL_STORAGE_PROVIDER } from "consts";
+import { isMobile } from "react-device-detect";
+import { useContext } from "react";
+import { EnvContext } from "../../App";
+
+function useConnectionStore() {
+  const [connectionState, setConnectionState] = useRecoilState(connectionStateAtom);
+  const resetState = useResetRecoilState(connectionStateAtom);
+  const { isSandbox } = useContext(EnvContext);
+
+  const onTxUrlReady = (value: string) => {
+    // @ts-ignore
+    window.location = value;
+  };
+
+  const toggleConnect = (value: boolean) => {
+    setConnectionState((prevState) => ({
+      ...prevState,
+      showConnect: value,
+    }));
+  };
+
+  const connect = async (provider: Providers, onSessionLink?: (value: string) => void) => {
+    try {
+      setConnectionState((prevState) => ({
+        ...prevState,
+        isConnecting: true,
+      }));
+
+      const wallet = await WalletConnection.connect(
+        provider,
+        onSessionLink ? onSessionLink : () => {},
+        isSandbox,
+        isMobile ? onTxUrlReady : undefined,
+      );
+
+      localStorage.setItem(LOCAL_STORAGE_PROVIDER, provider);
+      setConnectionState((prevState) => ({
+        ...prevState,
+        address: wallet.address,
+        wallet,
+        adapterId: provider,
+      }));
+    } catch (error) {
+      console.error(error);
+    } finally {
+      setConnectionState((prevState) => ({
+        ...prevState,
+        isConnecting: false,
+      }));
+    }
+  };
+
+  const connectOnLoad = async () => {
+    const provider = localStorage.getItem(LOCAL_STORAGE_PROVIDER);
+    if (provider) {
+      connect(provider as Providers);
+    } else {
+      setConnectionState((prevState) => ({
+        ...prevState,
+        isConnecting: false,
+      }));
+    }
+  };
+
+  const disconnect = async () => {
+    setConnectionState((prevState) => ({
+      ...prevState,
+      address: null,
+      wallet: null,
+      adapterId: null,
+    }));
+    localStorage.removeItem(LOCAL_STORAGE_PROVIDER);
+    await WalletConnection.disconnect();
+  };
+
+  return {
+    ...connectionState,
+    disconnect,
+    connect,
+    resetState,
+    connectOnLoad,
+    toggleConnect,
+  };
+}
+
+export default useConnectionStore;
diff --git a/src/store/jetton-store/useJettonStore.ts b/src/store/jetton-store/useJettonStore.ts
index 72a2194..db29e36 100644
--- a/src/store/jetton-store/useJettonStore.ts
+++ b/src/store/jetton-store/useJettonStore.ts
@@ -1,20 +1,22 @@
+import { TonConnection, ChromeExtensionWalletProvider } from "@ton-defi.org/ton-connection";
 import { jettonDeployController } from "lib/deploy-controller";
 import { zeroAddress } from "lib/utils";
 import { useRecoilState, useResetRecoilState } from "recoil";
+import WalletConnection from "services/wallet-connection";
 import { Address } from "ton";
 import { jettonStateAtom } from ".";
 import QuestiomMarkImg from "assets/icons/question.png";
 import { useCallback } from "react";
 import useNotification from "hooks/useNotification";
+import useConnectionStore from "store/connection-store/useConnectionStore";
 import { getUrlParam, isValidAddress } from "utils";
 import { useJettonAddress } from "hooks/useJettonAddress";
-import { useTonAddress, useTonConnectUI } from "@tonconnect/ui-react";
 
 function useJettonStore() {
   const [state, setState] = useRecoilState(jettonStateAtom);
   const reset = useResetRecoilState(jettonStateAtom);
   const { showNotification } = useNotification();
-  const connectedWalletAddress = useTonAddress();
+  const { address: connectedWalletAddress } = useConnectionStore();
   const { jettonAddress } = useJettonAddress();
 
   const getJettonDetails = useCallback(async () => {
@@ -38,6 +40,14 @@ function useJettonStore() {
 
     const parsedJettonMaster = Address.parse(jettonAddress);
 
+    let connection;
+
+    try {
+      connection = WalletConnection.getConnection();
+    } catch (error) {
+      connection = new TonConnection(new ChromeExtensionWalletProvider());
+    }
+
     try {
       setState((prevState) => ({
         ...prevState,
@@ -47,6 +57,7 @@ function useJettonStore() {
       const result = await jettonDeployController.getJettonDetails(
         parsedJettonMaster,
         address ? Address.parse(address) : zeroAddress(),
+        connection,
       );
 
       if (!result) {
diff --git a/src/utils/index.ts b/src/utils/index.ts
index b74c65b..c6d28ce 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -41,12 +41,3 @@ export function toDecimalsBN(num: number | string, decimals: number | string) {
 export function fromDecimals(num: number | string, decimals: number | string) {
   return BigNumber(num).div(ten.pow(decimals)).toFixed();
 }
-
-export const onConnect = () => {
-  const container = document.getElementById("ton-connect-button");
-  const btn = container?.querySelector("button");
-
-  if (btn) {
-    btn.click();
-  }
-};