From 6c138a157380b260174e83193f78b0a524d92cc3 Mon Sep 17 00:00:00 2001 From: Ulad Palinski <46526208+upalinski@users.noreply.github.com> Date: Thu, 19 Dec 2024 03:09:14 +0400 Subject: [PATCH 1/4] Is connected (#220) Co-authored-by: upalinski --- .env.stage | 4 ++++ package-lock.json | 4 ++-- packages/embed-wallet-inject/package.json | 2 +- packages/embed-wallet/package.json | 2 +- packages/embed-wallet/src/EmbedWallet.ts | 14 +++++++++++--- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.env.stage b/.env.stage index 45516296..4b4f7611 100644 --- a/.env.stage +++ b/.env.stage @@ -44,3 +44,7 @@ REACT_APP_SENTRY_DNS=https://9d65aed043f04fd4bc14406a85c2a76d@o318183.ingest.sen REACT_APP_TRANSFER_ASSETS_FEATURE=true REACT_APP_ASSETS_MANAGEMENT_FEATURE=true REACT_APP_ENABLE_OTP_LINK=false + +# Telegram +REACT_APP_TELEGRAM_BOT_ID=7692665189 +REACT_APP_TELEGRAM_BOT_USERNAME=stage_cere_wallet_bot diff --git a/package-lock.json b/package-lock.json index 110ee09a..6dd8a9b8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -36974,7 +36974,7 @@ }, "packages/embed-wallet": { "name": "@cere/embed-wallet", - "version": "0.22.2", + "version": "0.22.3", "license": "Apache-2.0", "dependencies": { "@cere/torus-embed": "0.2.9", @@ -36985,7 +36985,7 @@ }, "packages/embed-wallet-inject": { "name": "@cere/embed-wallet-inject", - "version": "0.22.2", + "version": "0.22.3", "license": "Apache-2.0", "dependencies": { "@polkadot/extension-inject": "^0.46.6" diff --git a/packages/embed-wallet-inject/package.json b/packages/embed-wallet-inject/package.json index 13e08f1e..86b6b822 100644 --- a/packages/embed-wallet-inject/package.json +++ b/packages/embed-wallet-inject/package.json @@ -1,6 +1,6 @@ { "name": "@cere/embed-wallet-inject", - "version": "0.22.2", + "version": "0.22.3", "sideEffects": false, "type": "module", "types": "./dist/types/index.d.ts", diff --git a/packages/embed-wallet/package.json b/packages/embed-wallet/package.json index 01838f4c..7d69029a 100644 --- a/packages/embed-wallet/package.json +++ b/packages/embed-wallet/package.json @@ -1,6 +1,6 @@ { "name": "@cere/embed-wallet", - "version": "0.22.2", + "version": "0.22.3", "description": "Cere Wallet SDK to integrate the wallet into a web application.", "sideEffects": false, "main": "dist/bundle.umd.js", diff --git a/packages/embed-wallet/src/EmbedWallet.ts b/packages/embed-wallet/src/EmbedWallet.ts index a01de301..7e77adb6 100644 --- a/packages/embed-wallet/src/EmbedWallet.ts +++ b/packages/embed-wallet/src/EmbedWallet.ts @@ -71,12 +71,18 @@ export class EmbedWallet { private proxyProvider: ProxyProvider; private connectOptions: WalletConnectOptions = {}; private onAfterInit?: (error?: any) => void; + private onAfterConnect?: (error?: any) => void; /** * @description Promise that resolves when the wallet instance is initialized and ready */ readonly isReady: Promise; + /** + * @description Promise that resolves when the wallet instance is connected + */ + readonly isConnected: Promise; + constructor({ env, clientVersion = WALLET_CLIENT_VERSION, ...options }: WalletOptions = {}) { if (env) { preloadIframe(buildEnvMap[env], clientVersion); @@ -91,7 +97,9 @@ export class EmbedWallet { this.isReady = new Promise((resolve, reject) => { this.onAfterInit = (error) => (error ? reject(error) : resolve(this)); }); - + this.isConnected = new Promise((resolve, reject) => { + this.onAfterConnect = (error) => (error ? reject(error) : resolve(this)); + }); this.provider.on('message', this.handleEvenets); } @@ -215,11 +223,11 @@ export class EmbedWallet { }); this.setStatus('connected'); - + this.onAfterConnect?.(); return address; } catch (error) { rollback(); - + this.onAfterConnect?.(error); throw error; } } From a806cde35ea9e7fd951777c9537484b6899dd258 Mon Sep 17 00:00:00 2001 From: Oleg Yankovich <33641729+krolol@users.noreply.github.com> Date: Mon, 23 Dec 2024 22:21:30 +0100 Subject: [PATCH 2/4] Update bucket name --- .github/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index f435ee42..6d2fc95a 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -18,6 +18,6 @@ jobs: build_command: 'npm run build' path_to_static_files_to_upload: 'build' aws_account_id: ${{ vars.DEV_CORE_AWS_ACCOUNT_ID }} - s3_bucket_name: 'dev-cere-wallet-client-dist' + s3_bucket_name: 'wallet.dev.cere.io' secrets: NPM_TOKEN: ${{ secrets.NPM_TOKEN_READ }} From 335611bb87e37849ac162653a333cce512da4bd1 Mon Sep 17 00:00:00 2001 From: Oleg Yankovich <33641729+krolol@users.noreply.github.com> Date: Mon, 23 Dec 2024 22:39:13 +0100 Subject: [PATCH 3/4] Update account --- .github/workflows/dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index 6d2fc95a..f3bb30da 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -17,7 +17,7 @@ jobs: install_packages_command: 'cp .env.dev .env; npm ci' build_command: 'npm run build' path_to_static_files_to_upload: 'build' - aws_account_id: ${{ vars.DEV_CORE_AWS_ACCOUNT_ID }} + aws_account_id: ${{ vars.DEV_NETWORK_AWS_ACCOUNT_ID }} s3_bucket_name: 'wallet.dev.cere.io' secrets: NPM_TOKEN: ${{ secrets.NPM_TOKEN_READ }} From 62f98d1269e4c27165b7ba4b25c4d0a1b85794d3 Mon Sep 17 00:00:00 2001 From: Ulad Palinski <46526208+upalinski@users.noreply.github.com> Date: Thu, 9 Jan 2025 02:10:03 +0400 Subject: [PATCH 4/4] Configure bot on stage (#219) Co-authored-by: upalinski Co-authored-by: Anton Mazhuto <125869076+mazhutoanton@users.noreply.github.com>