diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c856dc0903ba0c194d1f9a434e1b4643eb8ca805..b1177b5942036fffd3e00b8229c0463733dd623c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,6 +125,81 @@ stop_dev_environment: name: auth-dev-mainnet action: stop +.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_deployment" + PORT: 8144 # htm.openhive.network (mirrornet)(port 8144) + DEPLOYMENT_ENV_FILE: "MIRRORNET_HTM_DEV_DEPLOYMENT_ENV" + 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: never # temp. disabled until app will be ready + - when: never + +.stop_htm_environment: + extends: .webapp_stop_template + stage: cleanup + needs: + - job: deploy_htm_environment + optional: true + variables: + CONTAINER_NAME: hive_bridge_htm_deployment + rules: + - if: '$CI_COMMIT_REF_PROTECTED == "true"' + when: manual + allow_failure: true + environment: + name: htm-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 diff --git a/README.md b/README.md index 9fa588947206644cd0cef0ea306c0fdee858ea39..2dead3eb191cfb3c8a2199d0e0da74c53518aee6 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 65ac4b26b333644489a803d972242802191a8e21..1c4f6376022c4813ee1d957ff7dfdd852d2742fe 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 c83adc323ba788e3dd3542f289a19eb15af38d9c..be027cd1dfd79b9b5e5b8c72795022825910cfe4 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/';