Merge pull request #41 from tonkeeper/feature/pro

Desktop 2 columns layout
tonkeeper · Mar 5, 2024 · 3da4051 · 3da4051
2 parents 237ff1e + 268b06f
commit 3da4051
Show file tree

Hide file tree

Showing 191 changed files with 5,442 additions and 1,030 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -100,7 +100,8 @@ module.exports = {
                         vars: 'all',
                         args: 'all',
                         ignoreRestSiblings: false,
-                        argsIgnorePattern: '^_'
+                        argsIgnorePattern: '^_',
+                        varsIgnorePattern: '^_'
                     }
                 ],
 

diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -18,6 +18,7 @@ jobs:
             APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
             APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
             REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE }}
+            REACT_APP_TONCONSOLE_API: https://pro.tonconsole.com
             GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
             DEBUG: electron*
 

diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml
@@ -18,6 +18,7 @@ jobs:
             APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }}
             APPLE_API_ISSUER: ${{ secrets.APPLE_API_ISSUER }}
             REACT_APP_AMPLITUDE: ${{ secrets.REACT_APP_AMPLITUDE }}
+            REACT_APP_TONCONSOLE_API: https://pro.tonconsole.com
             DEBUG: electron*
 
         steps:

diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
     "name": "@tonkeeper/desktop",
     "license": "Apache-2.0",
-    "version": "3.6.2",
+    "version": "3.7.0",
     "description": "Your desktop wallet on The Open Network",
     "main": ".webpack/main",
     "repository": {
@@ -22,7 +22,7 @@
         "lint": "eslint --ext .ts,.tsx .",
         "build": "yarn make",
         "build:desktop": "yarn make",
-        "debug": "export DEBUG=electron*"
+        "proxyTonConsole": "lcp --proxyUrl https://dev.tonconsole.com"
     },
     "keywords": [],
     "author": {
@@ -44,6 +44,7 @@
         "@types/node": "^20.10.3",
         "@types/react": "^18.0.26",
         "@types/react-dom": "^18.0.9",
+        "@types/tough-cookie": "^4",
         "@types/uuid": "^9.0.7",
         "@typescript-eslint/eslint-plugin": "^5.0.0",
         "@typescript-eslint/parser": "^5.0.0",
@@ -81,7 +82,9 @@
         "react-i18next": "^13.5.0",
         "react-router-dom": "^6.20.1",
         "styled-components": "^6.1.1",
+        "tough-cookie": "^4.1.3",
         "update-electron-app": "^3.0.0",
+        "util": "^0.12.5",
         "uuid": "^9.0.1"
     },
     "packageManager": "yarn@4.0.2"