Merge pull request #2760 from bc-nick/PAYPAL-4995

feat(payment): PAYPAL-4995 Unable to Change Payment Methods With Braintree if Stored Payments are Used
bigcommerce · Jan 13, 2025 · d30953b · d30953b
2 parents e050766 + 1e16475
commit d30953b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/core/src/payment/strategies/braintree/braintree-hosted-form.spec.ts b/packages/core/src/payment/strategies/braintree/braintree-hosted-form.spec.ts
@@ -206,6 +206,16 @@ describe('BraintreeHostedForm', () => {
 
             expect(cardFields.teardown).toHaveBeenCalled();
         });
+
+        it('do not call teardown if fields are not initialized', async () => {
+            await subject.initialize({
+                ...formOptions,
+                fields: {},
+            });
+            await subject.deinitialize();
+
+            expect(cardFields.teardown).not.toHaveBeenCalled();
+        });
     });
 
     describe('#tokenize', () => {

diff --git a/packages/core/src/payment/strategies/braintree/braintree-hosted-form.ts b/packages/core/src/payment/strategies/braintree/braintree-hosted-form.ts
@@ -75,9 +75,11 @@ export default class BraintreeHostedForm {
     }
 
     async deinitialize(): Promise<void> {
-        this._isInitializedHostedForm = false;
+        if (this._isInitializedHostedForm) {
+            this._isInitializedHostedForm = false;
 
-        await this._cardFields?.teardown();
+            await this._cardFields?.teardown();
+        }
     }
 
     validate() {