Minor refactoring

.eslintrc.js

@@ -25,7 +25,7 @@ module.exports = {
       version: 'detect',
     },
   },
-  plugins: ['react', 'sonarjs'],
+  plugins: ['react', 'sonarjs', 'unused-imports'],
   rules: {
     'linebreak-style': [2, 'unix'],
     quotes: [1, 'single', 'avoid-escape'],
@@ -51,6 +51,16 @@ module.exports = {
     'no-constant-condition': ['error', {checkLoops: false}],
     'no-unused-vars': 0,
     'react/prop-types': 0,
+    'unused-imports/no-unused-imports': 2,
+    'unused-imports/no-unused-vars': [
+      2,
+      {
+        vars: 'all',
+        varsIgnorePattern: '^_',
+        args: 'after-used',
+        argsIgnorePattern: '^_',
+      },
+    ],
   },
   overrides: [
     {

.pre-commit-config.yaml

@@ -19,13 +19,15 @@ repos:
     hooks:
       - id: eslint
         files: \.jsx?$
+        exclude: ui/config/
         types: [file]
         args: ['--fix', '--config', '.eslintrc.js']
         additional_dependencies:
           - eslint
           - eslint-config-prettier
           - eslint-plugin-sonarjs
           - eslint-plugin-react
+          - eslint-plugin-unused-imports
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v2.7.1
     hooks:

ui/src/content/init.js

@@ -9,7 +9,7 @@ export default function () {
   container.insertBefore(scriptElement, container.children[0]);
   scriptElement.remove();
 
-  chrome.runtime.onMessage.addListener((msg, sender, sendResponse) => {
+  chrome.runtime.onMessage.addListener((msg) => {
     if (msg.type.endsWith('-result')) {
       console.warn('Result received (content-script)', msg);
       document.dispatchEvent(new CustomEvent(msg.type, {detail: msg}));

ui/src/internal/chains.js

@@ -1,3 +1,5 @@
+import {coins} from '@cosmjs/stargate';
+
 export const EXECUTE_MSG_TYPE_URL = '/cosmwasm.wasm.v1.MsgExecuteContract';
 
 export const HOST_CHAIN = {
@@ -28,4 +30,4 @@ export const SLAVE_CHAINS = {
 };
 export const FACTORY_CONTRACT_ADDRESS =
   'inj1nlu6djpsq22rfees323r8yl8vt8cjwwufc8vks';
-export const BASE_FEE = coins(1000000000000000, 'inj');
+export const BASE_FEE = coins(1000000000000000, 'inj');

ui/src/internal/ward.js

@@ -1,25 +1,35 @@
 import {toBinary} from '@cosmjs/cosmwasm-stargate';
 import {stringToPath} from '@cosmjs/crypto';
 import {DirectSecp256k1HdWallet, Registry} from '@cosmjs/proto-signing';
-import {makeAuthInfoBytes, makeSignDoc} from '@cosmjs/proto-signing';
 import {
   AminoTypes,
   SigningStargateClient,
-  coins,
   createDefaultAminoConverters,
   defaultRegistryTypes,
 } from '@cosmjs/stargate';
 import {TxRaw} from 'cosmjs-types/cosmos/tx/v1beta1/tx.js';
 import {MsgExecuteContract} from 'cosmjs-types/cosmwasm/wasm/v1/tx.js';
 
+import {
+  EXECUTE_MSG_TYPE_URL,
+  FACTORY_CONTRACT_ADDRESS,
+  HOST_CHAIN,
+  SLAVE_CHAINS,
+} from './chains';
 import {CosmWasmClient} from './injectiveCompat';
-import {EXECUTE_MSG_TYPE_URL, HOST_CHAIN, SLAVE_CHAINS, FACTORY_CONTRACT_ADDRESS} from './chains';
-export {EXECUTE_MSG_TYPE_URL, HOST_CHAIN, SLAVE_CHAINS, FACTORY_CONTRACT_ADDRESS, BASE_FEE} from './chains';
+
+export {
+  EXECUTE_MSG_TYPE_URL,
+  HOST_CHAIN,
+  SLAVE_CHAINS,
+  FACTORY_CONTRACT_ADDRESS,
+  BASE_FEE,
+} from './chains';
 
 export function request(args, wait) {
   if (wait) {
     const eventName = `${wait}-result`;
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
       const receiveResponse = (e) => {
         document.removeEventListener(eventName, receiveResponse);
         resolve(e.detail);
@@ -220,18 +230,16 @@ export default class Ward {
   async getAllBalances() {
     const slaves = await this.getSlaveContracts();
     return Promise.all(
-      Object.entries(SLAVE_CHAINS).map(
-        async ([chainId, {rpc, name, denoms}]) => ({
-          chainId,
-          name,
-          address: slaves[chainId],
-          balances: await Promise.all(
-            denoms.map(async (denom) =>
-              this.getBalance(chainId, denom.coinDenom),
-            ),
+      Object.entries(SLAVE_CHAINS).map(async ([chainId, {name, denoms}]) => ({
+        chainId,
+        name,
+        address: slaves[chainId],
+        balances: await Promise.all(
+          denoms.map(async (denom) =>
+            this.getBalance(chainId, denom.coinDenom),
           ),
-        }),
-      ),
+        ),
+      })),
     );
   }
 
@@ -414,7 +422,7 @@ export default class Ward {
     );
   }
 
-  async signDirect(signerAddress, signDoc, password = null) {
+  async signDirect(signerAddress, signDoc, _password = null) {
     throw new Error('Direct signing not supported yet.');
   }
 }

ui/src/login/accountScreen.jsx

@@ -1,4 +1,3 @@
-import {makeSignDoc} from '@cosmjs/amino';
 import {toBinary} from '@cosmjs/cosmwasm-stargate';
 import {coins} from '@cosmjs/stargate';
 import React from 'react';
@@ -17,9 +16,7 @@ import Table from 'react-bootstrap/Table';
 import Ward, {
   BASE_FEE,
   EXECUTE_MSG_TYPE_URL,
-  FACTORY_CONTRACT_ADDRESS,
   HOST_CHAIN,
-  SLAVE_CHAINS,
 } from '../internal/ward';
 
 export class BalanceRow extends React.Component {
@@ -398,9 +395,9 @@ export class ManageOwnScreen extends MessageSender {
   async componentDidMount() {
     const {
       members,
-      recovery_approvals_count,
-      transfer_approvals_count,
-      recovery_progress,
+      // recovery_approvals_count,
+      // transfer_approvals_count,
+      // recovery_progress,
       recovery_method,
       new_owner,
     } = await this.ward.getRecoveryState();

ui/src/login/signupScreen.jsx

@@ -1,18 +1,14 @@
-import {makeSignDoc} from '@cosmjs/amino';
 import {toBinary} from '@cosmjs/cosmwasm-stargate';
 import {Bip39, Random} from '@cosmjs/crypto';
-import {coins} from '@cosmjs/stargate';
 import React from 'react';
 import {ArrowClockwise} from 'react-bootstrap-icons';
 import Alert from 'react-bootstrap/Alert';
 import Button from 'react-bootstrap/Button';
 import Col from 'react-bootstrap/Col';
 import FloatingLabel from 'react-bootstrap/FloatingLabel';
 import Form from 'react-bootstrap/Form';
-import Nav from 'react-bootstrap/Nav';
 import Row from 'react-bootstrap/Row';
 import Spinner from 'react-bootstrap/Spinner';
-import Tab from 'react-bootstrap/Tab';
 
 import Ward, {
   BASE_FEE,