Merge branch 'tim/errors' into 'master'

fix: export missing Conflict error type See merge request TankerHQ/sdk-react-native!114
TankerHQ · Jul 30, 2024 · 1605cce · 1605cce
2 parents 51da319 + 3448819
commit 1605cce
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/src/errors.ts b/src/errors.ts
@@ -1,25 +1,26 @@
 import {
-  InvalidArgument,
-  InternalError,
-  NetworkError,
-  PreconditionFailed,
-  OperationCanceled,
+  Conflict,
   DecryptionFailed,
+  ExpiredVerification,
   GroupTooBig,
+  InternalError,
+  InvalidArgument,
   InvalidVerification,
+  NetworkError,
+  OperationCanceled,
+  PreconditionFailed,
+  TankerError,
   TooManyAttempts,
-  ExpiredVerification,
-  Conflict,
   UpgradeRequired,
   IdentityAlreadyAttached,
-  TankerError,
 } from '@tanker/errors';
 
 export type Err = { err: Object };
 export type Ok<T> = { ok: T };
 export type Result<T> = Ok<T> | Err;
 
 export const errors = {
+  Conflict,
   DecryptionFailed,
   ExpiredVerification,
   GroupTooBig,