Merge pull request #46 from amitojsingh366/master

refactor: fix prettier issues
keepkey · Mar 4, 2022 · 3c5beef · 3c5beef
2 parents e317477 + 5f03d2c
commit 3c5beef
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 29 deletions.
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,18 +1,18 @@
 import { Alert, AlertDescription } from '@chakra-ui/alert'
 import { Button } from '@chakra-ui/button'
 import { ToastId, useToast } from '@chakra-ui/toast'
+import { ipcRenderer } from 'electron'
 import { pluginManager, registerPlugins } from 'plugins'
 import { useEffect, useRef, useState } from 'react'
 import { FaSync } from 'react-icons/fa'
 import { useTranslate } from 'react-polyglot'
 import { Routes } from 'Routes/Routes'
 import { IconCircle } from 'components/IconCircle'
+import { PairingProps } from 'components/Modals/Pair/Pair'
+import { useModal } from 'context/ModalProvider/ModalProvider'
 import { useHasAppUpdated } from 'hooks/useHasAppUpdated/useHasAppUpdated'
 
 import { Route } from './Routes/helpers'
-import { useModal } from 'context/ModalProvider/ModalProvider'
-import { ipcRenderer } from 'electron'
-import { PairingProps } from 'components/Modals/Pair/Pair'
 
 export const App = () => {
   const [pluginRoutes, setPluginRoutes] = useState<Route[]>([])
@@ -38,7 +38,7 @@ export const App = () => {
     ipcRenderer.on('@modal/pair', (event, data: PairingProps) => {
       pair.open(data)
     })
-  }, [])
+  }, [pair])
 
   useEffect(() => {
     if (shouldUpdate && !toast.isActive(updateId)) {

diff --git a/src/components/Modals/Pair/Pair.tsx b/src/components/Modals/Pair/Pair.tsx
@@ -2,27 +2,26 @@ import {
   Alert,
   AlertDescription,
   AlertIcon,
+  Box,
   Button,
+  Image,
   Modal,
   ModalBody,
   ModalCloseButton,
   ModalContent,
   ModalHeader,
   ModalOverlay,
-  Stack,
-  Image,
-  Box
+  Stack
 } from '@chakra-ui/react'
 import { ipcRenderer } from 'electron'
 import { useState } from 'react'
+import { SlideTransition } from 'components/SlideTransition'
 import { Text } from 'components/Text'
 import { useModal } from 'context/ModalProvider/ModalProvider'
-import { SlideTransition } from 'components/SlideTransition'
-
 
 export type PairingProps = {
-  serviceName: string,
-  serviceImageUrl: string,
+  serviceName: string
+  serviceImageUrl: string
   nonce: string
 }
 
@@ -62,9 +61,12 @@ export const PairModal = (input: PairingProps) => {
           </ModalHeader>
           <ModalBody>
             <Stack spacing={4} mb={4}>
-              <Box display="inline-flex" justifyContent={'center'} alignItems='center'>
-                <Image src={input.serviceImageUrl} borderRadius="full" height="10" width="10" />
-                <Text translation={['modals.pair.body', { serviceName: input.serviceName }]} pl='2' />
+              <Box display='inline-flex' justifyContent={'center'} alignItems='center'>
+                <Image src={input.serviceImageUrl} borderRadius='full' height='10' width='10' />
+                <Text
+                  translation={['modals.pair.body', { serviceName: input.serviceName }]}
+                  pl='2'
+                />
               </Box>
               {error && (
                 <Alert status='error'>

diff --git a/src/context/WalletProvider/KeepKey.tsx b/src/context/WalletProvider/KeepKey.tsx
@@ -47,7 +47,11 @@ export class KeepKeyService {
     if (!serviceKey) {
       serviceKey = uuidv4()
       localStorage.setItem('@bridge/service-key', serviceKey)
-      ipcRenderer.send('@bridge/add-service', { serviceKey, serviceName: 'ShapeShift', serviceKeyImageUrl: 'https://app.shapeshift.com/icon-512x512.png' })
+      ipcRenderer.send('@bridge/add-service', {
+        serviceKey,
+        serviceName: 'ShapeShift',
+        serviceKeyImageUrl: 'https://app.shapeshift.com/icon-512x512.png'
+      })
     }
     return serviceKey
   }

diff --git a/src/context/WalletProvider/WalletProvider.tsx b/src/context/WalletProvider/WalletProvider.tsx
@@ -108,15 +108,15 @@ function playSound(type: any) {
 export type ActionTypes =
   | { type: WalletActions.SET_ADAPTERS; payload: Adapters }
   | {
-    type: WalletActions.SET_WALLET
-    payload: {
-      wallet: HDWallet | null
-      name: string
-      icon: ComponentWithAs<'svg', IconProps>
-      deviceId: string
-      meta?: { label: string }
+      type: WalletActions.SET_WALLET
+      payload: {
+        wallet: HDWallet | null
+        name: string
+        icon: ComponentWithAs<'svg', IconProps>
+        deviceId: string
+        meta?: { label: string }
+      }
     }
-  }
   | { type: WalletActions.SET_IS_CONNECTED; payload: boolean }
   | { type: WalletActions.SET_CONNECTOR_TYPE; payload: KeyManager }
   | { type: WalletActions.SET_INITIAL_ROUTE; payload: string }
@@ -193,7 +193,7 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX
 
   useEffect(() => {
     if (state.keyring) {
-      ; (async () => {
+      ;(async () => {
         const adapters: Adapters = new Map()
         let options: undefined | { portisAppId: string }
         for (const wallet of Object.values(KeyManager)) {
@@ -205,8 +205,8 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX
             const adapter = SUPPORTED_WALLETS[wallet].adapter.useKeyring(state.keyring, options)
             // useKeyring returns the instance of the adapter. We'll keep it for future reference.
             if (wallet === 'keepkey') {
-              const serviceKey = keepkey.getServiceKey()
               // TODO: add ability to pass serviceKey to adapter
+              // const serviceKey = keepkey.getServiceKey()
               await adapter.pairDevice('http://localhost:1646')
               adapters.set(wallet, adapter)
             } else {
@@ -251,7 +251,7 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX
       }
     })
 
-    ipcRenderer.on('playSound', (event, data) => { })
+    ipcRenderer.on('playSound', (event, data) => {})
 
     ipcRenderer.on('attach', (event, data) => {
       dispatch({ type: WalletActions.SET_KEEPKEY_STATE, payload: data.state })
@@ -310,7 +310,7 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX
       bootloader.open({})
     })
 
-    ipcRenderer.on('setDevice', (event, data) => { })
+    ipcRenderer.on('setDevice', (event, data) => {})
 
     ipcRenderer.on('signTx', async (event: any, data: any) => {
       let unsignedTx = data.payload.data
@@ -347,8 +347,8 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX
       if (type === 'keepkey') {
         const adapter = SUPPORTED_WALLETS['keepkey'].adapter.useKeyring(state.keyring)
         try {
-          const serviceKey = keepkey.getServiceKey()
           // TODO: add ability to pass serviceKey to adapter
+          // const serviceKey = keepkey.getServiceKey()
           await adapter.pairDevice('http://localhost:1646')
           const adapters: Adapters = new Map()
           adapters.set('keepkey' as KeyManager, adapter)
@@ -399,7 +399,7 @@ export const WalletProvider = ({ children }: { children: React.ReactNode }): JSX
     const localWalletType = getLocalWalletType()
     const localWalletDeviceId = getLocalWalletDeviceId()
     if (localWalletType && localWalletDeviceId && state.adapters) {
-      ; (async () => {
+      ;(async () => {
         if (state.adapters?.has(localWalletType)) {
           switch (localWalletType) {
             case KeyManager.Native: