From f0808de1099ea00de6fa0f006f517352edb55ec3 Mon Sep 17 00:00:00 2001 From: Bartek Wrona Date: Thu, 20 Nov 2025 22:54:08 +0100 Subject: [PATCH 1/3] Defined new deployment targets for testing purposes. --- .gitlab-ci.yml | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c856dc0..87166a2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,6 +125,80 @@ stop_dev_environment: name: auth-dev-mainnet action: stop +deploy_htm_dev_environment: + extends: .webapp_deploy_template + stage: deploy + needs: + - push_protected_app_image + variables: + IMAGE_NAME: "${APP_IMAGE_NAME}" + CONTAINER_NAME: "hive_bridge_htm_dev_deployment" + PORT: 8144 # htm.dev.openhive.network (mirrornet)(port 8144) + DEPLOYMENT_ENV_FILE: "MIRRORNET_HTM_DEV_DEPLOYMENT_ENV" + environment: + name: htm-dev-mirrornet + url: https://htm.dev.openhive.network + on_stop: stop_htm_dev_environment + + rules: + - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_REF_PROTECTED == "true"' + when: manual + allow_failure: true + - when: never + +stop_htm_dev_environment: + extends: .webapp_stop_template + stage: cleanup + needs: + - job: deploy_htm_dev_environment + optional: true + variables: + CONTAINER_NAME: hive_bridge_htm_dev_deployment + rules: + - if: '$CI_COMMIT_REF_PROTECTED == "true"' + when: manual + allow_failure: true + environment: + name: htm-dev-mirrornet + action: stop + +deploy_prototyping_environment: + extends: .webapp_deploy_template + stage: deploy + needs: + - push_protected_app_image + variables: + IMAGE_NAME: "${APP_IMAGE_NAME}" + CONTAINER_NAME: "hive_bridge_prototyping_dev_deployment" + PORT: 8155 # prototyping.openhive.network (mirrornet)(port 8155) + DEPLOYMENT_ENV_FILE: "MIRRORNET_PROTOTYPING_DEV_DEPLOYMENT_ENV" + environment: + name: prototyping-dev-mirrornet + url: https://prototyping.openhive.network + on_stop: stop_prototyping_environment + + rules: + - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_REF_PROTECTED == "true"' + when: manual + allow_failure: true + - when: never + +stop_prototyping_environment: + extends: .webapp_stop_template + stage: cleanup + needs: + - job: deploy_prototyping_environment + optional: true + variables: + CONTAINER_NAME: hive_bridge_prototyping_dev_deployment + rules: + - if: '$CI_COMMIT_REF_PROTECTED == "true"' + when: manual + allow_failure: true + environment: + name: prototyping-dev-mirrornet + action: stop + deploy_prod_environment: extends: .webapp_deploy_template stage: deploy -- GitLab From 0ed4ce8bdd966d81babc6a2ed51deb48688c0e10 Mon Sep 17 00:00:00 2001 From: Bartek Wrona Date: Fri, 21 Nov 2025 12:34:25 +0100 Subject: [PATCH 2/3] htm deployment temporary disabled. --- .gitlab-ci.yml | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 87166a2..b1177b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,41 +125,42 @@ stop_dev_environment: name: auth-dev-mainnet action: stop -deploy_htm_dev_environment: +.deploy_htm_environment: extends: .webapp_deploy_template stage: deploy needs: - push_protected_app_image variables: IMAGE_NAME: "${APP_IMAGE_NAME}" - CONTAINER_NAME: "hive_bridge_htm_dev_deployment" - PORT: 8144 # htm.dev.openhive.network (mirrornet)(port 8144) + CONTAINER_NAME: "hive_bridge_htm_deployment" + PORT: 8144 # htm.openhive.network (mirrornet)(port 8144) DEPLOYMENT_ENV_FILE: "MIRRORNET_HTM_DEV_DEPLOYMENT_ENV" environment: - name: htm-dev-mirrornet - url: https://htm.dev.openhive.network - on_stop: stop_htm_dev_environment + name: htm-mirrornet + url: https://htm.openhive.network + on_stop: stop_htm_environment rules: - if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_COMMIT_REF_PROTECTED == "true"' - when: manual - allow_failure: true + #when: manual + #allow_failure: true + when: never # temp. disabled until app will be ready - when: never -stop_htm_dev_environment: +.stop_htm_environment: extends: .webapp_stop_template stage: cleanup needs: - - job: deploy_htm_dev_environment + - job: deploy_htm_environment optional: true variables: - CONTAINER_NAME: hive_bridge_htm_dev_deployment + CONTAINER_NAME: hive_bridge_htm_deployment rules: - if: '$CI_COMMIT_REF_PROTECTED == "true"' when: manual allow_failure: true environment: - name: htm-dev-mirrornet + name: htm-mirrornet action: stop deploy_prototyping_environment: -- GitLab From c10da100527ca56e507ef8f1ca1808b299c6bbe5 Mon Sep 17 00:00:00 2001 From: Bartek Wrona Date: Fri, 21 Nov 2025 14:16:17 +0100 Subject: [PATCH 3/3] Eliminated MetaMask Flask references, as Hive Snap is already officially accepted by MetaMask. --- README.md | 2 +- src/components/onboarding/SelectWallet.vue | 2 +- src/components/utilcards/AccountCreationCard.vue | 2 +- src/components/wallet/WalletStatusAlerts.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9fa5889..2dead3e 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Metamask Wallet dApp ## Running -1. Install and configure [Metamask Flask](https://docs.metamask.io/snaps/get-started/install-flask/). **REMEMBER TO DISABLE STANDARD METAMASK BEFORE TESTING** +1. Install and configure [Metamask](https://metamask.io/download). In case of producing another (not yet accepted) version of snap, you will need to use a [Metamask Flask](https://docs.metamask.io/snaps/get-started/install-flask/). **REMEMBER TO DISABLE STANDARD METAMASK BEFORE TESTING** 1. Install project: `git clone --recurse-submodules https://gitlab.syncad.com/hive/wallet-dapp.git` 1. Install dependencies: `pnpm install` 1. Start development server: `pnpm start` diff --git a/src/components/onboarding/SelectWallet.vue b/src/components/onboarding/SelectWallet.vue index 65ac4b2..1c4f637 100644 --- a/src/components/onboarding/SelectWallet.vue +++ b/src/components/onboarding/SelectWallet.vue @@ -52,7 +52,7 @@ const close = () => { { if (!hasAnyWallet.value) { // Check specifically for MetaMask - if not installed, redirect to installation page if (!walletsStatus.value.metamask) { - window.open('https://docs.metamask.io/snaps/get-started/install-flask/', '_blank'); + window.open('https://metamask.io/download/', '_blank'); return; } // If other wallets are available, open wallet selection modal diff --git a/src/components/wallet/WalletStatusAlerts.vue b/src/components/wallet/WalletStatusAlerts.vue index c83adc3..be027cd 100644 --- a/src/components/wallet/WalletStatusAlerts.vue +++ b/src/components/wallet/WalletStatusAlerts.vue @@ -11,7 +11,7 @@ const props = defineProps<{ const walletStore = useWalletStore(); const defaultWalletName = props.walletName || 'Metamask'; -const defaultInstallUrl = props.installUrl || 'https://docs.metamask.io/snaps/get-started/install-flask/'; +const defaultInstallUrl = props.installUrl || 'https://metamask.io/download/';