From 78c47e9f729c355e91389b6e3323454afb52c977 Mon Sep 17 00:00:00 2001
From: CM <grctestemail@gmail.com>
Date: Tue, 14 May 2024 00:07:00 +0100
Subject: [PATCH] Fixes & cleanup

Fix private key signup method
Removed TUSC
Reset prompt operation permission scope upon switching blockchain accounts
---
 README.md                                     |  4 +-
 src/background.js                             | 52 ++++++++------
 src/components/blockchains/ImportKeys.vue     |  6 +-
 .../blockchains/bitshares/ImportBinFile.vue   |  2 +-
 .../blockchains/bitshares/ImportCloudPass.vue |  2 +-
 src/components/local.vue                      | 15 +++-
 src/components/main-menu.vue                  | 12 ++--
 src/components/qr.vue                         | 15 +++-
 src/components/raw-link.vue                   | 14 ++++
 src/components/totp.vue                       | 15 +++-
 src/config/config.js                          | 20 ------
 src/lib/BeetServer.js                         |  6 +-
 src/lib/assetUtils.js                         |  3 +-
 src/lib/blockchains/EOS/beautify.js           |  1 +
 src/lib/blockchains/EOSmainnet.js             | 20 +++++-
 src/lib/blockchains/TUSC.js                   | 68 -------------------
 src/lib/blockchains/blockchainFactory.js      |  3 -
 src/lib/inject.js                             |  2 +-
 src/store/modules/SettingsStore.js            |  2 -
 19 files changed, 123 insertions(+), 139 deletions(-)
 delete mode 100644 src/lib/blockchains/TUSC.js

