diff --git a/packages/use-dataloader/src/__tests__/DataLoaderProvider.test.tsx b/packages/use-dataloader/src/__tests__/DataLoaderProvider.test.tsx
index af218ffa5..9333155bf 100644
--- a/packages/use-dataloader/src/__tests__/DataLoaderProvider.test.tsx
+++ b/packages/use-dataloader/src/__tests__/DataLoaderProvider.test.tsx
@@ -7,10 +7,10 @@ import { KEY_IS_NOT_STRING_ERROR, StatusEnum } from '../constants'
 const TEST_KEY = 'test'
 const PROMISE_TIMEOUT = 5
 const fakePromise = () =>
-  new Promise(resolve => setTimeout(() => resolve(true), PROMISE_TIMEOUT))
+  new Promise(resolve => { setTimeout(() => resolve(true), PROMISE_TIMEOUT) })
 
 const fakeNullPromise = () =>
-  new Promise(resolve => setTimeout(() => resolve(null), PROMISE_TIMEOUT))
+  new Promise(resolve => { setTimeout(() => resolve(null), PROMISE_TIMEOUT) })
 
 const wrapper = ({ children }: { children: ReactNode }) => (
   <DataLoaderProvider>{children}</DataLoaderProvider>
@@ -180,7 +180,7 @@ describe('DataLoaderProvider', () => {
 
   test('should delay max concurrent request', async () => {
     const method = jest.fn(
-      () => new Promise(resolve => setTimeout(() => resolve(true), 100)),
+      () => new Promise(resolve => { setTimeout(() => resolve(true), 100) }),
     )
     const { result, waitFor } = renderHook(useDataLoaderContext, {
       wrapper: wrapperWith2ConcurrentRequests,
diff --git a/packages/use-dataloader/src/__tests__/dataloader.test.ts b/packages/use-dataloader/src/__tests__/dataloader.test.ts
index 9c6027b35..9089eeb0c 100644
--- a/packages/use-dataloader/src/__tests__/dataloader.test.ts
+++ b/packages/use-dataloader/src/__tests__/dataloader.test.ts
@@ -51,12 +51,12 @@ describe('Dataloader class', () => {
     expect(notify).toBeCalledTimes(0)
     expect(method).toBeCalledTimes(1)
     await instance.cancel()
-    await new Promise(resolve =>
+    await new Promise(resolve => {
       setTimeout(() => {
         expect(notify).toBeCalledTimes(1)
         resolve(true)
-      }, PROMISE_TIMEOUT),
-    )
+      }, PROMISE_TIMEOUT)
+    })
     expect(instance.getData()).toBe(undefined)
     instance.clearData()
   })
@@ -73,12 +73,12 @@ describe('Dataloader class', () => {
     expect(instance.status).toBe(StatusEnum.LOADING)
     expect(notify).toBeCalledTimes(0)
     expect(method).toBeCalledTimes(1)
-    await new Promise(resolve =>
+    await new Promise(resolve => {
       setTimeout(() => {
         expect(notify).toBeCalledTimes(1)
         resolve(true)
-      }, PROMISE_TIMEOUT),
-    )
+      }, PROMISE_TIMEOUT)
+    })
     expect(instance.getData()).toBe(true)
     instance.getObserversCount()
     instance.removeObserver(notify)
@@ -95,11 +95,11 @@ describe('Dataloader class', () => {
     })
     expect(instance.status).toBe(StatusEnum.LOADING)
     expect(method).toBeCalledTimes(1)
-    await new Promise(resolve =>
+    await new Promise(resolve => {
       setTimeout(() => {
         resolve(true)
-      }, PROMISE_TIMEOUT),
-    )
+      }, PROMISE_TIMEOUT)
+    })
     expect(instance.getData()).toBe(undefined)
   })
   test('should create instance enabled with undefined data', async () => {
@@ -111,11 +111,11 @@ describe('Dataloader class', () => {
     })
     expect(instance.status).toBe(StatusEnum.LOADING)
     expect(method).toBeCalledTimes(1)
-    await new Promise(resolve =>
+    await new Promise(resolve => {
       setTimeout(() => {
         resolve(true)
-      }, PROMISE_TIMEOUT),
-    )
+      }, PROMISE_TIMEOUT)
+    })
     expect(instance.getData()).toBe(undefined)
   })
 
