Resolve ui bug #5

Koniverse · Feb 28, 2024 · ecc4575 · ecc4575
1 parent 4ff0108
commit ecc4575
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 20 deletions.
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/packages/core/src/views/connect/Index.svelte b/packages/core/src/views/connect/Index.svelte
@@ -423,7 +423,6 @@
     let { balance, secondaryTokens } = accounts[0]
 
     if (balance === null) {
-      console.log('123123')
         await getBalance(address, appChain, type).then(balance => {
           updateAccount(selectedWallet.label, address, {
             balance
@@ -479,7 +478,7 @@
     //     return;
     //   }
     // }
-    setTimeout(() => connectWallet$.next({ inProgress: false }), 1500)
+    setTimeout(() => connectWallet$.next({ inProgress: false }), 500)
   }
 
 

diff --git a/packages/core/src/views/connect/Sidebar.svelte b/packages/core/src/views/connect/Sidebar.svelte
@@ -64,7 +64,7 @@
   .icon-container {
     display: flex;
     height: fit-content;
-    width: auto;
+    width: 56px;
     min-width: 3.5rem;
     max-width: 100%;
   }

diff --git a/packages/demo/src/components/account/AccountCardItem.tsx b/packages/demo/src/components/account/AccountCardItem.tsx
@@ -19,6 +19,7 @@ export interface _AccountCardItem {
 function Component (props: _AccountCardItem): React.ReactElement<_AccountCardItem> {
   const { account, className, isSelected } = props;
 
+
   const token = useContext<Theme>(ThemeContext as Context<Theme>).token;
 
   const avatarTheme = useAccountAvatarTheme(account.address || '');
@@ -42,7 +43,10 @@ function Component (props: _AccountCardItem): React.ReactElement<_AccountCardIte
           />
         </div>
         <div className='__item-center-part'>
-          <div className='__item-name'>{account.uns?.name || account.ens?.name || toShort(account.address)}</div>
+          <div className='__item-name'>
+            {account.uns?.name || account.ens?.name || toShort(account.address)}
+
+          </div>
           <div className='__item-address'>{toShort(account.address, 9, 9)}</div>
         </div>
         <div className='__item-right-part'>

diff --git a/packages/demo/src/constants/common.ts b/packages/demo/src/constants/common.ts
@@ -19,6 +19,6 @@ export const CONTACT_US = 'https://t.me/subwallet';
 export const ALL_KEY = 'all';
 export const HELP_URL = 'https://docs.subwallet.app/main/';
 
-export const INSTALL_WALLET = 'https://ethereum.org/en/wallets/find-wallet#main-content'
+export const INSTALL_WALLET = 'https://www.subwallet.app/download.html'
 
 export const THEME_BACKGROUND_COLOR = 'theme-background-color';
diff --git a/packages/demo/src/pages/Welcome.tsx b/packages/demo/src/pages/Welcome.tsx
@@ -69,6 +69,8 @@ function Component ({ className }: Props): React.ReactElement {
       <a
         className={'__welcome-install_link'}
         href={INSTALL_WALLET}
+        target="_blank"
+        rel="noreferrer noopener"
       >
         <Icon
           phosphorIcon={Info}

diff --git a/packages/demo/src/web3-onboard.ts b/packages/demo/src/web3-onboard.ts
@@ -43,7 +43,7 @@ const metamaskSDKWallet = metamaskSDK({
     },
     infuraAPIKey : INFURA_KEY,
     dappMetadata: {
-      name: 'Demo Web3Onboard'
+      name: 'SubConnect'
     }
   }
 })
@@ -199,7 +199,7 @@ export default init({
 
   appMetadata: {
     // The name of your dApp
-    name: 'SubWallet Connect',
+    name: 'SubConnect',
 
     icon: SubWallet,
 

diff --git a/packages/polkadotJs/src/index.ts b/packages/polkadotJs/src/index.ts
@@ -19,7 +19,7 @@ function SubWallet (): WalletInit {
         const isInstalled = (extensionName: string) => {
         const injectedWindow = window as unknown as Window & InjectedWindow;
         const injectedExtension =
-          injectedWindow?.injectedWeb3[extensionName]
+         injectedWindow?.injectedWeb3 && injectedWindow?.injectedWeb3[extensionName]
         return !!injectedExtension;
       }
 

diff --git a/packages/subwalletPolkadot/src/index.ts b/packages/subwalletPolkadot/src/index.ts
@@ -19,7 +19,7 @@ function SubWallet (): WalletInit {
         const isInstalled = (extensionName: string) => {
           const injectedWindow = window as unknown as Window & InjectedWindow;
           const injectedExtension =
-            injectedWindow?.injectedWeb3[extensionName]
+            injectedWindow?.injectedWeb3 && injectedWindow?.injectedWeb3[extensionName]
           return !!injectedExtension;
         }
 

diff --git a/packages/talisman/src/index.ts b/packages/talisman/src/index.ts
@@ -19,7 +19,7 @@ function SubWallet (): WalletInit {
         const isInstalled = (extensionName: string) => {
           const injectedWindow = window as unknown as Window & InjectedWindow;
           const injectedExtension =
-            injectedWindow?.injectedWeb3[extensionName]
+            injectedWindow?.injectedWeb3 && injectedWindow?.injectedWeb3[extensionName]
           return !!injectedExtension;
         }