Merge pull request #804 from D8-X/dev

dev
D8-X · Dec 20, 2024 · 393b2fe · 393b2fe
2 parents 291a8f4 + 26aad8e
commit 393b2fe
Show file tree

Hide file tree

Showing 57 changed files with 4,850 additions and 6,048 deletions.
diff --git a/.env.example b/.env.example
@@ -28,7 +28,6 @@ VITE_FIREBASE_MESSAGINGSENDERID=
 VITE_FIREBASE_APPID=
 VITE_FIREBASE_MEASUREMENTID=
 
-VITE_ENABLED_LIFI_BY_CHAINS=1442;80001
 VITE_ENABLED_OWLTO_BY_CHAINS=196
 VITE_ENABLED_CEDE_BY_CHAINS=196
 VITE_ENABLED_CHAINS=1442;80001

diff --git a/.github/workflows/k8s-dev.yaml b/.github/workflows/k8s-dev.yaml
@@ -38,7 +38,6 @@ jobs:
           IMAGE_TAG: d8x-frontend-${{ github.sha }}
           # test:
           VITE_ENABLED_CHAINS: 1442
-          VITE_ACTIVATE_LIFI: false
           VITE_HTTP_RPC: 80001::${{ secrets.HTTP_RPC_MUMBAI }}
           VITE_PRICE_FEEDS:
           VITE_PROJECT_ID: ${{ secrets.WALLET_CONNECT_DEV_PROJECT_ID }}
@@ -50,7 +49,7 @@ jobs:
           VITE_CANDLES_WEBSOCKET_URL: default::wss://candles.zktest.quantena.tech;1442::wss://candles.zkdev6.d8x.xyz
           VITE_WELCOME_MODAL: true
         run: |
-          docker build -f Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg VITE_ENABLED_CHAINS=$VITE_ENABLED_CHAINS --build-arg VITE_ACTIVATE_LIFI=$VITE_ACTIVATE_LIFI --build-arg VITE_PROJECT_ID=$VITE_PROJECT_ID --build-arg VITE_GEONAMES_USERNAME=$VITE_GEONAMES_USERNAME --build-arg VITE_HTTP_RPC=$VITE_HTTP_RPC --build-arg VITE_PRICE_FEEDS=$VITE_PRICE_FEEDS --build-arg VITE_API_URL=$VITE_API_URL --build-arg VITE_HISTORY_URL=$VITE_HISTORY_URL --build-arg VITE_REFERRAL_URL=$VITE_REFERRAL_URL --build-arg VITE_CANDLES_WEBSOCKET_URL=$VITE_CANDLES_WEBSOCKET_URL --build-arg VITE_WEBSOCKET_URL=$VITE_WEBSOCKET_URL --build-arg VITE_WELCOME_MODAL=$VITE_WELCOME_MODAL .
+          docker build -f Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg VITE_ENABLED_CHAINS=$VITE_ENABLED_CHAINS --build-arg VITE_PROJECT_ID=$VITE_PROJECT_ID --build-arg VITE_GEONAMES_USERNAME=$VITE_GEONAMES_USERNAME --build-arg VITE_HTTP_RPC=$VITE_HTTP_RPC --build-arg VITE_PRICE_FEEDS=$VITE_PRICE_FEEDS --build-arg VITE_API_URL=$VITE_API_URL --build-arg VITE_HISTORY_URL=$VITE_HISTORY_URL --build-arg VITE_REFERRAL_URL=$VITE_REFERRAL_URL --build-arg VITE_CANDLES_WEBSOCKET_URL=$VITE_CANDLES_WEBSOCKET_URL --build-arg VITE_WEBSOCKET_URL=$VITE_WEBSOCKET_URL --build-arg VITE_WELCOME_MODAL=$VITE_WELCOME_MODAL .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
 
   Version:

diff --git a/.github/workflows/k8s.yaml b/.github/workflows/k8s.yaml
@@ -37,7 +37,6 @@ jobs:
           ECR_REPOSITORY: frontend
           IMAGE_TAG: d8x-frontend-stage-${{ github.sha }}
           VITE_ENABLED_CHAINS: 1442
-          VITE_ACTIVATE_LIFI: false
           VITE_HTTP_RPC: 80001::${{ secrets.HTTP_RPC_MUMBAI }}
           VITE_PRICE_FEEDS:
           VITE_PROJECT_ID: ${{ secrets.WALLET_CONNECT_PROJECT_ID }}
@@ -49,7 +48,7 @@ jobs:
           VITE_CANDLES_WEBSOCKET_URL: default::wss://candles.zktest.quantena.tech;1442::wss://candles.zkdev6.d8x.xyz
           VITE_WELCOME_MODAL: true
         run: |
