Merge branch 'release/v1.0.6'

eoscostarica · May 15, 2021 · 1de645e · 1de645e
2 parents 062a6fd + 7f8da9a
commit 1de645e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 1 deletion.
diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml
@@ -42,6 +42,15 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           BRANCH: production
           NAMESPACE: mainnet-eosrate
+          # webapp
+          REACT_APP_GRAPHQL_HTTP_URL: https://graphql.eosrate.io/v1/graphql
+          REACT_APP_GRAPHQL_WS_URL: ws://graphql.eosrate.io/v1/graphql
+          REACT_APP_EOS_API_URL: https://api.eosio.cr
+          REACT_APP_EOS_API_HOST: api.eosio.cr
+          REACT_APP_EOS_API_PORT: 443
+          REACT_APP_EOS_API_PROTOCOL: https
+          REACT_APP_EOS_CHAIN_ID: aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906
+          REACT_APP_BLOCK_EXPLORER: https://bloks.io
 
       - name: Build kubernetes files
         id: build_kubernetes_files
@@ -57,6 +66,14 @@ jobs:
           INGRESS_HOST: eosrate.io
           INGRESS_GRAPHQL_HOST: graphql.eosrate.io
           # webapp
+          REACT_APP_GRAPHQL_HTTP_URL: https://graphql.eosrate.io/v1/graphql
+          REACT_APP_GRAPHQL_WS_URL: ws://graphql.eosrate.io/v1/graphql
+          REACT_APP_EOS_API_URL: https://api.eosio.cr
+          REACT_APP_EOS_API_HOST: api.eosio.cr
+          REACT_APP_EOS_API_PORT: 443
+          REACT_APP_EOS_API_PROTOCOL: https
+          REACT_APP_EOS_CHAIN_ID: aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906
+          REACT_APP_BLOCK_EXPLORER: https://bloks.io
           # postgres
           DATABASE_DIRECTORY: database
           DB_NAME: ${{ secrets.DB_NAME }}

diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml
@@ -42,6 +42,15 @@ jobs:
           DOCKER_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
           BRANCH: staging
           NAMESPACE: jungle-eosrate
+          # webapp
+          REACT_APP_GRAPHQL_HTTP_URL: https://graphql-jungle.eosrate.io/v1/graphql
+          REACT_APP_GRAPHQL_WS_URL: ws://graphql-jungle.eosrate.io/v1/graphql
+          REACT_APP_EOS_API_URL: https://jungle.eosio.cr
+          REACT_APP_EOS_API_HOST: jungle.eosio.cr
+          REACT_APP_EOS_API_PORT: 443
+          REACT_APP_EOS_API_PROTOCOL: https
+          REACT_APP_EOS_CHAIN_ID: 2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840
+          REACT_APP_BLOCK_EXPLORER: https://jungle3.bloks.io
 
       - name: Build kubernetes files
         id: build_kubernetes_files
@@ -57,6 +66,14 @@ jobs:
           INGRESS_HOST: jungle.eosrate.io
           INGRESS_GRAPHQL_HOST: graphql-jungle.eosrate.io
           # webapp
+          REACT_APP_GRAPHQL_HTTP_URL: https://graphql-jungle.eosrate.io/v1/graphql
+          REACT_APP_GRAPHQL_WS_URL: ws://graphql-jungle.eosrate.io/v1/graphql
+          REACT_APP_EOS_API_URL: https://jungle.eosio.cr
+          REACT_APP_EOS_API_HOST: jungle.eosio.cr
+          REACT_APP_EOS_API_PORT: 443
+          REACT_APP_EOS_API_PROTOCOL: https
+          REACT_APP_EOS_CHAIN_ID: 2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840
+          REACT_APP_BLOCK_EXPLORER: https://jungle3.bloks.io
           # postgres
           DATABASE_DIRECTORY: database
           DB_NAME: ${{ secrets.DB_NAME }}

diff --git a/services/frontend/src/routes/block-producers/index.js b/services/frontend/src/routes/block-producers/index.js
@@ -208,7 +208,6 @@ const AllBps = ({ ual }) => {
       {selectedBPs && selectedBPs.length > 0 && (
         <Grid
           className={classes.openBottomSheetContainer}
-          bottom
           container
           justify='flex-end'
         >