test

stripe · Nov 3, 2023 · f195873 · f195873
1 parent 73f6a9b
commit f195873
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 39 deletions.
diff --git a/src/shared.ts b/src/shared.ts
@@ -14,18 +14,7 @@ export const componentNameMapping: Record<
   ConnectElementTagName,
   ConnectElementHTMLName
 > = {
-<<<<<<< HEAD
   "account-onboarding": "stripe-connect-account-onboarding"
-=======
-  payments: "stripe-connect-payments",
-  payouts: "stripe-connect-payouts",
-  "payment-details": "stripe-connect-payment-details",
-  "account-onboarding": "stripe-connect-account-onboarding",
-  "payment-method-settings": "stripe-connect-payment-method-settings",
-  "account-management": "stripe-connect-account-management",
-  "notification-banner": "stripe-connect-notification-banner",
-  "instant-payouts": "stripe-connect-instant-payouts"
->>>>>>> aa7bc71 (Remove additional null typing and additional exports from package (#65))
 };
 
 type StripeConnectInstanceExtended = StripeConnectInstance & {
@@ -123,11 +112,7 @@ export const initStripeConnect = (
   initParams: IStripeConnectInitParams
 ): StripeConnectInstanceExtended => {
   const stripeConnectInstance = stripePromise.then(wrapper =>
-<<<<<<< HEAD
-    wrapper?.initialize(initParams)
-=======
     wrapper.initialize(initParams)
->>>>>>> aa7bc71 (Remove additional null typing and additional exports from package (#65))
   );
 
   return {
@@ -145,23 +130,15 @@ export const initStripeConnect = (
     },
     update: updateOptions => {
       stripeConnectInstance.then(instance => {
-<<<<<<< HEAD
-        instance?.update(updateOptions);
-=======
         instance.update(updateOptions);
->>>>>>> aa7bc71 (Remove additional null typing and additional exports from package (#65))
       });
     },
     debugInstance: () => {
       return stripeConnectInstance;
     },
     logout: () => {
       return stripeConnectInstance.then(instance => {
-<<<<<<< HEAD
-        instance?.logout();
-=======
         instance.logout();
->>>>>>> aa7bc71 (Remove additional null typing and additional exports from package (#65))
       });
     }
   };

diff --git a/types/shared.d.ts b/types/shared.d.ts
@@ -378,20 +378,4 @@ export interface StripeConnectInstance {
 /**
  * Tagnames to be used with the `create` method of the Connect instance.
  */
-<<<<<<< HEAD
 export type ConnectElementTagName = "account-onboarding";
-
-export declare const findScript: () => HTMLScriptElement | null;
-
-export declare const loadScript: () => Promise<any | null>;
-=======
-export type ConnectElementTagName =
-  | "payments"
-  | "payouts"
-  | "payment-details"
-  | "account-onboarding"
-  | "payment-method-settings"
-  | "account-management"
-  | "notification-banner"
-  | "instant-payouts";
->>>>>>> aa7bc71 (Remove additional null typing and additional exports from package (#65))