chore(add): fix some stuff

Satellite-im · Jul 13, 2022 · 23a50cd · 23a50cd
1 parent 758b5ad
commit 23a50cd
Showing 1 changed file with 0 additions and 18 deletions.
diff --git a/store/accounts/actions.ts b/store/accounts/actions.ts
@@ -354,28 +354,10 @@ export default {
         'Loading Iridium from accounts startup',
       )
       const $BlockchainClient: BlockchainClient = BlockchainClient.getInstance()
-<<<<<<< HEAD
 
       const { entropyMessage } = state
       const entropy = await $BlockchainClient.signMessage(entropyMessage)
       await dispatch('iridium/initializFromEntropy', entropy, { root: true })
-=======
-      if (state.adapter === 'Solana') {
-        const { pin } = state
-        await dispatch(
-          'iridium/initialize',
-          {
-            pass: pin,
-            wallet: $BlockchainClient.account,
-          },
-          { root: true },
-        )
-      } else {
-        const { entropyMessage } = state
-        const entropy = await $BlockchainClient.signMessage(entropyMessage)
-        await dispatch('iridium/initializFromEntropy', entropy, { root: true })
-      }
->>>>>>> e25013e7 (chore(add): added phantom manager and fully integrated Phantom)
     }
 
     await dispatch('groups/initialize', {}, { root: true })