Merge branch 'master' into mainnet

MinterTeam · Oct 19, 2020 · 1ff54ce · 1ff54ce
2 parents 9b0388d + c40ccb8
commit 1ff54ce
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 32 deletions.
diff --git a/.env.mainnet.example b/.env.mainnet.example
@@ -11,3 +11,7 @@ APP_AUTO_DELEGATION_API_URL=https://autodelegator-api.minter.network/api/v1/
 APP_EXPLORER_API_URL=https://explorer-api.minter.network/api/v2/
 APP_EXPLORER_RTM_URL=wss://explorer-rtm.minter.network/connection/websocket
 APP_EXPLORER_HOST=https://explorer.minter.network
+
+
+
+WEB_PORT_FOR_DOCKER_COMPOSE=5002
diff --git a/components/CheckIssueForm.vue b/components/CheckIssueForm.vue
@@ -57,27 +57,29 @@
                 isLinkQrModalVisible: false,
             };
         },
-        validations: {
-            form: {
-                nonce: {
-                    required,
-                },
-                dueBlock: {
-                },
-                value: {
-                    required,
-                },
-                coinSymbol: {
-                    required,
-                    minLength: minLength(3),
-                },
-                password: {
-                    required,
-                },
-                gasCoin: {
-                    minLength: minLength(3),
+        validations() {
+            return {
+                form: {
+                    nonce: {
+                        required,
+                    },
+                    dueBlock: {
+                    },
+                    value: {
+                        required,
+                    },
+                    coinSymbol: {
+                        required,
+                        minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
+                    },
+                    password: {
+                        required,
+                    },
+                    gasCoin: {
+                        minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
+                    },
                 },
-            },
+            };
         },
         computed: {
             ...mapGetters({

diff --git a/components/CoinBuyForm.vue b/components/CoinBuyForm.vue
@@ -40,11 +40,11 @@
                 },
                 coinFrom: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
                 coinTo: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
             };
 

diff --git a/components/CoinSellAllForm.vue b/components/CoinSellAllForm.vue
@@ -38,11 +38,11 @@
             const form = {
                 coinFrom: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
                 coinTo: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
             };
 

diff --git a/components/CoinSellForm.vue b/components/CoinSellForm.vue
@@ -44,11 +44,11 @@
                 },
                 coinFrom: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
                 coinTo: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
             };
 

diff --git a/components/CoinSendForm.vue b/components/CoinSendForm.vue
@@ -46,7 +46,7 @@
                 },
                 coinSymbol: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
             };
 

diff --git a/components/ValidatorDeclareCandidacyForm.vue b/components/ValidatorDeclareCandidacyForm.vue
@@ -61,7 +61,7 @@
                 },
                 coinSymbol: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
             };
 

diff --git a/components/ValidatorDelegateForm.vue b/components/ValidatorDelegateForm.vue
@@ -53,7 +53,7 @@
                 },
                 coinSymbol: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
             };
 

diff --git a/components/ValidatorUnbondForm.vue b/components/ValidatorUnbondForm.vue
@@ -52,7 +52,7 @@
                 },
                 coinSymbol: {
                     required,
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
             };
 

diff --git a/components/common/FieldCoin.vue b/components/common/FieldCoin.vue
@@ -65,6 +65,9 @@
             },
         },
         mounted() {
+            if (this.$store.getters.isOfflineMode) {
+                return;
+            }
             this.$store.dispatch('FETCH_COIN_LIST')
                 .then((coinListAll) => {
                     this.coinListAll = Object.freeze(coinListAll.map((item) => item.symbol));

diff --git a/components/common/TxForm.vue b/components/common/TxForm.vue
@@ -97,7 +97,7 @@
         validations() {
             const form = {
                 gasCoin: {
-                    minLength: minLength(3),
+                    minLength: this.$store.getters.isOfflineMode ? () => true : minLength(3),
                 },
                 payload: {
                     maxLength: maxLength(1024),

diff --git a/pages/wallet/index.vue b/pages/wallet/index.vue
@@ -33,8 +33,10 @@
         },
         fetch({ app, store }) {
             store.commit('SET_SECTION_NAME', app.$td('Wallet', 'common.page-wallet'));
+            if (store.getters.isOfflineMode) {
+                return;
+            }
             store.dispatch('FETCH_VALIDATOR_LIST');
-            return Promise.resolve();
         },
         asyncData({ store }) {
             if (store.getters.isOfflineMode) {