fix: fix: merge issues (#786)

push-protocol · Oct 16, 2023 · 2462993 · 2462993
1 parent 4acbe2a
commit 2462993
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/packages/restapi/src/lib/pushapi/PushAPI.ts b/packages/restapi/src/lib/pushapi/PushAPI.ts
@@ -73,10 +73,7 @@ export class PushAPI {
 
   static async initialize(
     signer: SignerType,
-    options?: PushAPIInitializeProps,
-    version?: typeof Constants.ENC_TYPE_V1 | typeof Constants.ENC_TYPE_V3,
-    versionMeta?: { NFTPGP_V1?: { password: string } },
-    autoUpgrade?: boolean
+    options?: PushAPIInitializeProps
   ): Promise<PushAPI> {
     try {
       // Default options
@@ -97,10 +94,12 @@ export class PushAPI {
       const settings = {
         ...defaultOptions,
         ...options,
-        version: version || defaultOptions.version,
-        versionMeta: versionMeta || defaultOptions.versionMeta,
+        version: options?.version || defaultOptions.version,
+        versionMeta: options?.versionMeta || defaultOptions.versionMeta,
         autoUpgrade:
-          autoUpgrade !== undefined ? autoUpgrade : defaultOptions.autoUpgrade,
+          options?.autoUpgrade !== undefined
+            ? options?.autoUpgrade
+            : defaultOptions.autoUpgrade,
         streamOptions: {
           ...defaultOptions.streamOptions,
           ...(options?.streamOptions ?? {}),