diff --git a/README.md b/README.md
index 4b8161ae..512567f3 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ The EOS blockchain has their own native javascript library that can be used (e.g
 
 The wallet now also supports deeplinks, encrypted deeplinks, qr codes and local json files for generating blockchain request prompts for approval & broadcast with the BeetEOS wallet. These input methods do not require external packages, and can be stored for later use.
 
-Supported blockchains: Bitshares, Bitshares testnet, TUSC, EOS, BEOS, TLOS.
+Supported blockchains: Bitshares, Bitshares testnet, EOS, BEOS, TLOS.
 
 ## For end users
 
@@ -56,7 +56,7 @@ BeetEOS is an [electron-based app](https://www.electronjs.org) for [cross-platfo
 
 To run BeetEOS it's simply a case of
 
-``` bash
+```bash
 # clone
 git clone https://github.com/beetapp/beeteos
 cd beeteos
diff --git a/src/background.js b/src/background.js
index c84873fd..a5e75e34 100644
--- a/src/background.js
+++ b/src/background.js
@@ -423,8 +423,9 @@ async function _parseDeeplink(
     }
 
     if (request.payload.method === Actions.INJECTED_CALL) {
+        console.log({req: request.payload.params})
         let authorizedUse = false;
-        if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+        if (["BTS", "BTS_TEST"].includes(chain)) {
             let tr;
             try {
                 tr = await blockchain._parseTransactionBuilder(
@@ -443,16 +444,20 @@ async function _parseDeeplink(
                 }
             }
         } else if (["EOS", "BEOS", "TLOS"].includes(chain)) {
-            if (request.payload.params.actions) {
-                for (
-                    let i = 0;
-                    i < request.payload.params.actions.length;
-                    i++
-                ) {
-                    let operation = request.payload.params.actions[i];
-                    if (settingsRows && settingsRows.includes(operation.name)) {
-                        authorizedUse = true;
-                        break;
+            if (request.payload.params && request.payload.params.length > 1) {
+                const actions = JSON.parse(request.payload.params[1]).actions;
+
+                if (actions) {
+                    for (
+                        let i = 0;
+                        i < actions.length;
+                        i++
+                    ) {
+                        let operation = actions[i];
+                        if (settingsRows && settingsRows.includes(operation.name)) {
+                            authorizedUse = true;
+                            break;
+                        }
                     }
                 }
             }
@@ -680,6 +685,10 @@ const createWindow = async () => {
             responses["getAccessType"] = blockchain.getAccessType();
         }
 
+        if (methods.includes("getSignUpInput")) {
+            responses["getSignUpInput"] = blockchain.getSignUpInput();
+        }
+
         if (methods.includes("getImportOptions")) {
             responses["getImportOptions"] = blockchain.getImportOptions();
         }
@@ -917,7 +926,7 @@ const createWindow = async () => {
 
             let parsedData = JSON.parse(qrData);
             let authorizedUse = false;
-            if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+            if (["BTS", "BTS_TEST"].includes(chain)) {
                 const ops = parsedData.operations[0].operations;
                 for (let i = 0; i < ops.length; i++) {
                     let operation = ops[i];
@@ -946,7 +955,7 @@ const createWindow = async () => {
             if (authorizedUse) {
                 let qrTX;
                 try {
-                    qrTX = ["BTS", "BTS_TEST", "TUSC"].includes(chain)
+                    qrTX = ["BTS", "BTS_TEST"].includes(chain)
                         ? await blockchain.handleQR(
                               JSON.stringify(parsedData.operations[0])
                           )
@@ -964,7 +973,7 @@ const createWindow = async () => {
                         origin: "localhost",
                         appName: "qr",
                         browser: qrChoice,
-                        params: ["BTS", "BTS_TEST", "TUSC"].includes(chain)
+                        params: ["BTS", "BTS_TEST"].includes(chain)
                             ? qrTX.toObject()
                             : qrTX,
                         chain: chain,
@@ -1121,7 +1130,6 @@ const createWindow = async () => {
         "explore.beos.world",
         "blocksights.info",
         "telos.eosx.io",
-        "wallet.tusc.network",
     ];
     ipcMain.on("openURL", (event, arg) => {
         try {
@@ -1406,9 +1414,11 @@ if (currentOS === "win32" || currentOS === "linux") {
                 console.log(error);
                 return;
             }
-    
-            let deeplinkingUrl = deeplink.includes("beeteos://api/") ? deeplink.split("beeteos://api/")[1] : deeplink.split("rawbeeteos://api/")[1];
-            
+
+            let deeplinkingUrl = deeplink.includes("beeteos://api/")
+                ? deeplink.split("beeteos://api/")[1]
+                : deeplink.split("rawbeeteos://api/")[1];
+
             let qs;
             try {
                 qs = queryString.parse(deeplinkingUrl);
@@ -1419,9 +1429,7 @@ if (currentOS === "win32" || currentOS === "linux") {
 
             if (qs) {
                 mainWindow.webContents.send(
-                    deeplink.includes("raw")
-                        ? "rawdeeplink"
-                        : "deeplink",
+                    deeplink.includes("raw") ? "rawdeeplink" : "deeplink",
                     qs
                 );
             }
@@ -1478,7 +1486,7 @@ if (currentOS === "win32" || currentOS === "linux") {
         }
 
         if (qs) {
-            dialog.showErrorBox("Error", JSON.stringify({qs: qs}));
+            dialog.showErrorBox("Error", JSON.stringify({ qs: qs }));
             mainWindow.webContents.send(urlType, qs);
         }
     });
diff --git a/src/components/blockchains/ImportKeys.vue b/src/components/blockchains/ImportKeys.vue
index 37c29353..f4fc8fec 100644
--- a/src/components/blockchains/ImportKeys.vue
+++ b/src/components/blockchains/ImportKeys.vue
@@ -48,7 +48,7 @@
     let privateKey = ref("");
     async function next() {
         let authorities = {};
-        if (requiredFields.value.privateKey != null) {
+        if (requiredFields.value && requiredFields.value.privateKey) {
             authorities.privateKey = privateKey.value;
         }
 
@@ -107,7 +107,7 @@
             {{ t('common.keys_cta') }}
         </p>
 
-        <template v-if="requiredFields.privateKey !== null">
+        <template v-if="requiredFields && requiredFields.privateKey">
             <p class="mb-2 font-weight-bold">
                 {{ t(accessType == 'account' ? 'common.active_authority' : 'common.public_authority') }}
             </p>
@@ -131,7 +131,7 @@
                     {{ t('common.back_btn') }}
                 </ui-button>
 
-                <span v-if="requiredFields.privateKey != null">
+                <span v-if="requiredFields && requiredFields.privateKey">
                     <ui-button
                         v-if="accountname !== '' && privateKey !== ''"
                         raised
diff --git a/src/components/blockchains/bitshares/ImportBinFile.vue b/src/components/blockchains/bitshares/ImportBinFile.vue
index 2c8624d4..4a937ab2 100644
--- a/src/components/blockchains/bitshares/ImportBinFile.vue
+++ b/src/components/blockchains/bitshares/ImportBinFile.vue
@@ -15,7 +15,7 @@
     const emit = defineEmits(['back', 'continue', 'imported']);
 
     onMounted(() => {
-        if (!["BTS", "BTS_TEST", "TUSC"].includes(props.chain)) {
+        if (!["BTS", "BTS_TEST"].includes(props.chain)) {
             throw "Unsupported chain!";
         }
     })
diff --git a/src/components/blockchains/bitshares/ImportCloudPass.vue b/src/components/blockchains/bitshares/ImportCloudPass.vue
index a97875cd..d1a6e6e8 100644
--- a/src/components/blockchains/bitshares/ImportCloudPass.vue
+++ b/src/components/blockchains/bitshares/ImportCloudPass.vue
@@ -15,7 +15,7 @@
     const emit = defineEmits(['back', 'continue', 'imported']);
 
     onMounted(() => {
-        if (!["BTS", "BTS_TEST", "TUSC"].includes(props.chain)) {
+        if (!["BTS", "BTS_TEST"].includes(props.chain)) {
             throw "Unsupported chain!";
         }
     })
diff --git a/src/components/local.vue b/src/components/local.vue
index 1cba7da5..21cdc3bd 100644
--- a/src/components/local.vue
+++ b/src/components/local.vue
@@ -1,5 +1,5 @@
 <script setup>
-    import { ref, computed, onMounted, toRaw } from 'vue';
+    import { ref, computed, onMounted, watch, toRaw } from 'vue';
     import { useI18n } from 'vue-i18n';
 
     import AccountSelect from "./account-select";
@@ -24,6 +24,19 @@
         return store.getters['AccountStore/getChain'];
     });
 
+    let selectedAccount = computed(() => {
+        if (!store.state.WalletStore.isUnlocked) {
+            return;
+        }
+        return store.getters["AccountStore/getCurrentSafeAccount"]()
+    })
+
+    watch(selectedAccount, async (newVal, oldVal) => {
+        console.log("User changed account - resetting configured scope!")
+        chosenScope.value = null;
+        selectedRows.value = null;
+    }, {immediate: true});
+
     let supportsLocal = ref(false);
     let operationTypes = ref([]);
     onMounted(async () => {
diff --git a/src/components/main-menu.vue b/src/components/main-menu.vue
index b7246409..abe222d1 100644
--- a/src/components/main-menu.vue
+++ b/src/components/main-menu.vue
@@ -322,7 +322,7 @@
                 } = args;
 
                 if (
-                    (["BTS", "BTS_TEST", "TUSC"].includes(chain)) &&
+                    (["BTS", "BTS_TEST"].includes(chain)) &&
                     ((!visualizedAccount && account && !account.accountName) || !visualizedParams)
                 ) {
                     console.log("Missing required fields for injected call");
@@ -373,7 +373,7 @@
 
                 window.electron.popupApproved(request.id, async (args) => {
                     let _request = request;
-                    if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {        
+                    if (["BTS", "BTS_TEST"].includes(chain)) {        
                         if (request.payload.memo) {
                             let from;
                             let to;
@@ -441,7 +441,7 @@
                     }
 
                     let activeKey;
-                    if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+                    if (["BTS", "BTS_TEST"].includes(chain)) {
                         try {
                             activeKey = request.payload.account_id
                                 ? store.getters['AccountStore/getActiveKey'](request)
@@ -466,7 +466,7 @@
 
                     if (txType == "signAndBroadcast") {
                         try {
-                            if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+                            if (["BTS", "BTS_TEST"].includes(chain)) {
                                 finalResult = await window.electron.blockchainRequest({
                                     methods: ["signAndBroadcast"],
                                     account: null,
@@ -539,7 +539,7 @@
                 window.electron.popupApproved(request.id, async (result) => {
 
                     let activeKey;
-                    if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+                    if (["BTS", "BTS_TEST"].includes(chain)) {
                         try {
                             activeKey = request.payload.account_id
                                 ? store.getters['AccountStore/getActiveKey'](request)
@@ -564,7 +564,7 @@
 
                     let transaction;
                     try {
-                        if (["BTS", "BTS_TEST", "TUSC"].includes(chain)) {
+                        if (["BTS", "BTS_TEST"].includes(chain)) {
                             transaction = await window.electron.requestSignature(request.payload.params, signingKey);
                         } else if (["EOS", "BEOS", "TLOS"].includes(chain)) {
                             transaction = await window.electron.requestSignature(JSON.parse(request.payload.params[1]), signingKey);
diff --git a/src/components/qr.vue b/src/components/qr.vue
index 7669814e..e3dba6a7 100644
--- a/src/components/qr.vue
+++ b/src/components/qr.vue
@@ -1,5 +1,5 @@
 <script setup>
-    import { ref, computed, watchEffect, inject, onMounted, toRaw } from 'vue';
+    import { ref, computed, watchEffect, inject, watch, onMounted, toRaw } from 'vue';
     import { useI18n } from 'vue-i18n';
 
     import AccountSelect from "./account-select";
@@ -38,6 +38,19 @@
         return store.getters['AccountStore/getChain'];
     });
 
+    let selectedAccount = computed(() => {
+        if (!store.state.WalletStore.isUnlocked) {
+            return;
+        }
+        return store.getters["AccountStore/getCurrentSafeAccount"]()
+    })
+
+    watch(selectedAccount, async (newVal, oldVal) => {
+        console.log("User changed account - resetting configured scope!")
+        chosenScope.value = null;
+        selectedRows.value = null;
+    }, {immediate: true});
+
     async function evaluateQR (data) {
         if (!data) {
             return;
diff --git a/src/components/raw-link.vue b/src/components/raw-link.vue
index b4be5e0c..716c9b87 100644
--- a/src/components/raw-link.vue
+++ b/src/components/raw-link.vue
@@ -7,6 +7,7 @@
     
     import store from '../store/index.js';
     import router from '../router/index.js';
+    import { watch } from 'vue';
 
     const { t } = useI18n({ useScope: 'global' });
 
@@ -35,6 +36,19 @@
         }
     }
 
+    let selectedAccount = computed(() => {
+        if (!store.state.WalletStore.isUnlocked) {
+            return;
+        }
+        return store.getters["AccountStore/getCurrentSafeAccount"]()
+    })
+
+    watch(selectedAccount, async (newVal, oldVal) => {
+        console.log("User changed account - resetting configured scope!")
+        chosenScope.value = null;
+        selectedRows.value = null;
+    }, {immediate: true});
+
     let chain = computed(() => {
         return store.getters['AccountStore/getChain'];
     });
diff --git a/src/components/totp.vue b/src/components/totp.vue
index 32df3741..e7b6ecb1 100644
--- a/src/components/totp.vue
+++ b/src/components/totp.vue
@@ -1,5 +1,5 @@
 <script setup>
-    import { watchEffect, ref, computed, onMounted, toRaw } from 'vue';
+    import { watchEffect, ref, computed, onMounted, watch, toRaw } from 'vue';
     import { useI18n } from 'vue-i18n';
 
     import AccountSelect from "./account-select";
@@ -13,6 +13,19 @@
     let chain = computed(() => {
         return store.getters['AccountStore/getChain'];
     });
+
+    let selectedAccount = computed(() => {
+        if (!store.state.WalletStore.isUnlocked) {
+            return;
+        }
+        return store.getters["AccountStore/getCurrentSafeAccount"]()
+    })
+
+    watch(selectedAccount, async (newVal, oldVal) => {
+        console.log("User changed account - resetting configured scope!")
+        chosenScope.value = null;
+        selectedRows.value = null;
+    }, {immediate: true});
     
     let compatible = ref(false);
     let operationTypes = ref([]);
diff --git a/src/config/config.js b/src/config/config.js
index b4d23464..0a65da54 100644
--- a/src/config/config.js
+++ b/src/config/config.js
@@ -52,26 +52,6 @@ let _blockchains = {
             },
         ],
     },
-    TUSC: {
-        coreSymbol: "TUSC",
-        name: "The Universal Settlement Coin",
-        chainId:
-            "eb938e2a955e39e335120d0a99f3b9f8c04a9ed5690275ea5037d6bbadfc6cf3",
-        nodeList: [
-            {
-                url: "wss://api.tusc.network/wallet",
-            },
-            {
-                url: "wss://api.cryptotusc.com",
-            },
-            {
-                url: "wss://tuscapi.gambitweb.com",
-            },
-            {
-                url: "wss://api.readyrhino.one",
-            },
-        ],
-    },
     EOS: {
         coreSymbol: "EOS",
         name: "EOSmainnet",
diff --git a/src/lib/BeetServer.js b/src/lib/BeetServer.js
index 4de3822b..e1aa043c 100644
--- a/src/lib/BeetServer.js
+++ b/src/lib/BeetServer.js
@@ -209,7 +209,7 @@ export default class BeetServer {
             
             let authorizedUse = true;
             if (app.injectables.length) {
-                if (["BTS", "BTS_TEST", "TUSC"].includes(blockchain._config.identifier)) {
+                if (["BTS", "BTS_TEST"].includes(blockchain._config.identifier)) {
                     let tr = blockchain._parseTransactionBuilder(msg.params);
                     for (let i = 0; i < tr.operations.length; i++) {
                         let operation = tr.operations[i];
@@ -277,7 +277,7 @@ export default class BeetServer {
                 }
             
                 let visualizedAccount;
-                if (["BTS", "BTS_TEST", "TUSC"].includes(blockchain._config.identifier)) {
+                if (["BTS", "BTS_TEST"].includes(blockchain._config.identifier)) {
                     try {
                         visualizedAccount = await blockchain.visualize(apiobj.payload.account_id);
                     } catch (error) {
@@ -371,7 +371,7 @@ export default class BeetServer {
             
                 let account = "";
                 let visualizedAccount;
-                if (["BTS", "BTS_TEST", "TUSC"].includes(blockchain._config.identifier)) {
+                if (["BTS", "BTS_TEST"].includes(blockchain._config.identifier)) {
                     let fromField = types.find(type => type.method === apiobj.type).from;
                     if (!fromField || !fromField.length) {
                         const _account = () => {
diff --git a/src/lib/assetUtils.js b/src/lib/assetUtils.js
index 9cff6448..915a2788 100644
--- a/src/lib/assetUtils.js
+++ b/src/lib/assetUtils.js
@@ -3,8 +3,7 @@ const lookupPrecision = {
     "TLOS": 4,
     "BEOS": 4,
     "BTS": 5,
-    "BTS_TEST": 5,
-    "TUSC": 5
+    "BTS_TEST": 5
 };
 
 export function humanReadableFloat(satoshis, precision) {
diff --git a/src/lib/blockchains/EOS/beautify.js b/src/lib/blockchains/EOS/beautify.js
index 8824b47f..461acdbe 100644
--- a/src/lib/blockchains/EOS/beautify.js
+++ b/src/lib/blockchains/EOS/beautify.js
@@ -21,6 +21,7 @@ const allowedOperations = [
     "defcpuloan",
     "defnetloan",
     "updaterex",
+    "transfer",
     "rexexec",
     "consolidate",
     "mvtosavings",
diff --git a/src/lib/blockchains/EOSmainnet.js b/src/lib/blockchains/EOSmainnet.js
index d7e7c021..6e8b33eb 100644
--- a/src/lib/blockchains/EOSmainnet.js
+++ b/src/lib/blockchains/EOSmainnet.js
@@ -34,6 +34,7 @@ const operations = [
     "fundnetloan",
     "defcpuloan",
     "defnetloan",
+    "transfer",
     "updaterex",
     "rexexec",
     "consolidate",
@@ -78,16 +79,27 @@ export default class EOS extends BlockchainAPI {
                     ? nodeToConnect
                     : this.getNodes()[0].url;
 
-        this.rpc = new JsonRpc(chosenURL, {fetch});
+        let rpc;
+        try {
+            rpc = new JsonRpc(chosenURL, {fetch});
+        } catch (error) {
+            console.log({error})
+            this._connectionFailed(reject, chosenURL, error.message);
+        }
+        
+        this.rpc = rpc;
+        this._connectionEstablished(resolve, chosenURL);
 
+        /*
         try {
-            this.rpc.get_info().then(() => {
+            this.rpc.get_block(1).then(() => {
                 this._connectionEstablished(resolve, chosenURL);
             })
         } catch (error) {
             console.log({error})
             this._connectionFailed(reject, chosenURL, error.message);
         }
+        */
     }
 
     /**
@@ -467,6 +479,10 @@ export default class EOS extends BlockchainAPI {
 
     broadcast(transaction) {
         return new Promise((resolve, reject) => {
+            if (!this.rpc) {
+                this.rpc = new JsonRpc(this.getNodes()[0].url, {fetch});
+            }
+
             const api = new Api({
                 rpc: this.rpc,
                 signatureProvider: transaction.signatureProvider,
diff --git a/src/lib/blockchains/TUSC.js b/src/lib/blockchains/TUSC.js
deleted file mode 100644
index d7c21713..00000000
--- a/src/lib/blockchains/TUSC.js
+++ /dev/null
@@ -1,68 +0,0 @@
-import BitShares from "./BitShares.js";
-//import {Apis} from "bitsharesjs-ws";
-
-export default class TUSC extends BitShares {
-
-    /*
-    _connect(nodeToConnect = null) {
-        return new Promise((resolve, reject) => {
-            if (nodeToConnect == null) {
-                nodeToConnect = this.getNodes()[0].url;
-            }
-            if (this._isConnected) {
-                Apis.close().then(() => {
-                    this._isConnected = false;
-                    Apis.instance(
-                        nodeToConnect,
-                        true,
-                        10000,
-                        {enableCrypto: false, enableOrders: false},
-                        // no use in firing reject because it might happen at any time in the future after connecting!
-                        this._connectionFailed.bind(this, null, nodeToConnect, "Connection closed")
-                    ).init_promise.then(() => {
-                        this._connectionEstablished(resolve, nodeToConnect);
-                    }).catch(this._connectionFailed.bind(this, reject, nodeToConnect));
-                });
-            } else {
-                Apis.instance(
-                    nodeToConnect,
-                    true,
-                    10000,
-                    {enableCrypto: false, enableOrders: false},
-                    // no use in firing reject because it might happen at any time in the future after connecting!
-                    this._connectionFailed.bind(this, null, nodeToConnect, "Connection closed")
-                ).init_promise.then(() => {
-                    this._connectionEstablished(resolve, nodeToConnect);
-                }).catch(this._connectionFailed.bind(this, reject, nodeToConnect));
-            }
-        });
-    }
-
-    _needsNewConnection() {
-        if (this._isConnected) {
-            // is this tusc node?
-            if (Apis.instance().url.indexOf("testnet") === -1) {
-                return true;
-            }
-        }
-        return super._needsNewConnection();
-    }
-    */
-
-    getAsset(assetSymbolOrId) {
-        if (assetSymbolOrId == "1.3.0") {
-            return {
-                asset_id: "1.3.0",
-                symbol: "TUSC",
-                precision: 5
-            };
-        } else {
-            return null;
-        }
-    }
-
-    getExplorer(object, chain) {
-        return "https://wallet.tusc.network/wallet/explorer";
-    }
-
-}
diff --git a/src/lib/blockchains/blockchainFactory.js b/src/lib/blockchains/blockchainFactory.js
index db0eedbc..627bfa82 100644
--- a/src/lib/blockchains/blockchainFactory.js
+++ b/src/lib/blockchains/blockchainFactory.js
@@ -1,7 +1,6 @@
 import { blockchains } from "../../config/config.js";
 
 import BitShares from "./BitShares.js";
-import TUSC from "./TUSC.js";
 import EOSmainnet from "./EOSmainnet.js";
 import TLOS from "./TLOS.js";
 import BEOS from "./BEOS.js";
@@ -36,8 +35,6 @@ export default function getBlockchainAPI(chain = null, node = null) {
                 storedChain = new TLOS(config, node);
             } else if (chain === "BTS" || chain === "BTS_TEST") {
                 storedChain = new BitShares(config, node);
-            } else if (chain === "TUSC") {
-                storedChain = new TUSC(config, node);
             }
         } catch (error) {
             console.log(error);
diff --git a/src/lib/inject.js b/src/lib/inject.js
index 7536d640..8ac46e37 100644
--- a/src/lib/inject.js
+++ b/src/lib/inject.js
@@ -71,7 +71,7 @@ export async function inject(
 
     let account = "";
     let visualizedAccount;
-    if (["BTS", "BTS_TEST", "TUSC"].includes(blockchain._config.identifier)) {
+    if (["BTS", "BTS_TEST"].includes(blockchain._config.identifier)) {
         let fromField = types.find(type => type.method === request.type).from;
         if (!fromField || !fromField.length) {
             const _account = async () => {
diff --git a/src/store/modules/SettingsStore.js b/src/store/modules/SettingsStore.js
index ba7f04d2..fcec6fe9 100644
--- a/src/store/modules/SettingsStore.js
+++ b/src/store/modules/SettingsStore.js
@@ -108,7 +108,6 @@ const actions = {
                     settings['chainPermissions'] = {
                         BTS: [],
                         BTS_TEST: [],
-                        TUSC: [],
                         EOS: [],
                         BEOS: [],
                         TLOS: []
@@ -149,7 +148,6 @@ const initialState = {
             EOS: [],
             BEOS: [],
             TLOS: [],
-            TUSC: [],
             BTC: [],
             BTC_TEST: []
         }