@@ -193,18 +193,18 @@ describe('Dataloader class', () => {
     })
     await instance.load()
     expect(method).toBeCalledTimes(1)
-    await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 3))
+    await new Promise(resolve => { setTimeout(resolve, PROMISE_TIMEOUT * 3) })
     expect(method).toBeCalledTimes(2)
-    await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 3))
+    await new Promise(resolve => { setTimeout(resolve, PROMISE_TIMEOUT * 3) })
     expect(method).toBeCalledTimes(3)
     await instance.load()
     await instance.load()
-    await new Promise(resolve => setTimeout(resolve))
+    await new Promise(resolve => { setTimeout(resolve) })
     expect(method).toBeCalledTimes(4)
     await instance.load()
     await instance.load()
     await instance.load(true)
-    await new Promise(resolve => setTimeout(resolve))
+    await new Promise(resolve => { setTimeout(resolve) })
     expect(method).toBeCalledTimes(6)
     instance.setPollingInterval(PROMISE_TIMEOUT * 4)
     instance.destroy()
@@ -222,12 +222,12 @@ describe('Dataloader class', () => {
     instance.addOnSuccessListener(onSuccess)
     expect(instance.status).toBe(StatusEnum.LOADING)
     expect(method).toBeCalledTimes(1)
-    await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT))
+    await new Promise(resolve => { setTimeout(resolve, PROMISE_TIMEOUT) })
     expect(onSuccess).toBeCalledTimes(1)
     await instance.load()
     expect(method).toBeCalledTimes(1)
     expect(onSuccess).toBeCalledTimes(1)
-    await new Promise(resolve => setTimeout(resolve, PROMISE_TIMEOUT * 2))
+    await new Promise(resolve => { setTimeout(resolve, PROMISE_TIMEOUT * 2) })
     await instance.load()
     expect(method).toBeCalledTimes(2)
     expect(onSuccess).toBeCalledTimes(2)
@@ -245,7 +245,7 @@ describe('Dataloader class', () => {
       expect(instance.status).toBe(StatusEnum.LOADING)
     }
     // Because wait for setTimeout tryLaunch in dataloader.ts
-    await new Promise(resolve => setTimeout(resolve))
+    await new Promise(resolve => { setTimeout(resolve) })
     expect(method).toBeCalledTimes(2)
   })
 })
diff --git a/packages/use-dataloader/src/__tests__/useDataLoader.test.tsx b/packages/use-dataloader/src/__tests__/useDataLoader.test.tsx
index 3096ae989..c3ba0f40b 100644
--- a/packages/use-dataloader/src/__tests__/useDataLoader.test.tsx
+++ b/packages/use-dataloader/src/__tests__/useDataLoader.test.tsx
@@ -148,9 +148,9 @@ describe('useDataLoader', () => {
         ...initialProps,
         key: 'test-3',
         method: () =>
-          new Promise(resolve =>
-            setTimeout(() => resolve(null), PROMISE_TIMEOUT),
-          ),
+          new Promise(resolve => {
+            setTimeout(() => resolve(null), PROMISE_TIMEOUT)
+          })
       },
       wrapper,
     })
diff --git a/packages/use-i18n/src/index.ts b/packages/use-i18n/src/index.ts
index 90985a3a2..274eb1be0 100644
--- a/packages/use-i18n/src/index.ts
+++ b/packages/use-i18n/src/index.ts
@@ -1,2 +1,5 @@
-export { default } from './usei18n'
+import usei18n from './usei18n'
+
 export * from './usei18n'
+
+export default usei18n
diff --git a/packages/use-i18n/src/usei18n.tsx b/packages/use-i18n/src/usei18n.tsx
index d3245835e..182eaef49 100644
--- a/packages/use-i18n/src/usei18n.tsx
+++ b/packages/use-i18n/src/usei18n.tsx
@@ -93,7 +93,7 @@ export const useI18n = (): Context => {
   return context
 }
 
-export const useTranslation = (namespaces: string[] = [], load?: LoadTranslationsFn): Context & { isLoaded: boolean } => {
+export const useTranslation = (namespaces: string[] = [], load: LoadTranslationsFn | undefined = undefined): Context & { isLoaded: boolean } => {
   const context = useContext(I18nContext)
   if (context === undefined) {
     throw new Error('useTranslation must be used within a I18nProvider')