Merge branch 'main' into feat/6.0.0

# Conflicts: # package.json # packages/identity/package-lock.json # packages/identity/package.json # packages/payment/package-lock.json # packages/payment/package.json # packages/terminal/package-lock.json # packages/terminal/package.json
capacitor-community · Mar 27, 2024 · 13b97d4 · 13b97d4
2 parents 193b5db + 74166e9
commit 13b97d4
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 194 deletions.
diff --git a/demo/angular/android/app/src/main/AndroidManifest.xml b/demo/angular/android/app/src/main/AndroidManifest.xml
@@ -64,6 +64,10 @@
           android:name="com.getcapacitor.community.stripe.google_pay_is_testing"
           android:value="@bool/google_pay_is_testing"/>
 
+        <meta-data
+          android:name="com.getcapacitor.community.stripe.google_pay_existing_payment_method_required"
+          android:value="@bool/google_pay_existing_payment_method_required"/>
+
 <!--      <meta-data-->
 <!--        android:name="com.getcapacitor.community.stripe.stripe_account"-->
 <!--        android:value="@string/stripe_account"/>-->

diff --git a/demo/angular/android/app/src/main/res/values/strings.xml b/demo/angular/android/app/src/main/res/values/strings.xml
@@ -10,5 +10,6 @@
     <string name="country_code">US</string>
     <string name="merchant_display_name">Widget Store</string>
     <bool name="google_pay_is_testing">true</bool>
+    <bool name="google_pay_existing_payment_method_required">false</bool>
   <!--    <string name="stripe_account"></string>-->
 </resources>
diff --git a/demo/react/android/app/src/main/AndroidManifest.xml b/demo/react/android/app/src/main/AndroidManifest.xml
@@ -58,6 +58,10 @@
           android:name="com.getcapacitor.community.stripe.google_pay_is_testing"
           android:value="@bool/google_pay_is_testing"/>
 
+        <meta-data
+            android:name="com.getcapacitor.community.stripe.google_pay_existing_payment_method_required"
+            android:value="@bool/google_pay_existing_payment_method_required"/>
+
 <!--      <meta-data-->
 <!--        android:name="com.getcapacitor.community.stripe.stripe_account"-->
 <!--        android:value="@string/stripe_account"/>-->

diff --git a/demo/react/android/app/src/main/res/values/strings.xml b/demo/react/android/app/src/main/res/values/strings.xml
@@ -10,5 +10,6 @@
     <string name="country_code">US</string>
     <string name="merchant_display_name">Widget Store</string>
     <bool name="google_pay_is_testing">true</bool>
+    <bool name="google_pay_existing_payment_method_required">false</bool>
   <!--    <string name="stripe_account"></string>-->
 </resources>