Merge pull request #31 from SimpleHold/fix-generate-wallets

Fix generate wallets
SimpleHold · Sep 28, 2021 · de8048b · de8048b
2 parents 0a01dcd + 8ffbe86
commit de8048b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 70 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "extension",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "description": "extension",
   "private": false,
   "repository": "https://github.com/SimpleHold/extension.git",

diff --git a/src/manifest.json b/src/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "SimpleHold",
-  "version": "1.13.4",
+  "version": "1.13.5",
   "icons": {
     "16": "assets/logo/favicon-16.png",
     "32": "assets/logo/favicon-32.png",

diff --git a/src/pages/NewWallet/NewWallet.tsx b/src/pages/NewWallet/NewWallet.tsx
@@ -17,12 +17,7 @@ import { validatePassword } from '@utils/validate'
 import { decrypt } from '@utils/crypto'
 import { addNew as addNewWallet, IWallet } from '@utils/wallet'
 import { toUpper } from '@utils/format'
-import {
-  generate,
-  importPrivateKey,
-  importRecoveryPhrase,
-  checkWithPhrase,
-} from '@utils/currencies'
+import { generate, checkWithPhrase } from '@utils/currencies'
 import * as theta from '@utils/currencies/theta'
 import { getItem, setItem } from '@utils/storage'
 
@@ -100,62 +95,49 @@ const NewWallet: React.FC = () => {
       const generateAddress = await generate(symbol, chain)
 
       if (generateAddress) {
-        const { privateKey, mnemonic, isNotActivated } = generateAddress
+        const { privateKey, mnemonic, isNotActivated, address } = generateAddress
 
         const backup = getItem('backup')
 
         if (backup && privateKey) {
           const decryptBackup = decrypt(backup, state.password)
 
           if (decryptBackup) {
-            let address
-
-            if (mnemonic) {
-              const tryImportPhrase = importRecoveryPhrase(symbol, mnemonic)
-              if (tryImportPhrase) {
-                address = tryImportPhrase.address
-              }
-            } else {
-              address = await importPrivateKey(symbol, privateKey, chain)
-            }
-
-            if (address || isNotActivated) {
-              updateState({ isButtonLoading: false })
-
-              const getCurrencyInfo = chain ? getCurrencyByChain(chain) : null
-              const currenciesList = getCurrenciesList(getCurrencyInfo)
-
-              const walletsList = addNewWallet(
-                address || '',
-                privateKey,
-                decryptBackup,
-                state.password,
-                currenciesList,
-                false,
-                chain,
-                tokenName,
-                contractAddress,
-                decimals,
-                mnemonic,
-                isNotActivated
-              )
-
-              if (walletsList) {
-                const walletAmount = JSON.parse(walletsList).filter(
-                  (wallet: IWallet) => wallet.symbol === symbol
-                ).length
-
-                setUserProperties({ [`NUMBER_WALLET_${toUpper(symbol)}`]: `${walletAmount}` })
-
-                logEvent({
-                  name: ADD_ADDRESS_CONFIRM,
-                })
-
-                setItem('backupStatus', 'notDownloaded')
-
-                updateState({ activeDrawer: 'success' })
-                return
-              }
+            updateState({ isButtonLoading: false })
+
+            const getCurrencyInfo = chain ? getCurrencyByChain(chain) : null
+            const currenciesList = getCurrenciesList(getCurrencyInfo)
+
+            const walletsList = addNewWallet(
+              address,
+              privateKey,
+              decryptBackup,
+              state.password,
+              currenciesList,
+              false,
+              chain,
+              tokenName,
+              contractAddress,
+              decimals,
+              mnemonic,
+              isNotActivated
+            )
+
+            if (walletsList) {
+              const walletAmount = JSON.parse(walletsList).filter(
+                (wallet: IWallet) => wallet.symbol === symbol
+              ).length
+
+              setUserProperties({ [`NUMBER_WALLET_${toUpper(symbol)}`]: `${walletAmount}` })
+
+              logEvent({
+                name: ADD_ADDRESS_CONFIRM,
+              })
+
+              setItem('backupStatus', 'notDownloaded')
+
+              updateState({ activeDrawer: 'success' })
+              return
             }
           }
         }

diff --git a/src/utils/currencies/index.ts b/src/utils/currencies/index.ts
@@ -91,16 +91,16 @@ export const generate = async (
   symbol: string,
   chain?: string
 ): Promise<TGenerateAddress | null> => {
+  if (isEthereumLike(symbol, chain)) {
+    return ethereumLike.generateAddress()
+  }
+
   const provider = getProvider(symbol)
 
   if (provider?.generateWallet) {
     return await provider.generateWallet()
   }
 
-  if (isEthereumLike(symbol, chain)) {
-    return ethereumLike.generateAddress()
-  }
-
   return bitcoinLike.generateWallet(symbol)
 }
 
@@ -324,16 +324,16 @@ export const getExplorerLink = (
   tokenChain?: string,
   contractAddress?: string
 ) => {
+  if (isEthereumLike(symbol, tokenChain)) {
+    return ethereumLike.getExplorerLink(address, symbol, tokenChain, contractAddress)
+  }
+
   const provider = getProvider(symbol)
 
   if (provider?.getExplorerLink) {
     return provider.getExplorerLink(address)
   }
 
-  if (isEthereumLike(symbol, tokenChain)) {
-    return ethereumLike.getExplorerLink(address, symbol, tokenChain, contractAddress)
-  }
-
   return `https://blockchair.com/${chain}/address/${address}`
 }
 
@@ -343,17 +343,17 @@ export const getTransactionLink = (
   chain: string,
   tokenChain?: string
 ): string => {
+  if (isEthereumLike(symbol, tokenChain)) {
+    return ethereumLike.getTransactionLink(hash, chain, tokenChain)
+  }
+
   const provider = getProvider(symbol)
 
   if (provider?.getTransactionLink) {
     return provider.getTransactionLink(hash)
   }
 
-  if (isEthereumLike(symbol, tokenChain)) {
-    return ethereumLike.getTransactionLink(hash, chain, tokenChain)
-  } else {
-    return `https://blockchair.com/${chain}/transaction/${hash}`
-  }
+  return `https://blockchair.com/${chain}/transaction/${hash}`
 }
 
 export const getNetworkFeeSymbol = (symbol: string, tokenChain?: string): string => {