RMRK: Fixed extension ss58Format, added missing icons

Author: vikiival

dashboard/src/App.vue

@@ -30,7 +30,7 @@ export default class Dashboard extends Vue {
     keyring.loadAll({
       ss58Format: this.ss58Format || 42,
       type: 'sr25519',
-      isDevelopment: this.$store.state.development.status || false,
+      isDevelopment: Boolean(process.env.VUE_APP_KEYRING) || false,
     });
   }
 

dashboard/src/components/settings/General.vue

@@ -5,9 +5,9 @@
     <SettingChooser label="Default Icon Theme" selector="availableIcons" setter="setIcon"  defaultValue="icon" />
     <SettingChooser label="Interface Operation Mode" selector="availableUiModes" setter="setUiMode"  defaultValue="uiMode" />
     <!-- <SettingChooser label="Interface Operation Mode" selector="availableLocking" setter="setLocking"  defaultValue="locking" /> -->
-    <SettingChooserExplorer label="Default Explorer Provider" selector="provider" setter="setExplorer" defaultValue="0" />
+    <!-- <SettingChooserExplorer label="Default Explorer Provider" selector="provider" setter="setExplorer" defaultValue="0" />
     <SettingChooserExplorer label="Default Explorer Chain" selector="chain" setter="setExplorer" defaultValue="0" />
-    <SettingChooserDevelopment label="Development Mode" selector="options" setter="setDevelopment" />
+    <SettingChooserDevelopment label="Development Mode" selector="options" setter="setDevelopment" /> -->
     <b-button :style="{ marginTop: '1em' }" @click="refresh" type="is-danger is-light">Clear Cache & Reload</b-button>
   </div>
 </template>

dashboard/src/icons.ts

@@ -4,9 +4,9 @@ import {
   // faPlay, faFolderOpen, faAddressBook,
   // faCalendarCheck, faCogs,  faEyeSlash,
   // faExclamationCircle,   faAngleDoubleLeft, 
-  // faAngleDoubleRight,   faCaretDown, 
+  // faAngleDoubleRight, 
   // faCaretUp, faFile, faBook, 
-  // faCodeBranch, faSearch, 
+  // faCodeBranch, 
   // faArrowUp, faTools, faCheck, faSeedling, faDatabase, faGem, 
   // faInfoCircle, faExchangeAlt, faBug, faStop, faEllipsisV, faPercent,
   // faUsersCog, faCoins, faAngleLeft, faAngleRight,
@@ -18,7 +18,7 @@ import {
   faKey, faExternalLinkAlt, faUpload, faUsers,
   faQuestionCircle, faMinus,
   faChevronDown, faChevronUp,
-  faHeart
+  faHeart, faSearch, faCaretDown
 } from '@fortawesome/free-solid-svg-icons';
 
 // throws error, idk why
@@ -48,7 +48,9 @@ library.add(
   faKey, faExternalLinkAlt, faUpload, faUsers,
   faQuestionCircle, faMinus,
   faChevronDown, faChevronUp,
-  faTwitter, faTelegram, faLine, faHeart
+  faTwitter, faTelegram,
+  faLine, faHeart, faSearch,
+  faCaretDown
   );
 
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';

dashboard/src/textile.ts

@@ -1,4 +1,4 @@
-import { Client, KeyInfo, ThreadID } from '@textile/hub'
+import { Client, KeyInfo } from '@textile/hub'
 
 export async function client(): Promise<Client> {
    return await Client.withKeyInfo(keyInfo)

dashboard/src/utils/account.ts

@@ -1,6 +1,8 @@
 import { KeyringAccount } from '@/types';
 import keyring from '@polkadot/ui-keyring';
 import { getAddress } from '@/extension'
+import { decodeAddress, encodeAddress, } from '@polkadot/util-crypto';
+import store from '@/store'
 
 export const isAccountLocked = (account: KeyringAccount | string): boolean => {
   const address = typeof account === 'string' ? account : account.address;
@@ -24,4 +26,18 @@ const passwordRequired = async (account: KeyringAccount | string) => {
   return isAccountLocked(address)
 }
 
+const accountToAddress = (account: KeyringAccount | string) => typeof account === 'string' ? account : account.address;
+
+export const toDefaultAddress = (account: KeyringAccount | string) => {
+  const address = accountToAddress(account);
+  if (/^5/.test(address)) {
+    return address
+  }
+
+  const ss58Format = store.getters.getChainProperties?.ss58Format
+
+  return encodeAddress(decodeAddress(address, ss58Format));
+  
+}
+
 export default passwordRequired

dashboard/src/utils/transactionExecutor.ts

@@ -3,6 +3,7 @@ import { KeyringAccount } from '@/types';
 import { SubmittableExtrinsic } from '@polkadot/api/types';
 import { Callback } from '@polkadot/types/types';
 import { getAddress } from '@/extension';
+import { toDefaultAddress } from '@/utils/account'
 
 export type ExecResult = (() => void) | string
 
@@ -19,7 +20,7 @@ const exec = async (account: KeyringAccount | string, password: string | null, c
 	try {
     const transfer = await callback(...params);
     const address = typeof account === 'string' ? account : account.address;
-    const injector = await getAddress(address);
+    const injector = await getAddress(toDefaultAddress(address));
     if (injector) {
       const h = await transfer.signAndSend(address, { signer: injector.signer }, statusCb);
       return h