Merge branch 'develop' into merge/upe-non-upe-tests

Automattic · Jan 3, 2024 · 678059d · 678059d
2 parents 4d9bbb6 + b59d3d2
commit 678059d
Show file tree

Hide file tree

Showing 14 changed files with 1,152 additions and 987 deletions.
diff --git a/changelog/add-prb-load-tracks b/changelog/add-prb-load-tracks
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Track payment-request-button loads
diff --git a/changelog/fix-7958-transaction-details-dispute-details-broken-ui b/changelog/fix-7958-transaction-details-dispute-details-broken-ui
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Not user-facing: fixes styling bug introduced in develop branch
+
+
diff --git a/changelog/fix-trim-woopay-source-url b/changelog/fix-trim-woopay-source-url
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Checkout error when page URL is too long
diff --git a/client/checkout/woopay/email-input-iframe.js b/client/checkout/woopay/email-input-iframe.js
@@ -263,7 +263,10 @@ export const handleWooPayEmailInput = async (
 		);
 		urlParams.append( 'wcpayVersion', getConfig( 'wcpayVersionNumber' ) );
 		urlParams.append( 'is_blocks', isBlocksCheckout ? 'true' : 'false' );
-		urlParams.append( 'source_url', window.location.href );
+		urlParams.append(
+			'source_url',
+			wcSettings?.storePages?.checkout?.permalink
+		);
 		urlParams.append(
 			'viewport',
 			`${ viewportWidth }x${ viewportHeight }`

diff --git a/client/components/woopay/save-user/checkout-page-save-user.js b/client/components/woopay/save-user/checkout-page-save-user.js
@@ -73,7 +73,8 @@ const CheckoutPageSaveUser = ( { isBlocksCheckout } ) => {
 				? {}
 				: {
 						save_user_in_woopay: isSaveDetailsChecked,
-						woopay_source_url: window.location.href,
+						woopay_source_url:
+							wcSettings?.storePages?.checkout?.permalink,
 						woopay_is_blocks: true,
 						woopay_viewport: `${ viewportWidth }x${ viewportHeight }`,
 						woopay_user_phone_field: {
@@ -291,7 +292,9 @@ const CheckoutPageSaveUser = ( { isBlocksCheckout } ) => {
 						<input
 							type="hidden"
 							name="woopay_source_url"
-							value={ window.location.href }
+							value={
+								wcSettings?.storePages?.checkout?.permalink
+							}
 						/>
 						<input
 							type="hidden"

diff --git a/client/payment-details/order-details/test/__snapshots__/index.test.tsx.snap b/client/payment-details/order-details/test/__snapshots__/index.test.tsx.snap
@@ -20,55 +20,61 @@ exports[`Order details page should match the snapshot - Charge without payment i
           data-wp-component="CardBody"
         >
           <div
-            class="payment-details-summary"
+            class="components-flex css-175m5nr-View-Flex-sx-Base-sx-Items-ItemsRow em57xhy0"
+            data-wp-c16t="true"
+            data-wp-component="Flex"
           >
             <div
-              class="payment-details-summary__section"
+              class="payment-details-summary"
             >
-              <p
-                class="payment-details-summary__amount"
-              >
-                $15.00
-                <span
-                  class="payment-details-summary__amount-currency"
-                >
-                  USD
-                </span>
-                <span
-                  class="chip chip-light"
-                >
-                  Pending
-                </span>
-              </p>
               <div
-                class="payment-details-summary__breakdown"
+                class="payment-details-summary__section"
               >
-                
-                <p>
-                  Fees: 
-                  -$0.00
-                </p>
-                
-                <p>
-                  Net: 
+                <p
+                  class="payment-details-summary__amount"
+                >
                   $15.00
+                  <span
+                    class="payment-details-summary__amount-currency"
+                  >
+                    USD
+                  </span>
+                  <span
+                    class="chip chip-light"
+                  >
+                    Pending
+                  </span>
                 </p>
+                <div
+                  class="payment-details-summary__breakdown"
+                >
+                  
+                  <p>
+                    Fees: 
+                    -$0.00
+                  </p>
+                  
+                  <p>
+                    Net: 
+                    $15.00
+                  </p>
+                </div>
               </div>
-            </div>
-            <div
-              class="payment-details-summary__section"
-            >
               <div
-                class="payment-details-summary__id"
+                class="payment-details-summary__section"
               >
-                Payment ID: 
-                776
+                <div
+                  class="payment-details-summary__id"
+                >
+                  Payment ID: 
+                  776
+                </div>
               </div>
             </div>
+            <div
+              class="payment-details__refund-controls"
+            />
           </div>
-          <div
-            class="payment-details__refund-controls"
-          />
         </div>
         <hr
           aria-orientation="horizontal"