-          docker build -f Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg VITE_ENABLED_CHAINS=$VITE_ENABLED_CHAINS --build-arg VITE_ACTIVATE_LIFI=$VITE_ACTIVATE_LIFI --build-arg VITE_PROJECT_ID=$VITE_PROJECT_ID --build-arg VITE_GEONAMES_USERNAME=$VITE_GEONAMES_USERNAME --build-arg VITE_HTTP_RPC=$VITE_HTTP_RPC --build-arg VITE_PRICE_FEEDS=$VITE_PRICE_FEEDS --build-arg VITE_API_URL=$VITE_API_URL --build-arg VITE_HISTORY_URL=$VITE_HISTORY_URL --build-arg VITE_REFERRAL_URL=$VITE_REFERRAL_URL --build-arg VITE_CANDLES_WEBSOCKET_URL=$VITE_CANDLES_WEBSOCKET_URL --build-arg VITE_WEBSOCKET_URL=$VITE_WEBSOCKET_URL --build-arg VITE_WELCOME_MODAL=$VITE_WELCOME_MODAL .
+          docker build -f Dockerfile -t $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG --build-arg VITE_ENABLED_CHAINS=$VITE_ENABLED_CHAINS --build-arg VITE_PROJECT_ID=$VITE_PROJECT_ID --build-arg VITE_GEONAMES_USERNAME=$VITE_GEONAMES_USERNAME --build-arg VITE_HTTP_RPC=$VITE_HTTP_RPC --build-arg VITE_PRICE_FEEDS=$VITE_PRICE_FEEDS --build-arg VITE_API_URL=$VITE_API_URL --build-arg VITE_HISTORY_URL=$VITE_HISTORY_URL --build-arg VITE_REFERRAL_URL=$VITE_REFERRAL_URL --build-arg VITE_CANDLES_WEBSOCKET_URL=$VITE_CANDLES_WEBSOCKET_URL --build-arg VITE_WEBSOCKET_URL=$VITE_WEBSOCKET_URL --build-arg VITE_WELCOME_MODAL=$VITE_WELCOME_MODAL .
           docker push $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG
 
   deploy:

diff --git a/Dockerfile b/Dockerfile
@@ -10,7 +10,6 @@ ARG VITE_CANDLES_WEBSOCKET_URL
 ARG VITE_HTTP_RPC
 ARG VITE_PRICE_FEEDS
 ARG VITE_ENABLED_CHAINS
-ARG VITE_ACTIVATE_LIFI
 ARG VITE_WELCOME_MODAL
 
 WORKDIR /app
@@ -23,7 +22,7 @@ RUN npm install
 
 COPY . .
 
-RUN echo "VITE_PROJECT_ID=${VITE_PROJECT_ID}\n""VITE_GEONAMES_USERNAME=${VITE_GEONAMES_USERNAME}\n""VITE_HTTP_RPC=${VITE_HTTP_RPC}\n""VITE_PRICE_FEEDS=${VITE_PRICE_FEEDS}\n""VITE_WEBSOCKET_URL=${VITE_WEBSOCKET_URL}\n""VITE_CANDLES_WEBSOCKET_URL=${VITE_CANDLES_WEBSOCKET_URL}\n""VITE_HISTORY_URL=${VITE_HISTORY_URL}\n""VITE_REFERRAL_URL=${VITE_REFERRAL_URL}\n""VITE_API_URL=${VITE_API_URL}\n""VITE_ACTIVATE_LIFI=${VITE_ACTIVATE_LIFI}\n""VITE_ENABLED_CHAINS=${VITE_ENABLED_CHAINS}\n""VITE_WELCOME_MODAL=${VITE_WELCOME_MODAL}" > .env
+RUN echo "VITE_PROJECT_ID=${VITE_PROJECT_ID}\n""VITE_GEONAMES_USERNAME=${VITE_GEONAMES_USERNAME}\n""VITE_HTTP_RPC=${VITE_HTTP_RPC}\n""VITE_PRICE_FEEDS=${VITE_PRICE_FEEDS}\n""VITE_WEBSOCKET_URL=${VITE_WEBSOCKET_URL}\n""VITE_CANDLES_WEBSOCKET_URL=${VITE_CANDLES_WEBSOCKET_URL}\n""VITE_HISTORY_URL=${VITE_HISTORY_URL}\n""VITE_REFERRAL_URL=${VITE_REFERRAL_URL}\n""VITE_API_URL=${VITE_API_URL}\n""VITE_ENABLED_CHAINS=${VITE_ENABLED_CHAINS}\n""VITE_WELCOME_MODAL=${VITE_WELCOME_MODAL}" > .env
 
 RUN npm run build
 

diff --git a/README.md b/README.md
@@ -24,17 +24,9 @@ This package is configured entirely via environment variables. You must specify:
   - This entry should then take the form:
     `VITE_ENABLED_CHAINS=1101;1442`
 
-- **VITE_ENABLED_LIFI_BY_CHAINS**: This is an optional variable that enables the LiFi widget by chains.
-
-  - By default, the LiFi widget is not shown.
-  - If it is required to be enabled for specific chains then it should take the form:
-    `VITE_ENABLED_LIFI_BY_CHAINS=1101;1442`
-
 - **VITE_ENABLED_OWLTO_BY_CHAINS**: This is an optional variable that enables the OWLTO bridge by chains.
 
   - By default, the OWLTO button is not shown.
-  - If it is enabled by chain and same chain is inside `VITE_ENABLED_LIFI_BY_CHAINS`, OWLTO will be shown instead of
-    LiFi.
   - If it is required to be enabled for specific chains then it should take the form:
     `VITE_ENABLED_OWLTO_BY_CHAINS=196;1142`