lint

src/components/BecomeAProvider.svelte

@@ -1,9 +1,4 @@
 <script lang="ts">
-  import { dotApi } from '$lib/stores';
-  import { onMount } from 'svelte';
-  import type { web3Enable, web3FromSource } from '@polkadot/extension-dapp';
-  import { defaultDotApi } from '$lib/storeTypes';
-  import type { DotApi } from '$lib/storeTypes';
   import { user } from '$lib/stores/userStore';
   import { nonProviderAccountsStore } from '$lib/stores/accountsStore';
   import BlockSection from './BlockSection.svelte';
@@ -13,22 +8,10 @@
   import EmailProviderRequest from './EmailProviderRequest.svelte';
   import { pageContent } from '$lib/stores/pageContentStore';
 
-  let localDotApi: DotApi = defaultDotApi;
-  let thisWeb3FromSource: typeof web3FromSource;
-  let thisWeb3Enable: typeof web3Enable;
-
   // a callback for when the user cancels this action
   export let cancelAction = () => {
     pageContent.login();
   };
-
-  onMount(async () => {
-    const extension = await import('@polkadot/extension-dapp');
-    thisWeb3FromSource = extension.web3FromSource;
-    thisWeb3Enable = extension.web3Enable;
-  });
-
-  dotApi.subscribe((api) => (localDotApi = api));
 </script>
 
 <div id="become-a-provider" class="content-block column w-single-block">

src/components/CreateProvider.svelte

@@ -12,7 +12,6 @@
   import { user } from '$lib/stores/userStore';
   import { getMsaInfo } from '$lib/polkadotApi';
   import type { MsaInfo } from '$lib/storeTypes';
-  import { nonProviderAccountsStore, providerAccountsStore } from '$lib/stores/accountsStore';
   import { pageContent } from '$lib/stores/pageContentStore';
 
   let newProviderName = '';

src/components/Nav.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import { navigating } from '$app/stores';
   import { onMount } from 'svelte';
   import iconLogo from '$lib/assets/icon-logo.png';
 

src/components/SelectNetworkAndAccount.svelte

@@ -40,13 +40,14 @@
       try {
         networkErrorMsg = '';
         controlKeysErrorMsg = '';
-        const curApi = await createApi(network.endpoint!?.toString());
+        if (!network.endpoint) throw new Error("Undefined endpoint.");
+        const curApi = await createApi(network.endpoint?.origin);
         await fetchAccountsForNetwork(network, thisWeb3Enable, thisWeb3Accounts, curApi.api as ApiPromise);
         await curApi.api?.disconnect();
       } catch (e) {
         console.log(e);
         networkErrorMsg = `Could not connect to ${
-          network.endpoint?.toString() || 'empty value'
+          network.endpoint?.origin || 'empty value'
         }. Please enter a valid and reachable Websocket URL.`;
         console.error(networkErrorMsg);
       }
@@ -111,7 +112,7 @@
       on:keydown={customNetworkChanged}
     />
   {/if}
-  <div id="network-error-msg" class="text-sm text-error">{networkErrorMsg}</div>
+  <div id="network-error-msg" class="text-error text-sm">{networkErrorMsg}</div>
   <DropDownMenu
     id="controlkeys"
     label={accountSelectorTitle}
@@ -122,5 +123,5 @@
     formatter={formatAccount}
     disabled={accountsStore.size == 0}
   />
-  <div id="controlkey-error-msg" class="text-sm text-error">{controlKeysErrorMsg}</div>
+  <div id="controlkey-error-msg" class="text-error text-sm">{controlKeysErrorMsg}</div>
 </div>

src/lib/connections.ts

