Merge pull request #331 from tonkeeper/feature/ipad

iPad Updates
tonkeeper · Dec 19, 2024 · cd5f30c · cd5f30c
2 parents 6a88e18 + 78eb9a6
commit cd5f30c
Show file tree

Hide file tree

Showing 164 changed files with 1,480 additions and 350 deletions.
diff --git a/apps/tablet/ios/App/App/App.entitlements b/apps/tablet/ios/App/App/App.entitlements
@@ -4,6 +4,10 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:app.tonkeeper.com</string>
+	</array>
 	<key>keychain-access-groups</key>
 	<array>
 		<string>$(AppIdentifierPrefix)com.tonapps.tonkeeperpro</string>

diff --git a/apps/tablet/ios/App/App/AppRelease.entitlements b/apps/tablet/ios/App/App/AppRelease.entitlements
@@ -4,6 +4,10 @@
 <dict>
 	<key>aps-environment</key>
 	<string>development</string>
+	<key>com.apple.developer.associated-domains</key>
+	<array>
+		<string>applinks:app.tonkeeper.com</string>
+	</array>
 	<key>keychain-access-groups</key>
 	<array>
 		<string>$(AppIdentifierPrefix)com.tonapps.tonkeeperpro</string>

diff --git a/apps/tablet/ios/App/App/GoogleService-Info.plist b/apps/tablet/ios/App/App/GoogleService-Info.plist
@@ -3,17 +3,17 @@
 <plist version="1.0">
 <dict>
 	<key>API_KEY</key>
-	<string>AIzaSyBfuV_ymekwDZwlD6TkvKB5292oYd96dbM</string>
+	<string>AIzaSyCpV-zBAgyo22ua1DEZtER8PgUg862hK-c</string>
 	<key>GCM_SENDER_ID</key>
-	<string>488327313434</string>
+	<string>695609596302</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
 	<string>com.tonapps.tonkeeperpro</string>
 	<key>PROJECT_ID</key>
-	<string>tonkeeper-web</string>
+	<string>tonkeeper-3b1dc</string>
 	<key>STORAGE_BUCKET</key>
-	<string>tonkeeper-web.appspot.com</string>
+	<string>tonkeeper-3b1dc.appspot.com</string>
 	<key>IS_ADS_ENABLED</key>
 	<false></false>
 	<key>IS_ANALYTICS_ENABLED</key>
@@ -25,6 +25,6 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:488327313434:ios:85fdb7916fec750461f9a3</string>
+	<string>1:695609596302:ios:54607bbb498c208809acdf</string>
 </dict>
 </plist>
diff --git a/apps/tablet/ios/App/App/Info.plist b/apps/tablet/ios/App/App/Info.plist
@@ -81,5 +81,9 @@
 		<string>dev-pro.tonconsole.com</string>
 		<string>pro.tonconsole.com</string>
 	</array>
+	<key>NSUserActivityTypes</key>
+    <array>
+        <string>NSUserActivityTypeBrowsingWeb</string>
+    </array>
 </dict>
 </plist>
diff --git a/apps/tablet/ios/App/Podfile b/apps/tablet/ios/App/Podfile
@@ -15,6 +15,7 @@ def capacitor_pods
   pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
   pod 'CapacitorClipboard', :path => '../../node_modules/@capacitor/clipboard'
   pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device'
+  pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
   pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
   pod 'CapacitorPushNotifications', :path => '../../node_modules/@capacitor/push-notifications'
   pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'

diff --git a/apps/tablet/ios/App/Podfile.lock b/apps/tablet/ios/App/Podfile.lock
@@ -10,6 +10,8 @@ PODS:
   - CapacitorCordova (6.2.0)
   - CapacitorDevice (6.0.2):
     - Capacitor
+  - CapacitorHaptics (6.0.2):
+    - Capacitor
   - CapacitorPreferences (6.0.3):
     - Capacitor
   - CapacitorPushNotifications (6.0.3):
@@ -77,6 +79,7 @@ DEPENDENCIES:
   - "CapacitorClipboard (from `../../node_modules/@capacitor/clipboard`)"
   - "CapacitorCordova (from `../../node_modules/@capacitor/ios`)"
   - "CapacitorDevice (from `../../node_modules/@capacitor/device`)"
+  - "CapacitorHaptics (from `../../node_modules/@capacitor/haptics`)"
   - "CapacitorPreferences (from `../../node_modules/@capacitor/preferences`)"
   - "CapacitorPushNotifications (from `../../node_modules/@capacitor/push-notifications`)"
   - "CapacitorSplashScreen (from `../../node_modules/@capacitor/splash-screen`)"
@@ -106,6 +109,8 @@ EXTERNAL SOURCES:
     :path: "../../node_modules/@capacitor/ios"
   CapacitorDevice:
     :path: "../../node_modules/@capacitor/device"
