fix(#1137): fix typescript errors

kimbu-chat · Sep 10, 2022 · 3251733 · 3251733
1 parent 338d861
commit 3251733
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 35 deletions.
diff --git a/src/components/photo-editor/crop-image.ts b/src/components/photo-editor/crop-image.ts
@@ -53,19 +53,17 @@ export default async function getCroppedImg(
   canvas.height = pixelCrop.height;
 
   // paste generated rotate image with correct offsets for x,y crop values.
-  ctx.putImageData(
-    data,
-    0 - safeArea / 2 + image.width * 0.5 - pixelCrop.x,
-    0 - safeArea / 2 + image.height * 0.5 - pixelCrop.y,
-  );
+  ctx.putImageData(data, 0 - safeArea / 2 + image.width * 0.5 - pixelCrop.x, 0 - safeArea / 2 + image.height * 0.5 - pixelCrop.y);
 
   // As Base64 string
   // return canvas.toDataURL('image/jpeg');
 
   // As a blob
   return new Promise((resolve) => {
     canvas.toBlob((file) => {
-      resolve(URL.createObjectURL(file));
+      if (file) {
+        resolve(URL.createObjectURL(file));
+      }
     }, 'image/jpeg');
   });
 }
diff --git a/src/store/common/decorators/retry-on-network-connection-error.ts b/src/store/common/decorators/retry-on-network-connection-error.ts
@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import { SagaIterator } from 'redux-saga';
 import { call, race, take } from 'redux-saga/effects';
 
@@ -11,13 +12,15 @@ export function* retryOnNetworkConnectionError(handler: () => SagaIterator): Sag
     try {
       return yield call(handler);
     } catch (e) {
-      if (isNetworkError(e)) {
-        yield race({
-          websocketsConnected: take(WebsocketsConnected.action),
-          internetConnected: take(InternetConnected.action),
-        });
-      } else {
-        throw e;
+      if (e instanceof AxiosError) {
+        if (isNetworkError(e)) {
+          yield race({
+            websocketsConnected: take(WebsocketsConnected.action),
+            internetConnected: take(InternetConnected.action),
+          });
+        } else {
+          throw e;
+        }
       }
     }
   }

diff --git a/src/store/common/http/decorators/retry-on-network-connection-error.ts b/src/store/common/http/decorators/retry-on-network-connection-error.ts
@@ -1,3 +1,4 @@
+import { AxiosError } from 'axios';
 import { SagaIterator } from 'redux-saga';
 import { call, race, take } from 'redux-saga/effects';
 
@@ -10,13 +11,15 @@ export function* retryOnNetworkConnectionError(handler: () => SagaIterator): Sag
     try {
       return yield call(handler);
     } catch (e) {
-      if (isNetworkError(e)) {
-        yield race({
-          websocketsConnected: take(WebsocketsConnected.action),
-          internetConnected: take(InternetConnected.action),
-        });
-      } else {
-        throw e;
+      if (e instanceof AxiosError) {
+        if (isNetworkError(e)) {
+          yield race({
+            websocketsConnected: take(WebsocketsConnected.action),
+            internetConnected: take(InternetConnected.action),
+          });
+        } else {
+          throw e;
+        }
       }
     }
   }

diff --git a/src/store/login/features/send-sms-code/send-sms-code.ts b/src/store/login/features/send-sms-code/send-sms-code.ts
@@ -1,13 +1,13 @@
-import { AxiosResponse} from 'axios';
-import { ISendSmsCodeRequest} from 'kimbu-models';
+import { AxiosError, AxiosResponse } from 'axios';
+import { ISendSmsCodeRequest } from 'kimbu-models';
 import { SagaIterator } from 'redux-saga';
 import { call, put } from 'redux-saga/effects';
 
 import { MAIN_API } from '@common/paths';
 import { createDeferredAction } from '@store/common/actions';
 import { authRequestFactory } from '@store/common/http/auth-request-factory';
 import { HttpRequestMethod } from '@store/common/http/http-request-method';
-import {mapAxiosErrorToApplicationError} from "@utils/error-utils";
+import { mapAxiosErrorToApplicationError } from '@utils/error-utils';
 
 import { ISendSmsCodeActionPayload } from './action-payloads/send-sms-code-action-payload';
 import { SendSmsCodeFailure } from './send-sms-code-failure';
@@ -30,10 +30,7 @@ export class SendSmsCode {
   }
 
   static get saga() {
-    return function* sendSmsPhoneConfirmationCodeSaga(
-      action: ReturnType<typeof SendSmsCode.action>,
-    ): SagaIterator {
-
+    return function* sendSmsPhoneConfirmationCodeSaga(action: ReturnType<typeof SendSmsCode.action>): SagaIterator {
       try {
         SendSmsCode.httpRequest.call(
           yield call(() =>
@@ -46,19 +43,17 @@ export class SendSmsCode {
         yield put(SendSmsCodeSuccess.action());
 
         yield call(() => action.meta?.deferred?.resolve());
-      }
-      catch (e){
+      } catch (e) {
         yield put(SendSmsCodeFailure.action());
-        const applicationError = mapAxiosErrorToApplicationError(e)
-        yield call(() => action.meta?.deferred?.reject(applicationError));
+        if (e instanceof AxiosError) {
+          const applicationError = mapAxiosErrorToApplicationError(e);
+          yield call(() => action.meta?.deferred?.reject(applicationError));
+        }
       }
     };
   }
 
   static get httpRequest() {
-    return authRequestFactory<AxiosResponse<string>, ISendSmsCodeRequest>(
-      MAIN_API.SEND_SMS_CODE,
-      HttpRequestMethod.Post,
-    );
+    return authRequestFactory<AxiosResponse<string>, ISendSmsCodeRequest>(MAIN_API.SEND_SMS_CODE, HttpRequestMethod.Post);
   }
 }