Merge branch 'master' into mainnet

.github/workflows/deploy.yml

@@ -7,8 +7,8 @@ env:
   INGRESS_DOMAIN_mainnet: "console.minter.network"
   INGRESS_DOMAIN_testnet: "console.testnet.minter.network"
   KUBE_NAMESPACE_mainnet: "mainnet"
-  KUBE_NAMESPACE_mainnet_reserved: "mainnet-reserved"
   KUBE_NAMESPACE_testnet: "default"
+  KUBE_NAMESPACE_RESERVED: "mainnet-reserved"
 jobs:
   ci:
     name: build
@@ -47,18 +47,21 @@ jobs:
           DOCKER_BUILD_ARGS: --build-arg BUILD_BRANCH_ENV_PREFIX
 
       - name: DigitalOcean Kubernetes
+        if: env.BUILD_BRANCH == 'mainnet'
         uses: matootie/[email protected]
         with:
           personalAccessToken: ${{ secrets.DIGITALOCEAN_TOKEN }}
           clusterName: k8s-prod-do
 
       - name: Install helm
-        run: wget https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz &> /dev/null && tar xvzf helm-v3.3.4-linux-amd64.tar.gz && chmod 777 linux-amd64/helm && ./linux-amd64/helm ls -n mainnet-reserved
+        if: env.BUILD_BRANCH == 'mainnet'
+        run: wget https://get.helm.sh/helm-v3.3.4-linux-amd64.tar.gz &> /dev/null && tar xvzf helm-v3.3.4-linux-amd64.tar.gz && chmod 777 linux-amd64/helm && ./linux-amd64/helm ls -n $KUBE_NAMESPACE_RESERVED
 
       - name: Deploy to DO
+        if: env.BUILD_BRANCH == 'mainnet'
         env:
           TAG_NAME: ${{ github.sha }}
-        run: ./linux-amd64/helm upgrade -n $KUBE_NAMESPACE_mainnet_reserved -i $PROJECT_NAME chart/ --atomic --timeout 100s --set image.tag=$TAG_NAME --set ingress.domain=$INGRESS_DOMAIN --set ingress.tlsname=$INGRESS_DOMAIN
+        run: ./linux-amd64/helm upgrade -n $KUBE_NAMESPACE_RESERVED -i $PROJECT_NAME chart/ --atomic --timeout 100s --set image.tag=$TAG_NAME --set ingress.domain=$INGRESS_DOMAIN --set ingress.tlsname=$INGRESS_DOMAIN
 
       - name: deploy to production cluster
         uses: wahyd4/kubectl-helm-action@master

README.md

@@ -7,11 +7,11 @@ This is the repository containing the code for the official Minter Console websi
 
 ## Install
 
-- ensure latest stable Node.js and NPM are installed
 - clone the repo
+- ensure latest stable Node.js and NPM are installed
+- install node_modules `npm ci`
 - copy .env.mainnet.example `cp .env.mainnet.example .env`
 - set correct .env variables
-- install node_modules `npm ci`
 - build `npm run production`
 - now you have static assets in the `./dist/` folder, you have to distribute them with some web server like Nginx (or run `npm run start`, but it's not recommended for production)
 

components/CoinSellAllForm.vue

@@ -59,6 +59,10 @@
                 if (this.$store.getters.isOfflineMode) {
                     return;
                 }
+                if (!this.sellAmount) {
+                    txFormContext.serverError = `There are no ${this.form.coinFrom} on your balance`;
+                    return Promise.reject(txFormContext.serverError);
+                }
                 txFormContext.isFormSending = true;
                 txFormContext.serverError = '';
                 txFormContext.serverSuccess = '';

components/MultisigCreateForm.vue

@@ -191,7 +191,7 @@
                                 v-if="index > 0"
                                 @click="removeParticipant(index)"
                         >
-                            <img src="/img/icon-remove.svg" alt="Remove address">
+                            <img :src="`${BASE_URL_PREFIX}/img/icon-remove.svg`" alt="Remove address">
                         </button>
                     </div>
                 </div>

components/MultisigEditForm.vue

@@ -185,7 +185,7 @@
                                 v-if="index > 0"
                                 @click="removeParticipant(index)"
                         >
-                            <img src="/img/icon-remove.svg" alt="Remove address">
+                            <img :src="`${BASE_URL_PREFIX}/img/icon-remove.svg`" alt="Remove address">
                         </button>
                     </div>
                 </div>

components/common/SignatureList.vue

@@ -97,7 +97,7 @@
                     v-if="index > 0"
                     @click="removeParticipant(index)"
             >
-                <img src="/img/icon-remove.svg" alt="Remove signature">
+                <img :src="`${BASE_URL_PREFIX}/img/icon-remove.svg`" alt="Remove signature">
             </button>
 
             <span class="form-field__error" v-if="v.signature.$dirty && !v.signature.required">{{ $td('Enter signature', 'form.multisig-signature-list-item-error-required') }}</span>

middleware/balance.js

@@ -27,7 +27,7 @@ export default function({app, store, redirect}) {
                 });
 
                 centrifuge.subscribe(store.getters.address, (response) => {
-                    const balance = response.data;
+                    const balance = toCamel(response.data);
                     store.commit('SET_BALANCE', prepareBalance(balance));
                 });
 

pages/wallet/index.vue

@@ -131,7 +131,7 @@
                     {{ baseCoin ? baseCoin.amount : 0 | pretty }} {{ $store.getters.COIN_NAME }}
                 </div>
                 <div class="wallet__time" v-if="lastUpdateTimeDistance">
-                    <img class="wallet__time-icon" src="/img/icon-time.svg" width="14" height="14" alt="" role="presentation">
+                    <img class="wallet__time-icon" :src="`${BASE_URL_PREFIX}/img/icon-time.svg`" width="14" height="14" alt="" role="presentation">
                     <span class="wallet__time-text">Last updated <strong>{{ lastUpdateTimeDistance }}</strong> ago</span>
                 </div>
             </div>

test/variables.js

@@ -14,3 +14,4 @@ export const ROUTES = {
 };
 
 export const USER_MNEMONIC = 'exercise fantasy smooth enough arrive steak demise donkey true employ jealous decide blossom bind someone';
+// address: Mx7633980c000139dd3bd24a3f54e06474fa941e16