+  CapacitorHaptics:
+    :path: "../../node_modules/@capacitor/haptics"
   CapacitorPreferences:
     :path: "../../node_modules/@capacitor/preferences"
   CapacitorPushNotifications:
@@ -120,6 +125,7 @@ SPEC CHECKSUMS:
   CapacitorClipboard: 4443c3cdb7c77b1533dfe3ff0f9f7756aa8579df
   CapacitorCordova: b33e7f4aa4ed105dd43283acdd940964374a87d9
   CapacitorDevice: 9efd479d71d1baad74b75df531184c3f730eaa48
+  CapacitorHaptics: 4fc15afe22b123d093e6ace24d95e8e3b1f261b9
   CapacitorPreferences: f3eadae2369ac3ab8e21743a2959145b0d1286a3
   CapacitorPushNotifications: 9b178e010634d2f7bfca97b81478503463f86b6c
   CapacitorSplashScreen: fd8bf1bf9081d9aa8817b7cd37d740d1bdaf2fb2
@@ -132,6 +138,6 @@ SPEC CHECKSUMS:
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
 
-PODFILE CHECKSUM: f9d707744c97cd8f502d129ac50e6f2a2abd9aca
+PODFILE CHECKSUM: 909da498bd070920c1661b81df41f840cf5ecf80
 
 COCOAPODS: 1.16.2
diff --git a/apps/tablet/package.json b/apps/tablet/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@tonkeeper/tablet",
-    "version": "3.0.0",
+    "version": "3.1.0",
     "license": "Apache-2.0",
     "description": "Your tablet wallet on The Open Network",
     "type": "module",
@@ -26,6 +26,7 @@
         "@capacitor/clipboard": "^6.0.1",
         "@capacitor/core": "latest",
         "@capacitor/device": "^6.0.2",
+        "@capacitor/haptics": "^6.0.2",
         "@capacitor/ios": "^6.1.2",
         "@capacitor/preferences": "^6.0.2",
         "@capacitor/push-notifications": "^6.0.3",

diff --git a/apps/tablet/src/libs/appSdk.ts b/apps/tablet/src/libs/appSdk.ts
@@ -1,17 +1,19 @@
 import {
     BaseApp,
+    CookieService,
     IAppSdk,
     KeychainPassword,
-    TouchId,
-    CookieService, NotificationService
+    NotificationService,
+    TouchId
 } from "@tonkeeper/core/dist/AppSdk";
-import packageJson from '../../package.json';
-import { TabletStorage } from './storage';
-import { Clipboard } from '@capacitor/clipboard';
-import { getWindow } from './utils';
+import packageJson from "../../package.json";
+import { TabletStorage } from "./storage";
+import { Clipboard } from "@capacitor/clipboard";
+import { getWindow } from "./utils";
 import { Biometric, SecureStorage } from "./plugins";
 import { CapacitorCookies } from "@capacitor/core";
