Merge branch 'master' into swap-new

Author: georgeburduhos

src/config/config-beta.ts

@@ -4,8 +4,8 @@ import { firebaseConfig } from './firebase-web-beta';
 const extSyncBaseUrl = 'https://fire.moonlet.dev/functions/extensionSync';
 
 export const CONFIG_BETA: IAppConfig = {
-    // walletApiBaseUrl: 'https://api.moonlet.dev',
-    walletApiBaseUrl: 'http://127.0.0.1:8080',
+    walletApiBaseUrl: 'https://api.moonlet.dev',
+    // walletApiBaseUrl: 'http://127.0.0.1:8080',
 
     supportUrl: 'https://fire.moonlet.dev/static/support/webview.html',
     env: process.env.MOONLET_SOME_KEY,

src/core/blockchain/zilliqa/__tests__/__snapshots__/account.test.ts.snap

@@ -66,7 +66,7 @@ Object {
         "symbol": "KKZ",
       },
       "PORT": Object {
-        "active": true,
+        "active": false,
         "balance": Object {
           "available": "0",
           "detailed": Object {},
@@ -192,7 +192,7 @@ Object {
         "symbol": "ZLP",
       },
       "ZWAP": Object {
-        "active": true,
+        "active": false,
         "balance": Object {
           "available": "0",
           "detailed": Object {},

src/core/blockchain/zilliqa/config.ts

@@ -140,16 +140,16 @@ export const config: IBlockchainConfig = {
     autoAddedTokensSymbols: {
         '1': {
             gZIL: GZIL_MAINNET,
-            XSGD: XSGD_MAINNET,
-            PORT: PORT_MAINNET,
-            ZWAP: ZWAP_MAINNET
+            XSGD: XSGD_MAINNET
         },
         '333': {
             gZIL: GZIL_TESTNET
         }
     },
     autoAddedHiddenTokensSymbols: {
         '1': {
+            PORT: PORT_MAINNET,
+            ZWAP: ZWAP_MAINNET,
             ZLP: ZLP_MAINNET,
             BARTER: BARTER_MAINNET,
             BOLT: BOLT_MAINNET,