Merge branch 'dev'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ dev ]
+  schedule:
+    - cron: '39 3 * * 1'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'cpp', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.github/workflows/push-dev-environment.yaml

@@ -42,7 +42,7 @@ jobs:
           REACT_APP_UAL_API_HOST: 'api.jungle3.alohaeos.com'
           REACT_APP_UAL_API_PORT: '443'
           REACT_APP_UAL_CHAIN_ID: '2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840'
-          REACT_APP_HASURA_URL: 'https://graphql-myvoteeos.eosio.cr/v1/graphql'
+          REACT_APP_HASURA_URL: 'https://graphql-myvoteeos.edenia.cloud/v1/graphql'
           REACT_APP_BLOCK_EXPLORER_URL: 'https://jungle3.bloks.io'
           REACT_APP_MYVOTEEOS_ACCOUNT: 'myvoteeosdao'
           REACT_APP_TWITTER_ACCOUNT: '@MyvoteEOS'
@@ -55,8 +55,8 @@ jobs:
         env:
           # general
           NAMESPACE: myvoteeos
-          INGRESS_HOST: myvoteeos.eosio.cr
-          INGRESS_GRAPHQL_HOST: graphql-myvoteeos.eosio.cr
+          INGRESS_HOST: myvoteeos.edenia.cloud
+          INGRESS_GRAPHQL_HOST: graphql-myvoteeos.edenia.cloud
           # Postgres
           POSTGRES_USER: ${{ secrets.POSTGRES_USER }}
           POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }}

CODE_OF_CONDUCT.md

@@ -60,7 +60,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-bp@eosio.cr.
+bp@edenia.cloud.
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the

webapp/src/language/en.json

@@ -68,13 +68,13 @@
       "text10": "EOS is on the verge of becoming the only blockchain that is free from the grip of pareto distribution with fractal democracy.",
       "text11": "But it needs support from the BPs.",
       "text12": "MyvoteEOS Proxy is an EOS BP voting proxy that aims to properly represent the uncompromised will of EOS holders on and off chain.",
-      "text13": "The baseline function of MyvoteEOS Proxy is to ensure the integrity of its vote and the accountability of BPs representing communities' will for the votes they receive. This will be achieved through holding regular check-up calls with BPs and reviewing reports of their finances and activities.",
+      "text13": "The baseline function of MyvoteEOS Proxy as an self regulatory body of EOS is to ensure the integrity of its vote and the accountability of BPs representing communities' will for the votes they receive. This will be achieved through holding regular check-up calls with BPs and reviewing reports of their finances and activities.",
       "text14": "MyvoteEOS proxy will only votes from among the list that passes the integrity bar.",
       "text15": "Heal the governance with greater alignment of interests",
-      "text16": "We will not engage in vote compromise in any form. (operating our own proxy with direct APR, buying votes from 3rd party exchanges or proxies.)",
-      "text17": "We will commit to being held accountable by engaging in check up calls and providing public financial and operation reports on a regular basis.",
-      "text18": "We acknowledge that we can be unvoted immediately and won’t be eligible for votes from this DAO ever again if we engage with compromised votes hereafter.",
-      "text19": "We will commit to not operating more than one BP with the same ownership."
+      "text16": "No engagement in vote compromise in any form. (operating our own proxy with direct APR, buying votes from 3rd party exchanges or proxies.)",
+      "text17": "Commitment to being held accountable by engaging in check up calls and providing public financial and operation reports on a regular basis.",
+      "text18": "No more than one BP with the same ownership.",
+      "text19": ""
     },
     "loginWarning": "Please login to delegate your vote",
     "twitterContent": "{{ exchange }} Please support %23EOS token holders' right to have their voice heard by delegating their %24EOS votes to the %23MyvoteEOS proxy. More info: https://myvoteeos.com"