@@ -74,18 +74,18 @@ export async function submitAddControlKey(
     );
     useKeyring
       ? await submitExtrinsicWithKeyring(
-          extrinsic,
+        extrinsic,
           signingAccount as KeyringPair,
           txnStatusCallback,
           txnFinishedCallback
-        )
+      )
       : await submitExtrinsicWithExtension(
           extension as InjectedExtension,
           extrinsic,
           signingAccount.address,
           txnStatusCallback,
           txnFinishedCallback
-        );
+      );
   } else {
     console.debug('api is not available.');
   }
@@ -114,7 +114,7 @@ export async function submitStake(
           signingAccount.address,
           callback,
           txnFinishedCallback
-        );
+      );
   } else {
     console.debug('api is not available.');
   }
@@ -274,7 +274,7 @@ export async function submitCreateProvider(
           signingAccount.address,
           txnStatusCallback,
           txnFinishedCallback
-        );
+      );
     return true;
   }
   return false;
@@ -301,7 +301,7 @@ export async function submitRequestToBeProvider(
           signingAccount.address,
           txnStatusCallback,
           txnFinishedCallback
-        );
+      );
     return true;
   }
   console.error('submit failed because api is', api);
@@ -329,7 +329,7 @@ export async function submitCreateMsa(
           signingAccount.address,
           txnStatusCallback,
           txnFinishedCallback
-        );
+      );
     return true;
   }
   return false;

src/lib/polkadotApi.ts

@@ -19,19 +19,14 @@ async function updateChainInfo(api: ApiPromise) {
 }
 
 export async function createAndConnectToApi(networkEndpoint: string) {
-  let initializedDotApi = await createApi(networkEndpoint);
-  console.log('*** createAndConnectToApi ****', initializedDotApi.selectedEndpoint);
-  console.log('*** here 3 selectedEndpoint****', initializedDotApi);
-
+  const initializedDotApi = await createApi(networkEndpoint);
   dotApi.set(initializedDotApi);
-
   await updateChainInfo(initializedDotApi.api);
 }
 
 export async function createApi(networkEndpoint: string): Promise<DotApi> {
   const wsProvider = new WsProvider(networkEndpoint);
-  console.log('*** wsProvider networkEndpoint ****', wsProvider.endpoint);
-
+
   const apiPromise = await ApiPromise.create({
     provider: wsProvider,
     throwOnConnect: true,

test/e2e/page.test.ts

@@ -1,21 +1,11 @@
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/svelte';
+import { cleanup, fireEvent, render, waitFor } from '@testing-library/svelte';
 import '@testing-library/jest-dom';
 import Page from '$routes/+page.svelte';
 
 // global.alert = () => {};
 // vitest mocking
 globalThis.alert = () => {};
 
-const getByTextContent = (text) => {
-  // Passing function to `getByText`
-  return screen.getByText((content, element) => {
-    const hasText = (element) => element.textContent === text;
-    const elementHasText = hasText(element);
-    const childrenDontHaveText = Array.from(element?.children || []).every((child) => !hasText(child));
-    return elementHasText && childrenDontHaveText;
-  });
-};
-
 describe('End to End Tests', () => {
   // TODO: @testing-library/svelte claims to add this automatically but it doesn't work without explicit afterEach
   afterEach(() => cleanup());

test/unit-and-integration/capacity.test.ts

@@ -2,7 +2,6 @@ import { cleanup, render, waitFor } from '@testing-library/svelte';
 import '@testing-library/jest-dom';
 import { storeChainInfo, dotApi } from '../../src/lib/stores';
 import Capacity from '$components/Capacity.svelte';
-import { getByTextContent } from '../helpers';
 import { user } from '../../src/lib/stores/userStore';
 import { ChainInfo } from '../../src/lib/storeTypes';
 

test/unit-and-integration/provider.test.ts

@@ -1,4 +1,4 @@
-import { cleanup, render, waitFor } from '@testing-library/svelte';
+import { cleanup, render } from '@testing-library/svelte';
 import '@testing-library/jest-dom';
 import { dotApi, storeCurrentAction, storeChainInfo } from '../../src/lib/stores';
 import { user } from '../../src/lib/stores/userStore';