-import { Device } from '@capacitor/device';
+import { Device } from "@capacitor/device";
+import { Haptics, NotificationType } from "@capacitor/haptics";
 
 export class KeychainTablet implements KeychainPassword {
     setPassword = async (publicKey: string, mnemonic: string) => {
@@ -36,6 +38,8 @@ export class CookieTablet implements CookieService {
 }
 
 export class TouchIdTablet implements TouchId {
+    constructor(private alert: (text: string) => void) { }
+
     canPrompt = async () => {
         try {
             const result = await Biometric.canPrompt();
@@ -47,7 +51,14 @@ export class TouchIdTablet implements TouchId {
     };
 
     prompt = async (reason: (lang: string) => string) => {
-        return Biometric.prompt(reason('en'));
+        try {
+            return await Biometric.prompt(reason('en'));
+        } catch (e) {
+            if (e && typeof e === 'object' && 'message' in e && typeof e.message === 'string') {
+                this.alert(e.message);
+            }
+            throw e;
+        }
     };
 }
 
@@ -61,7 +72,7 @@ export class TabletAppSdk extends BaseApp implements IAppSdk {
      */
     notifications: NotificationService | undefined = undefined;
 
-    touchId = new TouchIdTablet();
+    touchId = new TouchIdTablet(this.topMessage.bind(this));
 
     constructor() {
         super(new TabletStorage());
@@ -79,6 +90,10 @@ export class TabletAppSdk extends BaseApp implements IAppSdk {
     version = packageJson.version ?? 'Unknown';
 
     targetEnv = TABLET_APPLICATION_ID;
+
+    hapticNotification = (type: 'success' | 'error') => {
+        return Haptics.notification({type: type === 'success' ? NotificationType.Success : NotificationType.Error});
+    };
 }
 
 export const getTabletOS = async ()=> {

diff --git a/apps/tablet/src/libs/tabletNotifications.ts b/apps/tablet/src/libs/tabletNotifications.ts
@@ -105,10 +105,10 @@ export class TabletNotifications implements NotificationService {
         await this.storage.set(AppKey.NOTIFICATIONS, records);
     }
     async subscribeTonConnect() {
-        throw new Error('Method not supported.');
+        // TODO
     }
     async unsubscribeTonConnect() {
-        throw new Error('Method not supported.');
+        // TODO
     }
     async subscribed(address: string) {
         const records = await this.getRecords();

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -10,7 +10,7 @@
         "sdk": "npm-run-all -p generate:*",
         "generate:sdkV2": "rm -fr src/tonApiV2 && docker build -f resource/Dockerfile.apiV2 . -t tonapisdkv2 && docker run --rm --user=$(id -u):$(id -g) -v \"$PWD\":/local tonapisdkv2",
         "generate:tronApi": "rm -fr src/tronApi && docker build -f resource/Dockerfile.tronApi . -t tronapisdk && docker run --rm --user=$(id -u):$(id -g) -v \"$PWD\":/local tronapisdk",
-        "generate:tonConsoleApi": "rm -r ./src/tonConsoleApi || true && npx openapi-typescript-codegen --input 'https://raw.githubusercontent.com/tonkeeper/tonconsole_backend/dev/swagger.yaml?token=GHSAT0AAAAAACKHFPNI4HJL4Q4RIAYDUQ3MZPAKM2A' --output ./src/tonConsoleApi",
+        "generate:tonConsoleApi": "rm -r ./src/tonConsoleApi || true && npx openapi-typescript-codegen --input 'https://raw.githubusercontent.com/tonkeeper/tonconsole_backend/refs/heads/main/swagger.yaml?token=GHSAT0AAAAAACJYQUOCGQXJBM2BFNOB6XREZ2ZZZCA' --output ./src/tonConsoleApi",
         "generate:swapsApi": "rm -r ./src/swapsApi || true && npx openapi-typescript-codegen --input 'https://raw.githubusercontent.com/tonkeeper/swaps-backend/master/swagger.yaml?token=GHSAT0AAAAAACJYQUODBKR67AB7WULZBFWEZSUUGFQ' --output ./src/swapsApi",
         "generate:batteryApi": "rm -fr ./src/batteryApi && docker build -f resource/Dockerfile.batteryApi . -t batteryapi && docker run --rm --user=$(id -u):$(id -g) -v \"$PWD\":/local batteryapi",
         "build:pkg": "yarn build"

diff --git a/packages/core/src/Keys.ts b/packages/core/src/Keys.ts
@@ -40,6 +40,7 @@ export enum AppKey {
     USER_ID = 'user_id',
     PRO = 'pro_state',
     PRO_BACKUP = 'pro_backup',
+    PRO_AUTH_TOKEN = 'pro_auth_token',
 
     SIGNER_MESSAGE = 'signer_message',
     SWAP_CUSTOM_ASSETS = 'swap_custom_assets',

diff --git a/packages/core/src/service/proService.ts b/packages/core/src/service/proService.ts
@@ -17,7 +17,6 @@ import {
     FiatCurrencies as FiatCurrenciesGenerated,
     InvoiceStatus,
     InvoicesInvoice,
-    Lang,
     ProServiceDashboardCellAddress,
     ProServiceDashboardCellNumericCrypto,
     ProServiceDashboardCellNumericFiat,
@@ -44,9 +43,12 @@ export const getBackupState = async (storage: IStorage) => {
     return backup ?? toEmptySubscription();
 };
 
-export const getProState = async (storage: IStorage): Promise<ProState> => {
+export const getProState = async (
+    authTokenService: ProAuthTokenService,
+    storage: IStorage
+): Promise<ProState> => {
     try {
-        return await loadProState(storage);
+        return await loadProState(authTokenService, storage);
     } catch (e) {
         console.error(e);
         return {
@@ -81,7 +83,16 @@ export const walletVersionFromProServiceDTO = (value: string) => {
     }
 };
 
-export const loadProState = async (storage: IStorage): Promise<ProState> => {
+export type ProAuthTokenService = {
+    attachToken: () => Promise<void>;
+    onTokenUpdated: (token: string | null) => Promise<void>;
+};
+
+const loadProState = async (
+    authService: ProAuthTokenService,
+    storage: IStorage
+): Promise<ProState> => {
+    await authService.attachToken();
     const user = await ProServiceService.proServiceGetUserInfo();
 
     let authorizedWallet: ProStateWallet | null = null;
@@ -147,16 +158,8 @@ export const loadProState = async (storage: IStorage): Promise<ProState> => {
     };
 };
 
-export const checkAuthCookie = async () => {
-    try {
-        await ProServiceService.proServiceVerify();
-        return true;
-    } catch (e) {
-        return false;
-    }
-};
-
 export const authViaTonConnect = async (
+    authService: ProAuthTokenService,
     api: APIConfig,
     wallet: TonWalletStandard,
     signProof: (bufferToSing: Buffer) => Promise<Uint8Array>
@@ -187,13 +190,17 @@ export const authViaTonConnect = async (
     if (!result.ok) {
         throw new Error('Unable to authorize');
     }
+
+    await authService.onTokenUpdated(result.auth_token);
 };
 
-export const logoutTonConsole = async () => {
+export const logoutTonConsole = async (authService: ProAuthTokenService) => {
     const result = await ProServiceService.proServiceLogout();
     if (!result.ok) {
         throw new Error('Unable to logout');
     }
+
+    await authService.onTokenUpdated(null);
 };
 
 export const getProServiceTiers = async (lang?: Language | undefined, promoCode?: string) => {
@@ -237,9 +244,9 @@ export const createRecipient = async (
     return [recipient, asset];
 };
 
-export const retryProService = async (storage: IStorage) => {
+export const retryProService = async (authService: ProAuthTokenService, storage: IStorage) => {
     for (let i = 0; i < 10; i++) {
-        const state = await getProState(storage);
+        const state = await getProState(authService, storage);
         if (state.subscription.valid) {
             return;
         }
@@ -260,12 +267,20 @@ export const waitProServiceInvoice = async (invoice: InvoicesInvoice) => {
     } while (updated.status === InvoiceStatus.PENDING);
 };
 
-export async function startProServiceTrial(botId: string, lang?: string) {
+export async function startProServiceTrial(
+    authService: ProAuthTokenService,
+    botId: string,
+    lang?: string
+) {
     const tgData = await loginViaTG(botId, lang);
     if (!tgData) {
         return false;
     }
-    return (await ProServiceService.proServiceTrial(tgData)).ok;
+    const result = await ProServiceService.proServiceTrial(tgData);
+
+    await authService.onTokenUpdated(result.auth_token);
+
+    return result.ok;
 }
 
 export async function getDashboardColumns(lang?: string): Promise<DashboardColumn[]> {
@@ -283,6 +298,11 @@ export async function getDashboardColumns(lang?: string): Promise<DashboardColum
     }));
 }
 
+enum Lang {
+    EN = 'en',
+    RU = 'ru'
+}
+
 export async function getDashboardData(
     query: {
         accounts: string[];

diff --git a/packages/core/src/tonConsoleApi/core/ApiError.ts b/packages/core/src/tonConsoleApi/core/ApiError.ts
@@ -1,4 +1,4 @@
-/* generated using openapi-typescript-codegen -- do no edit */
+/* generated using openapi-typescript-codegen -- do not edit */
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */

diff --git a/packages/core/src/tonConsoleApi/core/ApiRequestOptions.ts b/packages/core/src/tonConsoleApi/core/ApiRequestOptions.ts
@@ -1,4 +1,4 @@
-/* generated using openapi-typescript-codegen -- do no edit */
+/* generated using openapi-typescript-codegen -- do not edit */
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */

diff --git a/packages/core/src/tonConsoleApi/core/ApiResult.ts b/packages/core/src/tonConsoleApi/core/ApiResult.ts
@@ -1,4 +1,4 @@
-/* generated using openapi-typescript-codegen -- do no edit */
+/* generated using openapi-typescript-codegen -- do not edit */
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */

diff --git a/packages/core/src/tonConsoleApi/core/CancelablePromise.ts b/packages/core/src/tonConsoleApi/core/CancelablePromise.ts
@@ -1,4 +1,4 @@
-/* generated using openapi-typescript-codegen -- do no edit */
+/* generated using openapi-typescript-codegen -- do not edit */
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */
@@ -85,9 +85,9 @@ export class CancelablePromise<T> implements Promise<T> {
         });
     }
 
-     get [Symbol.toStringTag]() {
-            return "Cancellable Promise";
-     }
+    get [Symbol.toStringTag]() {
+        return "Cancellable Promise";
+    }
 
     public then<TResult1 = T, TResult2 = never>(
         onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,

diff --git a/packages/core/src/tonConsoleApi/core/OpenAPI.ts b/packages/core/src/tonConsoleApi/core/OpenAPI.ts
@@ -1,4 +1,4 @@
-/* generated using openapi-typescript-codegen -- do no edit */
+/* generated using openapi-typescript-codegen -- do not edit */
 /* istanbul ignore file */
 /* tslint:disable */
 /* eslint-disable */