From f2d91c9f611b0610d420058c526b9bb3738aea64 Mon Sep 17 00:00:00 2001
From: Gage <gage@beargroup.com>
Date: Thu, 10 Mar 2022 01:03:21 +0000
Subject: [PATCH 01/23] APF-320 - Initial GraphQl additions, POST
 methods/mutations

---
 Model/Resolver/CompleteCheckoutSession.php | 61 ++++++++++++++++++++
 Model/Resolver/SetCustomerLink.php         | 54 +++++++++++++++++
 Model/Resolver/UpdateCheckoutSession.php   | 67 ++++++++++++++++++++++
 etc/schema.graphqls                        | 31 ++++++++++
 4 files changed, 213 insertions(+)
 create mode 100644 Model/Resolver/CompleteCheckoutSession.php
 create mode 100644 Model/Resolver/SetCustomerLink.php
 create mode 100644 Model/Resolver/UpdateCheckoutSession.php
 create mode 100644 etc/schema.graphqls

diff --git a/Model/Resolver/CompleteCheckoutSession.php b/Model/Resolver/CompleteCheckoutSession.php
new file mode 100644
index 00000000..94cef2bf
--- /dev/null
+++ b/Model/Resolver/CompleteCheckoutSession.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace Amazon\Pay\Model\Resolver;
+
+use Amazon\Pay\Model\CheckoutSessionManagement;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class CompleteCheckoutSession implements ResolverInterface
+{
+
+    /**
+     * @var CheckoutSessionManagement
+     */
+    private $checkoutSessionManagementModel;
+
+    /**
+     * @param CheckoutSessionManagement $checkoutSessionManagementModel
+     */
+    public function __construct(
+        CheckoutSessionManagement $checkoutSessionManagementModel
+    ){
+        $this->checkoutSessionManagementModel = $checkoutSessionManagementModel;
+    }
+
+    /**
+     * @param Field $field
+     * @param $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array|false[]|int|Value|mixed
+     * @throws GraphQlInputException
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $cartId = $args['cartId'] ?? false;
+        $checkoutSessionId = $args['checkoutSessionId'] ?? false;
+
+        if (!$cartId) {
+            throw new GraphQlInputException(__('Required parameter "cartId" is missing'));
+        }
+
+        if (!$checkoutSessionId) {
+            throw new GraphQlInputException(__('Required parameter "checkoutSessionId" is missing'));
+        }
+
+        try {
+            return $this->checkoutSessionManagementModel->completeCheckoutSession($checkoutSessionId, $cartId);
+        } catch (\Exception $e) {
+            return [
+                'message' => $e->getMessage(),
+                'success' => false
+            ];
+        }
+    }
+}
diff --git a/Model/Resolver/SetCustomerLink.php b/Model/Resolver/SetCustomerLink.php
new file mode 100644
index 00000000..3b26fdb7
--- /dev/null
+++ b/Model/Resolver/SetCustomerLink.php
@@ -0,0 +1,54 @@
+<?php
+
+namespace Amazon\Pay\Model\Resolver;
+
+use Amazon\Pay\Model\CheckoutSessionManagement;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class SetCustomerLink implements ResolverInterface
+{
+
+    /**
+     * @var CheckoutSessionManagement
+     */
+    private $checkoutSessionManagementModel;
+
+    /**
+     * @param CheckoutSessionManagement $checkoutSessionManagementModel
+     */
+    public function __construct(
+        CheckoutSessionManagement $checkoutSessionManagementModel
+    ){
+        $this->checkoutSessionManagementModel = $checkoutSessionManagementModel;
+    }
+
+    /**
+     * @param Field $field
+     * @param $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array[]|Value|mixed
+     * @throws GraphQlInputException
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $buyerToken = $args['buyerToken'] ?? false;
+        $password = $args['password'] ?? false;
+
+        if (!$buyerToken) {
+            throw new GraphQlInputException(__('Required parameter "buyerToken" is missing'));
+        }
+
+        if (!$password) {
+            throw new GraphQlInputException(__('Required parameter "password" is missing'));
+        }
+
+        return array_merge(...$this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password));
+
+    }
+}
diff --git a/Model/Resolver/UpdateCheckoutSession.php b/Model/Resolver/UpdateCheckoutSession.php
new file mode 100644
index 00000000..5d0100f9
--- /dev/null
+++ b/Model/Resolver/UpdateCheckoutSession.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Amazon\Pay\Model\Resolver;
+
+use Amazon\Pay\Model\CheckoutSessionManagement;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class UpdateCheckoutSession implements ResolverInterface
+{
+
+    /**
+     * @var CheckoutSessionManagement
+     */
+    private $checkoutSessionManagementModel;
+
+    /**
+     * @param CheckoutSessionManagement $checkoutSessionManagementModel
+     */
+    public function __construct(
+        CheckoutSessionManagement $checkoutSessionManagementModel
+    ){
+        $this->checkoutSessionManagementModel = $checkoutSessionManagementModel;
+    }
+
+    /**
+     * @param Field $field
+     * @param $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array|false[]|int
+     * @throws GraphQlInputException
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $cartId = $args['cartId'] ?? false;
+        $checkoutSessionId = $args['checkoutSessionId'] ?? false;
+
+        if (!$cartId) {
+            throw new GraphQlInputException(__('Required parameter "cartId" is missing'));
+        }
+
+        if (!$checkoutSessionId) {
+            throw new GraphQlInputException(__('Required parameter "checkoutSessionId" is missing'));
+        }
+
+        $updateResponse = $this->checkoutSessionManagementModel->updateCheckoutSession($checkoutSessionId, $cartId);
+
+        $redirectUrl = $updateResponse['webCheckoutDetails']['amazonPayRedirectUrl'] ?? false;
+        if ($redirectUrl) {
+            return [
+                'redirectUrl' => $redirectUrl
+            ];
+        }
+
+        // N/A would likely only be coalesced to if config isn't set. After running through some test cases will
+        // update fallback messaging to be a bit more specific
+        return [
+            'redirectUrl' => $updateResponse['status'] ?? 'N/A'
+        ];
+    }
+}
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
new file mode 100644
index 00000000..eeb3c5b1
--- /dev/null
+++ b/etc/schema.graphqls
@@ -0,0 +1,31 @@
+type Query {
+}
+
+type Mutation {
+    setCustomerLink(buyerToken: String!, password: String!): SetCustomerLinkOutput
+    @doc(description:"Set Customer Link")
+    @resolver(class: "Amazon\\Pay\\Model\\Resolver\\SetCustomerLink")
+
+    completeCheckoutSession(cartId: String!, checkoutSessionId: String!): CompleteCheckoutSessionOutput
+    @doc(description: "Complete Checkout Session")
+    @resolver(class: "Amazon\\Pay\\Model\\Resolver\\CompleteCheckoutSession")
+
+    updateCheckoutSession(cartId: String!, checkoutSessionId: String!): UpdateCheckoutSessionOutput
+    @doc(description: "Update Checkout Session")
+    @resolver(class: "Amazon\\Pay\\Model\\Resolver\\UpdateCheckoutSession")
+
+}
+
+type SetCustomerLinkOutput {
+    success: Boolean
+    message: String
+}
+
+type CompleteCheckoutSessionOutput {
+    success: Boolean
+    message: String
+}
+
+type UpdateCheckoutSessionOutput {
+    redirectUrl: String
+}

From fd548f0b26486d9c76644bd4d39bee41a8b53629 Mon Sep 17 00:00:00 2001
From: Gage <gage@beargroup.com>
Date: Thu, 10 Mar 2022 23:39:38 +0000
Subject: [PATCH 02/23] APF-320 - Finished initial checkout session api
 endpoint additions for graphql

---
 Model/Resolver/CheckoutSessionConfig.php  | 41 ++++++++++
 Model/Resolver/CheckoutSessionDetails.php | 91 +++++++++++++++++++++++
 Model/Resolver/CheckoutSessionSignIn.php  | 51 +++++++++++++
 etc/schema.graphqls                       | 20 +++++
 4 files changed, 203 insertions(+)
 create mode 100644 Model/Resolver/CheckoutSessionConfig.php
 create mode 100644 Model/Resolver/CheckoutSessionDetails.php
 create mode 100644 Model/Resolver/CheckoutSessionSignIn.php

diff --git a/Model/Resolver/CheckoutSessionConfig.php b/Model/Resolver/CheckoutSessionConfig.php
new file mode 100644
index 00000000..2a643930
--- /dev/null
+++ b/Model/Resolver/CheckoutSessionConfig.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Amazon\Pay\Model\Resolver;
+
+use Amazon\Pay\Model\CheckoutSessionManagement;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class CheckoutSessionConfig implements ResolverInterface
+{
+
+    /**
+     * @var CheckoutSessionManagement
+     */
+    private $checkoutSessionManagement;
+
+    public function __construct(
+        CheckoutSessionManagement $checkoutSessionManagement
+    ){
+        $this->checkoutSessionManagement = $checkoutSessionManagement;
+    }
+
+    /**
+     * @param Field $field
+     * @param $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array|Value|mixed
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $cartId = $args['cartId'] ?? null;
+        return  [
+            'config' => ($this->checkoutSessionManagement->getConfig($cartId)[0] ?? [])
+        ];
+    }
+}
diff --git a/Model/Resolver/CheckoutSessionDetails.php b/Model/Resolver/CheckoutSessionDetails.php
new file mode 100644
index 00000000..275d02b3
--- /dev/null
+++ b/Model/Resolver/CheckoutSessionDetails.php
@@ -0,0 +1,91 @@
+<?php
+
+namespace Amazon\Pay\Model\Resolver;
+
+use Amazon\Pay\Model\CheckoutSessionManagement;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class CheckoutSessionDetails implements ResolverInterface
+{
+
+    const QUERY_TYPES = ['billing', 'payment', 'shipping'];
+
+    /**
+     * @var CheckoutSessionManagement
+     */
+    private $checkoutSessionManagement;
+
+    /**
+     * @param CheckoutSessionManagement $checkoutSessionManagement
+     */
+    public function __construct(
+        CheckoutSessionManagement $checkoutSessionManagement
+    ){
+        $this->checkoutSessionManagement = $checkoutSessionManagement;
+    }
+
+    /**
+     * @param Field $field
+     * @param $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array
+     * @throws GraphQlInputException
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $amazonSessionId = $args['amazonSessionId'] ?? false;
+        $queryTypes = $args['queryTypes'] ?? false;
+
+        if (!$amazonSessionId) {
+            throw new GraphQlInputException(__('Required parameter "amazonSessionId" is missing'));
+        }
+
+        if (!$queryTypes) {
+            throw new GraphQlInputException(__('Required parameter "queryTypes" is missing'));
+        }
+
+        $response = [];
+        foreach ($queryTypes as $queryType) {
+            $response[$queryType] = $this->getQueryTypesData($amazonSessionId, $queryType) ?: 'Query type: ' .
+                $queryType . 'is not a supported type. ';
+        }
+
+        return [
+            'response' => json_encode($response)
+        ];
+    }
+
+
+    /**
+     * @param $amazonSessionId
+     * @param $queryType
+     * @return void
+     */
+    private function getQueryTypesData($amazonSessionId, $queryType)
+    {
+        $result = false;
+        if (in_array($queryType, self::QUERY_TYPES, true)) {
+            switch ($queryType) {
+                case 'billing':
+                    $result = $this->checkoutSessionManagement->getBillingAddress($amazonSessionId);
+                    break;
+                case 'payment':
+                    $result = $this->checkoutSessionManagement->getPaymentDescriptor($amazonSessionId);
+                    break;
+                case 'shipping':
+                    $result = $this->checkoutSessionManagement->getShippingAddress($amazonSessionId);
+            }
+        }
+
+        return $result;
+    }
+
+
+}
diff --git a/Model/Resolver/CheckoutSessionSignIn.php b/Model/Resolver/CheckoutSessionSignIn.php
new file mode 100644
index 00000000..ef1ba637
--- /dev/null
+++ b/Model/Resolver/CheckoutSessionSignIn.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Amazon\Pay\Model\Resolver;
+
+use Amazon\Pay\Model\CheckoutSessionManagement;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
+use Magento\Framework\GraphQl\Query\Resolver\Value;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+class CheckoutSessionSignIn implements ResolverInterface
+{
+
+    /**
+     * @var CheckoutSessionManagement
+     */
+    private $checkoutSessionManagement;
+
+    /**
+     * @param CheckoutSessionManagement $checkoutSessionManagement
+     */
+    public function __construct(
+        CheckoutSessionManagement $checkoutSessionManagement
+    ){
+        $this->checkoutSessionManagement = $checkoutSessionManagement;
+    }
+
+    /**
+     * @param Field $field
+     * @param $context
+     * @param ResolveInfo $info
+     * @param array|null $value
+     * @param array|null $args
+     * @return array[]
+     * @throws GraphQlInputException
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $buyerToken = $args['buyerToken'] ?? false;
+
+        if (!$buyerToken) {
+            throw new GraphQlInputException(__('Required parameter "buyerToken" is missing'));
+        }
+
+        return [
+            'response' => $this->checkoutSessionManagement->signIn($buyerToken)[0] ?? []
+        ];
+    }
+}
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index eeb3c5b1..07c094db 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -1,4 +1,12 @@
 type Query {
+    checkoutSessionConfig(cartId: String!): CheckoutSessionConfigOutput
+    @resolver(class:"Amazon\\Pay\\Model\\Resolver\\CheckoutSessionConfig")
+
+    checkoutSessionDetails(amazonSessionId: String!, queryTypes: [String!]): CheckoutSessionDetailsOutput
+    @resolver(class:"Amazon\\Pay\\Model\\Resolver\\CheckoutSessionDetails")
+
+    checkoutSessionSignIn(buyerToken: String!): CheckoutSessionSignInOutput
+    @resolver(class:"Amazon\\Pay\\Model\\Resolver\\CheckoutSessionSignIn")
 }
 
 type Mutation {
@@ -16,6 +24,18 @@ type Mutation {
 
 }
 
+type CheckoutSessionDetailsOutput {
+    response: String!
+}
+
+type CheckoutSessionConfigOutput {
+    config: [String!]
+}
+
+type CheckoutSessionSignInOutput {
+    response: [String!]
+}
+
 type SetCustomerLinkOutput {
     success: Boolean
     message: String

From 97fdcd06049e3bfe45ce6bf762b47b3566388e98 Mon Sep 17 00:00:00 2001
From: Gage <gage@beargroup.com>
Date: Fri, 11 Mar 2022 00:16:31 +0000
Subject: [PATCH 03/23] APF-320 - Changed config query to list each potential
 value returned so that they can be cherry picked instead of returning all by
 default

---
 Model/Resolver/CheckoutSessionConfig.php |  5 ++---
 etc/schema.graphqls                      | 11 ++++++++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Model/Resolver/CheckoutSessionConfig.php b/Model/Resolver/CheckoutSessionConfig.php
index 2a643930..f4b321f8 100644
--- a/Model/Resolver/CheckoutSessionConfig.php
+++ b/Model/Resolver/CheckoutSessionConfig.php
@@ -34,8 +34,7 @@ public function __construct(
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
         $cartId = $args['cartId'] ?? null;
-        return  [
-            'config' => ($this->checkoutSessionManagement->getConfig($cartId)[0] ?? [])
-        ];
+
+        return $this->checkoutSessionManagement->getConfig($cartId)[0] ?? [];
     }
 }
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index 07c094db..1e1a4e08 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -29,7 +29,16 @@ type CheckoutSessionDetailsOutput {
 }
 
 type CheckoutSessionConfigOutput {
-    config: [String!]
+    merchant_id: String
+    currency: String
+    button_color: String
+    language: String
+    sandbox: Boolean
+    login_payload: String
+    login_signature: String
+    checkout_payload: String
+    checkout_signature: String
+    public_key_id: String
 }
 
 type CheckoutSessionSignInOutput {

From 7159f6fb11eb280e0ae3bc677a04a761c24a7f65 Mon Sep 17 00:00:00 2001
From: Gage <gage@beargroup.com>
Date: Fri, 11 Mar 2022 23:17:36 +0000
Subject: [PATCH 04/23] APF-320 - Brought a couple responses back in line with
 the current endpoints responses

---
 Model/Resolver/CheckoutSessionConfig.php  |  7 ++++++-
 Model/Resolver/CheckoutSessionDetails.php |  3 +--
 etc/schema.graphqls                       | 11 +----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Model/Resolver/CheckoutSessionConfig.php b/Model/Resolver/CheckoutSessionConfig.php
index f4b321f8..031868fe 100644
--- a/Model/Resolver/CheckoutSessionConfig.php
+++ b/Model/Resolver/CheckoutSessionConfig.php
@@ -17,6 +17,9 @@ class CheckoutSessionConfig implements ResolverInterface
      */
     private $checkoutSessionManagement;
 
+    /**
+     * @param CheckoutSessionManagement $checkoutSessionManagement
+     */
     public function __construct(
         CheckoutSessionManagement $checkoutSessionManagement
     ){
@@ -35,6 +38,8 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
     {
         $cartId = $args['cartId'] ?? null;
 
-        return $this->checkoutSessionManagement->getConfig($cartId)[0] ?? [];
+        return  [
+            'config' => ($this->checkoutSessionManagement->getConfig($cartId)[0] ?? [])
+        ];
     }
 }
diff --git a/Model/Resolver/CheckoutSessionDetails.php b/Model/Resolver/CheckoutSessionDetails.php
index 275d02b3..a1d79ee9 100644
--- a/Model/Resolver/CheckoutSessionDetails.php
+++ b/Model/Resolver/CheckoutSessionDetails.php
@@ -53,8 +53,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         $response = [];
         foreach ($queryTypes as $queryType) {
-            $response[$queryType] = $this->getQueryTypesData($amazonSessionId, $queryType) ?: 'Query type: ' .
-                $queryType . 'is not a supported type. ';
+            $response[$queryType] = $this->getQueryTypesData($amazonSessionId, $queryType) ?:  [];
         }
 
         return [
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index 1e1a4e08..2e963e18 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -29,16 +29,7 @@ type CheckoutSessionDetailsOutput {
 }
 
 type CheckoutSessionConfigOutput {
-    merchant_id: String
-    currency: String
-    button_color: String
-    language: String
-    sandbox: Boolean
-    login_payload: String
-    login_signature: String
-    checkout_payload: String
-    checkout_signature: String
-    public_key_id: String
+    config: [String]
 }
 
 type CheckoutSessionSignInOutput {

From 17912c2ab7649bffc86363333e76d457ccbbe7ec Mon Sep 17 00:00:00 2001
From: Gage <gage@beargroup.com>
Date: Mon, 14 Mar 2022 22:59:52 +0000
Subject: [PATCH 05/23] APF-320 - Updated to mutation and definition for
 updateCheckoutSession to more closely resemble rest api. Added fix for
 completeCheckoutSession response

---
 Model/Resolver/CompleteCheckoutSession.php |  2 +-
 Model/Resolver/UpdateCheckoutSession.php   | 17 ++++-------------
 etc/schema.graphqls                        |  4 ++--
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/Model/Resolver/CompleteCheckoutSession.php b/Model/Resolver/CompleteCheckoutSession.php
index 94cef2bf..63592e57 100644
--- a/Model/Resolver/CompleteCheckoutSession.php
+++ b/Model/Resolver/CompleteCheckoutSession.php
@@ -39,7 +39,7 @@ public function __construct(
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
         $cartId = $args['cartId'] ?? false;
-        $checkoutSessionId = $args['checkoutSessionId'] ?? false;
+        $checkoutSessionId = $args['amazonSessionId'] ?? false;
 
         if (!$cartId) {
             throw new GraphQlInputException(__('Required parameter "cartId" is missing'));
diff --git a/Model/Resolver/UpdateCheckoutSession.php b/Model/Resolver/UpdateCheckoutSession.php
index 5d0100f9..4021b352 100644
--- a/Model/Resolver/UpdateCheckoutSession.php
+++ b/Model/Resolver/UpdateCheckoutSession.php
@@ -39,7 +39,7 @@ public function __construct(
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
         $cartId = $args['cartId'] ?? false;
-        $checkoutSessionId = $args['checkoutSessionId'] ?? false;
+        $checkoutSessionId = $args['amazonSessionId'] ?? false;
 
         if (!$cartId) {
             throw new GraphQlInputException(__('Required parameter "cartId" is missing'));
@@ -49,19 +49,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "checkoutSessionId" is missing'));
         }
 
-        $updateResponse = $this->checkoutSessionManagementModel->updateCheckoutSession($checkoutSessionId, $cartId);
-
-        $redirectUrl = $updateResponse['webCheckoutDetails']['amazonPayRedirectUrl'] ?? false;
-        if ($redirectUrl) {
-            return [
-                'redirectUrl' => $redirectUrl
-            ];
-        }
-
-        // N/A would likely only be coalesced to if config isn't set. After running through some test cases will
-        // update fallback messaging to be a bit more specific
         return [
-            'redirectUrl' => $updateResponse['status'] ?? 'N/A'
+            'redirectUrl' => $this->checkoutSessionManagementModel->updateCheckoutSession($checkoutSessionId,
+                    $cartId) ?? 'N/A'
         ];
     }
+
 }
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index 2e963e18..f558a622 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -14,11 +14,11 @@ type Mutation {
     @doc(description:"Set Customer Link")
     @resolver(class: "Amazon\\Pay\\Model\\Resolver\\SetCustomerLink")
 
-    completeCheckoutSession(cartId: String!, checkoutSessionId: String!): CompleteCheckoutSessionOutput
+    completeCheckoutSession(cartId: String!, amazonSessionId: String!): CompleteCheckoutSessionOutput
     @doc(description: "Complete Checkout Session")
     @resolver(class: "Amazon\\Pay\\Model\\Resolver\\CompleteCheckoutSession")
 
-    updateCheckoutSession(cartId: String!, checkoutSessionId: String!): UpdateCheckoutSessionOutput
+    updateCheckoutSession(cartId: String!, amazonSessionId: String!): UpdateCheckoutSessionOutput
     @doc(description: "Update Checkout Session")
     @resolver(class: "Amazon\\Pay\\Model\\Resolver\\UpdateCheckoutSession")
 

From 495804c853eaee5bd912ef2a4c03b2ef73164c09 Mon Sep 17 00:00:00 2001
From: Gage <gage@beargroup.com>
Date: Tue, 15 Mar 2022 19:38:12 +0000
Subject: [PATCH 06/23] APF-320 - Updated config response to match new kay
 value pair response of original endpoint

---
 Model/Resolver/CheckoutSessionConfig.php | 2 +-
 etc/schema.graphqls                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Model/Resolver/CheckoutSessionConfig.php b/Model/Resolver/CheckoutSessionConfig.php
index 031868fe..7781d7f5 100644
--- a/Model/Resolver/CheckoutSessionConfig.php
+++ b/Model/Resolver/CheckoutSessionConfig.php
@@ -39,7 +39,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cartId = $args['cartId'] ?? null;
 
         return  [
-            'config' => ($this->checkoutSessionManagement->getConfig($cartId)[0] ?? [])
+            'config' => json_encode(($this->checkoutSessionManagement->getConfig($cartId) ?? []))
         ];
     }
 }
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index f558a622..c3f404ed 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -1,5 +1,5 @@
 type Query {
-    checkoutSessionConfig(cartId: String!): CheckoutSessionConfigOutput
+    checkoutSessionConfig(cartId: String): CheckoutSessionConfigOutput
     @resolver(class:"Amazon\\Pay\\Model\\Resolver\\CheckoutSessionConfig")
 
     checkoutSessionDetails(amazonSessionId: String!, queryTypes: [String!]): CheckoutSessionDetailsOutput
@@ -29,7 +29,7 @@ type CheckoutSessionDetailsOutput {
 }
 
 type CheckoutSessionConfigOutput {
-    config: [String]
+    config: String
 }
 
 type CheckoutSessionSignInOutput {

From 72fe44248c0c9c1221ca92c41ca0cef2314b9bfb Mon Sep 17 00:00:00 2001
From: Gage Schmidt <gage@beargroup.com>
Date: Mon, 28 Mar 2022 20:22:06 +0000
Subject: [PATCH 07/23] APF-320 - Added increment_id value to
 completeCheckoutSession output

---
 etc/schema.graphqls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index c3f404ed..61f6bf4c 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -44,6 +44,7 @@ type SetCustomerLinkOutput {
 type CompleteCheckoutSessionOutput {
     success: Boolean
     message: String
+    increment_id: String
 }
 
 type UpdateCheckoutSessionOutput {

From 674439f76cb85db30ebcbb8cb0707a925b297fdb Mon Sep 17 00:00:00 2001
From: Gage Schmidt <gage@beargroup.com>
Date: Thu, 31 Mar 2022 18:54:55 +0000
Subject: [PATCH 08/23] APF-320 - Updated setCustomerLink output to properly
 encapsulate the potential data

---
 Model/Resolver/SetCustomerLink.php | 4 +++-
 etc/schema.graphqls                | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Model/Resolver/SetCustomerLink.php b/Model/Resolver/SetCustomerLink.php
index 3b26fdb7..41a2ee9b 100644
--- a/Model/Resolver/SetCustomerLink.php
+++ b/Model/Resolver/SetCustomerLink.php
@@ -48,7 +48,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "password" is missing'));
         }
 
-        return array_merge(...$this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password));
+        return [
+            'response' => array_merge(...$this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password))
+        ];
 
     }
 }
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index 61f6bf4c..ab62e35c 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -37,8 +37,7 @@ type CheckoutSessionSignInOutput {
 }
 
 type SetCustomerLinkOutput {
-    success: Boolean
-    message: String
+    response: [String!]
 }
 
 type CompleteCheckoutSessionOutput {

From 5a19a2e01352f4fc214fd69ab4b4df31bfbf1a34 Mon Sep 17 00:00:00 2001
From: Gage Schmidt <gage@beargroup.com>
Date: Thu, 31 Mar 2022 19:15:04 +0000
Subject: [PATCH 09/23] APF-320 - Encoded string to preserve keys in the
 general response

---
 Model/Resolver/SetCustomerLink.php | 2 +-
 etc/schema.graphqls                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Model/Resolver/SetCustomerLink.php b/Model/Resolver/SetCustomerLink.php
index 41a2ee9b..145e04c7 100644
--- a/Model/Resolver/SetCustomerLink.php
+++ b/Model/Resolver/SetCustomerLink.php
@@ -49,7 +49,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         }
 
         return [
-            'response' => array_merge(...$this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password))
+            'response' => json_encode(array_merge(...$this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password)))
         ];
 
     }
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index ab62e35c..0a12211b 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -37,7 +37,7 @@ type CheckoutSessionSignInOutput {
 }
 
 type SetCustomerLinkOutput {
-    response: [String!]
+    response: String
 }
 
 type CompleteCheckoutSessionOutput {

From ef4a88b78975ca013e77402defceabdb5e79aef8 Mon Sep 17 00:00:00 2001
From: Gage Schmidt <gage@beargroup.com>
Date: Fri, 1 Apr 2022 18:20:32 +0000
Subject: [PATCH 10/23] APF-320 - Updated output data to be more graphql
 intuitive

---
 Model/Resolver/CheckoutSessionConfig.php |  4 +--
 Model/Resolver/CheckoutSessionSignIn.php |  4 +--
 Model/Resolver/SetCustomerLink.php       |  4 +--
 etc/schema.graphqls                      | 34 ++++++++++++++++++++----
 4 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/Model/Resolver/CheckoutSessionConfig.php b/Model/Resolver/CheckoutSessionConfig.php
index 7781d7f5..ce2a8b20 100644
--- a/Model/Resolver/CheckoutSessionConfig.php
+++ b/Model/Resolver/CheckoutSessionConfig.php
@@ -38,8 +38,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
     {
         $cartId = $args['cartId'] ?? null;
 
-        return  [
-            'config' => json_encode(($this->checkoutSessionManagement->getConfig($cartId) ?? []))
-        ];
+        return array_merge(...$this->checkoutSessionManagement->getConfig($cartId));
     }
 }
diff --git a/Model/Resolver/CheckoutSessionSignIn.php b/Model/Resolver/CheckoutSessionSignIn.php
index ef1ba637..77804e60 100644
--- a/Model/Resolver/CheckoutSessionSignIn.php
+++ b/Model/Resolver/CheckoutSessionSignIn.php
@@ -44,8 +44,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "buyerToken" is missing'));
         }
 
-        return [
-            'response' => $this->checkoutSessionManagement->signIn($buyerToken)[0] ?? []
-        ];
+        return array_merge(...$this->checkoutSessionManagement->signIn($buyerToken));
     }
 }
diff --git a/Model/Resolver/SetCustomerLink.php b/Model/Resolver/SetCustomerLink.php
index 145e04c7..3b26fdb7 100644
--- a/Model/Resolver/SetCustomerLink.php
+++ b/Model/Resolver/SetCustomerLink.php
@@ -48,9 +48,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "password" is missing'));
         }
 
-        return [
-            'response' => json_encode(array_merge(...$this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password)))
-        ];
+        return array_merge(...$this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password));
 
     }
 }
diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index 0a12211b..96cbbd05 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -29,21 +29,45 @@ type CheckoutSessionDetailsOutput {
 }
 
 type CheckoutSessionConfigOutput {
-    config: String
+    button_color: String
+    checkout_payload: String
+    checkout_signature: String
+    currency: String
+    sandbox: String
+    language: String
+    login_payload: String
+    login_signature: String
+    merchant_id: String
+    pay_only: String
+    paynow_payload: String
+    paynow_signature: String
+    public_key_id: String
 }
 
 type CheckoutSessionSignInOutput {
-    response: [String!]
+    customer_id: String
+    customer_email: String
+    customer_firstname: String
+    customer_last: String
+    customer_bearer_token: String
+    message: String
+    success: Boolean
 }
 
 type SetCustomerLinkOutput {
-    response: String
+    customer_id: String
+    customer_email: String
+    customer_firstname: String
+    customer_last: String
+    customer_bearer_token: String
+    message: String
+    success: Boolean
 }
 
 type CompleteCheckoutSessionOutput {
-    success: Boolean
-    message: String
     increment_id: String
+    message: String
+    success: Boolean
 }
 
 type UpdateCheckoutSessionOutput {

From 3cb675a24b2341a578f29d9a3358b6c7bcf61902 Mon Sep 17 00:00:00 2001
From: Gage Schmidt <gage@beargroup.com>
Date: Fri, 1 Apr 2022 18:44:01 +0000
Subject: [PATCH 11/23] APF-320 - Updated return value types to accurately
 reflect the true data types

---
 etc/schema.graphqls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/schema.graphqls b/etc/schema.graphqls
index 96cbbd05..7e7ae851 100644
--- a/etc/schema.graphqls
+++ b/etc/schema.graphqls
@@ -33,12 +33,12 @@ type CheckoutSessionConfigOutput {
     checkout_payload: String
     checkout_signature: String
     currency: String
-    sandbox: String
+    sandbox: Boolean
     language: String
     login_payload: String
     login_signature: String
     merchant_id: String
-    pay_only: String
+    pay_only: Boolean
     paynow_payload: String
     paynow_signature: String
     public_key_id: String

From 53aa518cfed6ed3588096a9b6916363305d6f80d Mon Sep 17 00:00:00 2001
From: Spencer Gabhart <sgabhart2230@gmail.com>
Date: Wed, 13 Apr 2022 14:13:55 -0400
Subject: [PATCH 12/23] ASD-889 - Separate checkout button rendering from
 checkout initiation; ASD-888 - Optionally split payloads/signatures from
 config response

---
 Api/CheckoutSessionManagementInterface.php    |  9 +-
 Controller/Checkout/Config.php                |  3 +-
 CustomerData/CheckoutSession.php              |  4 +-
 Model/CheckoutSessionManagement.php           | 87 ++++++++++++++++---
 etc/webapi.xml                                | 12 +++
 .../checkout-session-button-payload-load.js   | 32 +++++++
 .../js/action/checkout-session-config-load.js | 13 ++-
 view/frontend/web/js/amazon-button.js         | 54 ++++++------
 8 files changed, 161 insertions(+), 53 deletions(-)
 create mode 100644 view/frontend/web/js/action/checkout-session-button-payload-load.js

diff --git a/Api/CheckoutSessionManagementInterface.php b/Api/CheckoutSessionManagementInterface.php
index e012458a..8358b5b8 100755
--- a/Api/CheckoutSessionManagementInterface.php
+++ b/Api/CheckoutSessionManagementInterface.php
@@ -22,9 +22,16 @@ interface CheckoutSessionManagementInterface
 {
     /**
      * @param string|null $cartId
+     * @param boolean $omitPayloads
      * @return mixed
      */
-    public function getConfig($cartId = null);
+    public function getConfig($cartId = null, $omitPayloads = false);
+
+    /**
+     * @param string $payloadType
+     * @return mixed
+     */
+    public function getButtonPayload($payloadType = 'checkout');
 
     /**
      * @param mixed $amazonSessionId
diff --git a/Controller/Checkout/Config.php b/Controller/Checkout/Config.php
index 2efbc919..429e09f6 100644
--- a/Controller/Checkout/Config.php
+++ b/Controller/Checkout/Config.php
@@ -46,7 +46,8 @@ public function __construct(
      */
     public function execute()
     {
-        $data = $this->amazonCheckoutSession->getConfig();
+        $omitPayloads = isset($this->getRequest()->getParams()['omit_payloads']);
+        $data = $this->amazonCheckoutSession->getConfig($omitPayloads);
         return $this->resultJsonFactory->create()->setData($data);
     }
 }
diff --git a/CustomerData/CheckoutSession.php b/CustomerData/CheckoutSession.php
index 92dec5b4..4e4ab1f1 100755
--- a/CustomerData/CheckoutSession.php
+++ b/CustomerData/CheckoutSession.php
@@ -46,9 +46,9 @@ public function __construct(
     /**
      * @return array
      */
-    public function getConfig()
+    public function getConfig($omitPayloads)
     {
-        $data = $this->checkoutSessionManagement->getConfig();
+        $data = $this->checkoutSessionManagement->getConfig(null, $omitPayloads);
         if (count($data) > 0) {
             $data = $data[0];
         }
diff --git a/Model/CheckoutSessionManagement.php b/Model/CheckoutSessionManagement.php
index 83bf81d1..f6b05d49 100755
--- a/Model/CheckoutSessionManagement.php
+++ b/Model/CheckoutSessionManagement.php
@@ -404,40 +404,34 @@ protected function convertToMagentoAddress(array $address, $isShippingAddress =
     /**
      * {@inheritdoc}
      */
-    public function getConfig($cartId = null)
+    public function getConfig($cartId = null, $omitPayloads = false)
     {
         $result = [];
         $quote = $this->session->getQuoteFromIdOrSession($cartId);
 
         if ($this->canCheckoutWithAmazon($quote)) {
-            $loginButtonPayload = $this->amazonAdapter->generateLoginButtonPayload();
-            $checkoutButtonPayload = $this->amazonAdapter->generateCheckoutButtonPayload();
             $config = [
                 'merchant_id' => $this->amazonConfig->getMerchantId(),
                 'currency' => $this->amazonConfig->getCurrencyCode(),
                 'button_color' => $this->amazonConfig->getButtonColor(),
                 'language' => $this->amazonConfig->getLanguage(),
                 'sandbox' => $this->amazonConfig->isSandboxEnabled(),
-                'login_payload' => $loginButtonPayload,
-                'login_signature' => $this->amazonAdapter->signButton($loginButtonPayload),
-                'checkout_payload' => $checkoutButtonPayload,
-                'checkout_signature' => $this->amazonAdapter->signButton($checkoutButtonPayload),
                 'public_key_id' => $this->amazonConfig->getPublicKeyId(),
             ];
 
+            if (!$omitPayloads) {
+                $config = array_merge($config, $this->getLoginButtonPayload(), $this->getCheckoutButtonPayload());
+            }
+
             if ($quote) {
                 // Ensure the totals are up to date, in case the checkout does something to update qty or shipping
                 // without collecting totals
                 $quote->collectTotals();
 
-                $payNowButtonPayload = $this->amazonAdapter->generatePayNowButtonPayload(
-                    $quote,
-                    $this->amazonConfig->getPaymentAction()
-                );
-
                 $config['pay_only'] = $this->amazonHelper->isPayOnly($quote);
-                $config['paynow_payload'] = $payNowButtonPayload;
-                $config['paynow_signature'] = $this->amazonAdapter->signButton($payNowButtonPayload);
+                if (!$omitPayloads) {
+                    $config = array_merge($config, $this->getPayNowButtonPayload($quote));
+                }
             }
 
             $result[] = $config;
@@ -446,6 +440,71 @@ public function getConfig($cartId = null)
         return $result;
     }
 
+    public function getButtonPayload($payloadType = 'checkout')
+    {
+        switch ($payloadType) {
+            case 'paynow':
+                $quote = $this->session->getQuoteFromIdOrSession();
+                return $this->getPayNowButtonPayload($quote);
+            case 'login':
+                return $this->getLoginButtonPayload();
+            default:
+                return $this->getCheckoutButtonPayload();
+        }
+    }
+
+    /**
+     * Generate login button payload/signature pair.
+     *
+     * @return mixed
+     */
+    private function getLoginButtonPayload()
+    {
+        $loginButtonPayload = $this->amazonAdapter->generateLoginButtonPayload();
+        $result = [
+            'login_payload' => $loginButtonPayload,
+            'login_signature' => $this->amazonAdapter->signButton($loginButtonPayload)
+        ];
+
+        return $result;
+    }
+
+    /**
+     * Generate checkout button payload/signature pair.
+     *
+     * @return mixed
+     */
+    private function getCheckoutButtonPayload()
+    {
+        $checkoutButtonPayload = $this->amazonAdapter->generateCheckoutButtonPayload();
+        $result = [
+            'checkout_payload' => $checkoutButtonPayload,
+            'checkout_signature' => $this->amazonAdapter->signButton($checkoutButtonPayload)
+        ];
+
+        return $result;
+    }
+
+    /**
+     * Generate paynow payload/signature pair.
+     *
+     * @param CartInterface $quote
+     * @return mixed
+     */
+    private function getPayNowButtonPayload($quote)
+    {
+        $payNowButtonPayload = $this->amazonAdapter->generatePayNowButtonPayload(
+            $quote,
+            $this->amazonConfig->getPaymentAction()
+        );
+        $result = [
+            'paynow_payload' => $payNowButtonPayload,
+            'paynow_signature' => $this->amazonAdapter->signButton($payNowButtonPayload)
+        ];
+
+        return $result;
+    }
+
     /**
      * {@inheritdoc}
      */
diff --git a/etc/webapi.xml b/etc/webapi.xml
index ac23bb8a..b7ff50fa 100755
--- a/etc/webapi.xml
+++ b/etc/webapi.xml
@@ -21,12 +21,24 @@
         <resources>
             <resource ref="anonymous" />
         </resources>
+        <data>
+            <parameter name="omitPayloads">%omit_payloads%</parameter>
+        </data>
     </route>
     <route url="/V1/amazon-checkout-session/config/:cartId" method="GET">
         <service class="Amazon\Pay\Api\CheckoutSessionManagementInterface" method="getConfig"/>
         <resources>
             <resource ref="anonymous" />
         </resources>
+        <data>
+            <parameter name="omitPayloads">%omit_payloads%</parameter>
+        </data>
+    </route>
+    <route method="GET" url="/V1/amazon-checkout-session/button-payload/:payloadType">
+        <service class="Amazon\Pay\Api\CheckoutSessionManagementInterface" method="getButtonPayload"/>
+        <resources>
+            <resource ref="anonymous" />
+        </resources>
     </route>
     <route url="/V1/amazon-checkout-session/:amazonSessionId/payment-descriptor" method="GET">
         <service class="Amazon\Pay\Api\CheckoutSessionManagementInterface" method="getPaymentDescriptor"/>
diff --git a/view/frontend/web/js/action/checkout-session-button-payload-load.js b/view/frontend/web/js/action/checkout-session-button-payload-load.js
new file mode 100644
index 00000000..5d042c9b
--- /dev/null
+++ b/view/frontend/web/js/action/checkout-session-button-payload-load.js
@@ -0,0 +1,32 @@
+/**
+ * Copyright © Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+ define([
+    'jquery',
+    'underscore',
+    'mage/storage',
+    'mage/url',
+    'Magento_Customer/js/customer-data'
+], function ($, _, remoteStorage, url, customerData) {
+    'use strict';
+
+    return function (callback, payloadType) {
+        var serviceUrl = url.build(`/rest/V1/amazon-checkout-session/button-payload/${payloadType}`);
+        
+        remoteStorage.get(serviceUrl).done(function (payload) {
+                callback(payload);
+            });
+    };
+});
diff --git a/view/frontend/web/js/action/checkout-session-config-load.js b/view/frontend/web/js/action/checkout-session-config-load.js
index a4567a6c..9bb959ec 100644
--- a/view/frontend/web/js/action/checkout-session-config-load.js
+++ b/view/frontend/web/js/action/checkout-session-config-load.js
@@ -30,16 +30,13 @@ define([
         }
         return localStorage;
     };
-    return function (callback, forceReload = false) {
+    return function (callback) {
         var cartId = customerData.get('cart')()['data_id'] || window.checkout.storeId;
         var config = getLocalStorage().get('config') || false;
-        if (forceReload
-            || cartId !== getLocalStorage().get('cart_id')
-            || typeof config.checkout_payload === 'undefined'
-            || !config.checkout_payload.includes(document.URL)) {
+        if (!config || cartId !== getLocalStorage().get('cart_id')) {
             callbacks.push(callback);
             if (callbacks.length == 1) {
-                remoteStorage.get(url.build('amazon_pay/checkout/config')).done(function (config) {
+                remoteStorage.get(url.build('amazon_pay/checkout/config?omit_payloads=true')).done(function (config) {
                     getLocalStorage().set('cart_id', cartId);
                     getLocalStorage().set('config', config);
                     do {
@@ -47,8 +44,8 @@ define([
                     } while (callbacks.length);
                 });
             }
-        } else {
-            callback(getLocalStorage().get('config'));
         }
+
+        callback(getLocalStorage().get('config'));
     };
 });
diff --git a/view/frontend/web/js/amazon-button.js b/view/frontend/web/js/amazon-button.js
index b955ed57..e943fc9f 100755
--- a/view/frontend/web/js/amazon-button.js
+++ b/view/frontend/web/js/amazon-button.js
@@ -16,6 +16,7 @@ define([
     'ko',
     'jquery',
     'Amazon_Pay/js/action/checkout-session-config-load',
+    'Amazon_Pay/js/action/checkout-session-button-payload-load',
     'Amazon_Pay/js/model/storage',
     'mage/url',
     'Amazon_Pay/js/amazon-checkout',
@@ -27,6 +28,7 @@ define([
         ko,
         $,
         checkoutSessionConfigLoad,
+        buttonPayloadLoad,
         amazonStorage,
         url,
         amazonCheckout,
@@ -48,17 +50,9 @@ define([
 
         drawing: false,
 
-        _loadButtonConfig: function (callback, forceReload = false) {
+        _loadButtonConfig: function (callback) {
             checkoutSessionConfigLoad(function (checkoutSessionConfig) {
                 if (!$.isEmptyObject(checkoutSessionConfig)) {
-                    var payload = checkoutSessionConfig['checkout_payload'];
-                    var signature = checkoutSessionConfig['checkout_signature'];
-
-                    if (this.buttonType === 'PayNow') {
-                        payload = checkoutSessionConfig['paynow_payload'];
-                        signature = checkoutSessionConfig['paynow_signature'];
-                    }
-
                     callback({
                         merchantId: checkoutSessionConfig['merchant_id'],
                         publicKeyId: checkoutSessionConfig['public_key_id'],
@@ -68,11 +62,7 @@ define([
                         productType: this._isPayOnly(checkoutSessionConfig['pay_only']) ? 'PayOnly' : 'PayAndShip',
                         placement: this.options.placement,
                         buttonColor: checkoutSessionConfig['button_color'],
-                        createCheckoutSessionConfig: {
-                            payloadJSON: payload,
-                            signature: signature,
-                            publicKeyId: checkoutSessionConfig['public_key_id'],
-                        }
+                        publicKeyId: checkoutSessionConfig['public_key_id']
                     });
 
                     if (this.options.placement !== "Checkout") {
@@ -81,7 +71,21 @@ define([
                 } else {
                     $(this.options.hideIfUnavailable).hide();
                 }
-            }.bind(this), forceReload);
+            }.bind(this));
+        },
+
+        _loadInitCheckoutPayload: function (callback, payloadType) {
+            checkoutSessionConfigLoad(function (checkoutSessionConfig) {
+                buttonPayloadLoad(function (buttonPayload) {
+                    callback({
+                        createCheckoutSessionConfig: {
+                            payloadJSON: buttonPayload[0],
+                            signature: buttonPayload[1],
+                            publicKeyId: checkoutSessionConfig['public_key_id']
+                        }
+                    });
+                }, payloadType);
+            });
         },
 
         /**
@@ -109,10 +113,7 @@ define([
             }
 
             this._draw();
-
-            if (this.options.placement === 'Product') {
-                this._redraw();
-            }
+            this._subscribeToCartUpdates();
         },
 
         /**
@@ -130,8 +131,6 @@ define([
                     $buttonContainer.empty().append($buttonRoot);
 
                     this._loadButtonConfig(function (buttonConfig) {
-                        // do not use session config for decoupled button
-                        delete buttonConfig.createCheckoutSessionConfig;
                         try {
                             var amazonPayButton = amazon.Pay.renderButton('#' + $buttonRoot.empty().removeUniqueId().uniqueId().attr('id'), buttonConfig);
                         } catch (e) {
@@ -174,17 +173,19 @@ define([
         },
 
         _initCheckout: function (amazonPayButton) {
-            this._loadButtonConfig(function (buttonConfig) {
-                var initConfig = {createCheckoutSessionConfig: buttonConfig.createCheckoutSessionConfig};
-                amazonPayButton.initCheckout(initConfig);
-            }, true);
+            var payloadType = this.buttonType ?
+                'paynow' :
+                'checkout';
+            this._loadInitCheckoutPayload(function (initCheckoutPayload) {
+                amazonPayButton.initCheckout(initCheckoutPayload);
+            }, payloadType);
             customerData.invalidate('*');
         },
 
         /**
          * Redraw button if needed
          **/
-        _redraw: function () {
+        _subscribeToCartUpdates: function () {
             var self = this;
 
             amazonCheckout.withAmazonCheckout(function (amazon, args) {
@@ -195,7 +196,6 @@ define([
                     }
                 });
             });
-
         },
 
         click: function () {

From 191b32cf144f9f93e2bddf376706f7a11d17eb0c Mon Sep 17 00:00:00 2001
From: Spencer Gabhart <sgabhart2230@gmail.com>
Date: Thu, 14 Apr 2022 15:09:05 -0400
Subject: [PATCH 13/23] ASD-898 - Return error messages from
 /completeCheckoutSession as strings to avoid 'Class x doesn't exist' error
 through the API

---
 Api/CheckoutSessionManagementInterface.php |  2 +-
 Model/CheckoutSessionManagement.php        | 38 +++++++++++++++++++---
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/Api/CheckoutSessionManagementInterface.php b/Api/CheckoutSessionManagementInterface.php
index e012458a..580bbd55 100755
--- a/Api/CheckoutSessionManagementInterface.php
+++ b/Api/CheckoutSessionManagementInterface.php
@@ -54,7 +54,7 @@ public function updateCheckoutSession($amazonSessionId, $cartId = null);
     /**
      * @param mixed $amazonSessionId
      * @param mixed|null $cartId
-     * @return int
+     * @return mixed
      */
     public function completeCheckoutSession($amazonSessionId, $cartId = null);
 
diff --git a/Model/CheckoutSessionManagement.php b/Model/CheckoutSessionManagement.php
index 83bf81d1..9b89c816 100755
--- a/Model/CheckoutSessionManagement.php
+++ b/Model/CheckoutSessionManagement.php
@@ -41,6 +41,7 @@
 use Magento\Sales\Api\Data\TransactionInterface as Transaction;
 use Magento\Integration\Model\Oauth\TokenFactory as TokenModelFactory;
 use Magento\Authorization\Model\UserContextInterface as UserContext;
+use Magento\Framework\Phrase\Renderer\Translate as Translate;
 
 class CheckoutSessionManagement implements \Amazon\Pay\Api\CheckoutSessionManagementInterface
 {
@@ -202,6 +203,11 @@ class CheckoutSessionManagement implements \Amazon\Pay\Api\CheckoutSessionManage
      */
     private $session;
 
+    /**
+     * @var Translate
+     */
+    private $translationRenderer;
+
     /**
      * CheckoutSessionManagement constructor.
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -233,6 +239,7 @@ class CheckoutSessionManagement implements \Amazon\Pay\Api\CheckoutSessionManage
      * @param UserContext $userContext
      * @param \Amazon\Pay\Logger\Logger $logger
      * @param Session $session
+     * @param Translate $translationRenderer
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
@@ -263,7 +270,8 @@ public function __construct(
         TokenModelFactory $tokenModelFactory,
         UserContext $userContext,
         \Amazon\Pay\Logger\Logger $logger,
-        Session $session
+        Session $session,
+        Translate $translationRenderer
     ) {
         $this->storeManager = $storeManager;
         $this->quoteIdMaskFactory = $quoteIdMaskFactory;
@@ -294,6 +302,7 @@ public function __construct(
         $this->userContext = $userContext;
         $this->logger = $logger;
         $this->session = $session;
+        $this->translationRenderer = $translationRenderer;
     }
 
     /**
@@ -650,7 +659,7 @@ public function completeCheckoutSession($amazonSessionId, $cartId = null)
             $this->logger->debug("Unable to complete Amazon Pay checkout. Can't submit quote id: " . $quote->getId());
             return [
                 'success' => false,
-                'message' => __("Unable to complete Amazon Pay checkout"),
+                'message' => $this->getTranslationString('Unable to complete Amazon Pay checkout'),
             ];
         }
         try {
@@ -739,7 +748,7 @@ public function completeCheckoutSession($amazonSessionId, $cartId = null)
 
                 return [
                     'success' => false,
-                    'message' => __(
+                    'message' => $this->getTranslationString(
                         'Something went wrong. Choose another payment method for checkout and try again.'
                     ),
                 ];
@@ -835,14 +844,33 @@ public function completeCheckoutSession($amazonSessionId, $cartId = null)
     protected function getCanceledMessage($amazonSession)
     {
         if ($amazonSession['statusDetails']['reasonCode'] == 'BuyerCanceled') {
-            return __("This transaction was cancelled. Please try again.");
+            return $this->getTranslationString('This transaction was cancelled. Please try again.');
         } elseif ($amazonSession['statusDetails']['reasonCode'] == 'Declined') {
-            return __("This transaction was declined. Please try again using a different payment method.");
+            return $this->getTranslationString(
+                'This transaction was declined. Please try again using a different payment method.'
+            );
         }
 
         return $amazonSession['statusDetails']['reasonDescription'];
     }
 
+    /**
+     * Get a translated string to return through the web API
+     *
+     * @param string $message
+     * @return string
+     */
+    private function getTranslationString($message)
+    {
+        try {
+            $translation = $this->translationRenderer->render([$message], []);
+        } catch (\Exception $e) {
+            $translation = $message;
+        }
+
+        return $translation;
+    }
+
     /**
      * @param mixed $buyerToken
      * @return mixed

From a5c5de501cac277a88ba6e4e2768110d7968444a Mon Sep 17 00:00:00 2001
From: Gage <gage@beargroup.com>
Date: Tue, 19 Apr 2022 19:27:15 +0000
Subject: [PATCH 14/23] APF-320 - Replaced array_merge spread operator with a
 more backwards compatible php method

---
 Model/Resolver/CheckoutSessionConfig.php | 5 ++++-
 Model/Resolver/CheckoutSessionSignIn.php | 5 ++++-
 Model/Resolver/SetCustomerLink.php       | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Model/Resolver/CheckoutSessionConfig.php b/Model/Resolver/CheckoutSessionConfig.php
index ce2a8b20..4b97031b 100644
--- a/Model/Resolver/CheckoutSessionConfig.php
+++ b/Model/Resolver/CheckoutSessionConfig.php
@@ -38,6 +38,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
     {
         $cartId = $args['cartId'] ?? null;
 
-        return array_merge(...$this->checkoutSessionManagement->getConfig($cartId));
+        // old php version friendly. later the spread operator can be used for a slight performance increase
+        // array_merge(...$response);
+        $response = $this->checkoutSessionManagement->getConfig($cartId);
+        return array_shift($response);
     }
 }
diff --git a/Model/Resolver/CheckoutSessionSignIn.php b/Model/Resolver/CheckoutSessionSignIn.php
index 77804e60..c61e4bd1 100644
--- a/Model/Resolver/CheckoutSessionSignIn.php
+++ b/Model/Resolver/CheckoutSessionSignIn.php
@@ -44,6 +44,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "buyerToken" is missing'));
         }
 
-        return array_merge(...$this->checkoutSessionManagement->signIn($buyerToken));
+        // old php version friendly. later the spread operator can be used for a slight performance increase
+        // array_merge(...$response);
+        $response = $this->checkoutSessionManagement->signIn($buyerToken);
+        return array_shift($response);
     }
 }
diff --git a/Model/Resolver/SetCustomerLink.php b/Model/Resolver/SetCustomerLink.php
index 3b26fdb7..5a083fd0 100644
--- a/Model/Resolver/SetCustomerLink.php
+++ b/Model/Resolver/SetCustomerLink.php
@@ -48,7 +48,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "password" is missing'));
         }
 
-        return array_merge(...$this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password));
+        // old php version friendly. later the spread operator can be used for a slight performance increase
+        // array_merge(...$response);
+        $response = $this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password);
+        return array_shift($response);
 
     }
 }

From 638870649c29f3baa00ded6575ef819227869a2a Mon Sep 17 00:00:00 2001
From: Gage Schmidt <gage@beargroup.com>
Date: Tue, 19 Apr 2022 19:36:21 +0000
Subject: [PATCH 15/23] APF-320 - Added syntax sniffer based fixes

---
 Model/Resolver/CheckoutSessionConfig.php   | 2 +-
 Model/Resolver/CheckoutSessionDetails.php  | 5 +----
 Model/Resolver/CheckoutSessionSignIn.php   | 2 +-
 Model/Resolver/CompleteCheckoutSession.php | 2 +-
 Model/Resolver/SetCustomerLink.php         | 3 +--
 Model/Resolver/UpdateCheckoutSession.php   | 7 +++----
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Model/Resolver/CheckoutSessionConfig.php b/Model/Resolver/CheckoutSessionConfig.php
index 4b97031b..92f89b2b 100644
--- a/Model/Resolver/CheckoutSessionConfig.php
+++ b/Model/Resolver/CheckoutSessionConfig.php
@@ -22,7 +22,7 @@ class CheckoutSessionConfig implements ResolverInterface
      */
     public function __construct(
         CheckoutSessionManagement $checkoutSessionManagement
-    ){
+    ) {
         $this->checkoutSessionManagement = $checkoutSessionManagement;
     }
 
diff --git a/Model/Resolver/CheckoutSessionDetails.php b/Model/Resolver/CheckoutSessionDetails.php
index a1d79ee9..357e7310 100644
--- a/Model/Resolver/CheckoutSessionDetails.php
+++ b/Model/Resolver/CheckoutSessionDetails.php
@@ -25,7 +25,7 @@ class CheckoutSessionDetails implements ResolverInterface
      */
     public function __construct(
         CheckoutSessionManagement $checkoutSessionManagement
-    ){
+    ) {
         $this->checkoutSessionManagement = $checkoutSessionManagement;
     }
 
@@ -61,7 +61,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         ];
     }
 
-
     /**
      * @param $amazonSessionId
      * @param $queryType
@@ -85,6 +84,4 @@ private function getQueryTypesData($amazonSessionId, $queryType)
 
         return $result;
     }
-
-
 }
diff --git a/Model/Resolver/CheckoutSessionSignIn.php b/Model/Resolver/CheckoutSessionSignIn.php
index c61e4bd1..f40bac27 100644
--- a/Model/Resolver/CheckoutSessionSignIn.php
+++ b/Model/Resolver/CheckoutSessionSignIn.php
@@ -23,7 +23,7 @@ class CheckoutSessionSignIn implements ResolverInterface
      */
     public function __construct(
         CheckoutSessionManagement $checkoutSessionManagement
-    ){
+    ) {
         $this->checkoutSessionManagement = $checkoutSessionManagement;
     }
 
diff --git a/Model/Resolver/CompleteCheckoutSession.php b/Model/Resolver/CompleteCheckoutSession.php
index 63592e57..2831116c 100644
--- a/Model/Resolver/CompleteCheckoutSession.php
+++ b/Model/Resolver/CompleteCheckoutSession.php
@@ -23,7 +23,7 @@ class CompleteCheckoutSession implements ResolverInterface
      */
     public function __construct(
         CheckoutSessionManagement $checkoutSessionManagementModel
-    ){
+    ) {
         $this->checkoutSessionManagementModel = $checkoutSessionManagementModel;
     }
 
diff --git a/Model/Resolver/SetCustomerLink.php b/Model/Resolver/SetCustomerLink.php
index 5a083fd0..6b3b2ba3 100644
--- a/Model/Resolver/SetCustomerLink.php
+++ b/Model/Resolver/SetCustomerLink.php
@@ -22,7 +22,7 @@ class SetCustomerLink implements ResolverInterface
      */
     public function __construct(
         CheckoutSessionManagement $checkoutSessionManagementModel
-    ){
+    ) {
         $this->checkoutSessionManagementModel = $checkoutSessionManagementModel;
     }
 
@@ -52,6 +52,5 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         // array_merge(...$response);
         $response = $this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password);
         return array_shift($response);
-
     }
 }
diff --git a/Model/Resolver/UpdateCheckoutSession.php b/Model/Resolver/UpdateCheckoutSession.php
index 4021b352..0a2aa963 100644
--- a/Model/Resolver/UpdateCheckoutSession.php
+++ b/Model/Resolver/UpdateCheckoutSession.php
@@ -23,7 +23,7 @@ class UpdateCheckoutSession implements ResolverInterface
      */
     public function __construct(
         CheckoutSessionManagement $checkoutSessionManagementModel
-    ){
+    ) {
         $this->checkoutSessionManagementModel = $checkoutSessionManagementModel;
     }
 
@@ -49,10 +49,9 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "checkoutSessionId" is missing'));
         }
 
+        $response = $this->checkoutSessionManagementModel->updateCheckoutSession($checkoutSessionId, $cartId) ?? 'N/A';
         return [
-            'redirectUrl' => $this->checkoutSessionManagementModel->updateCheckoutSession($checkoutSessionId,
-                    $cartId) ?? 'N/A'
+            'redirectUrl' => $response
         ];
     }
-
 }

From 318d744c8c259b1f9f7174d812f043d8f2b68a74 Mon Sep 17 00:00:00 2001
From: Jaime Lopez <jaime@m1pro.localdomain>
Date: Tue, 19 Apr 2022 14:43:39 -0700
Subject: [PATCH 16/23] ASD-889 moves pay only flag to cart local storage

---
 Model/CheckoutSessionManagement.php           |  1 -
 Plugin/CustomerData/Cart.php                  | 42 +++++++++++++++++++
 etc/di.xml                                    |  3 ++
 .../checkout-session-button-payload-load.js   |  4 +-
 .../js/action/checkout-session-config-load.js | 24 +++++------
 view/frontend/web/js/amazon-button.js         | 24 +++++++----
 6 files changed, 72 insertions(+), 26 deletions(-)
 create mode 100644 Plugin/CustomerData/Cart.php

diff --git a/Model/CheckoutSessionManagement.php b/Model/CheckoutSessionManagement.php
index f6b05d49..287a603a 100755
--- a/Model/CheckoutSessionManagement.php
+++ b/Model/CheckoutSessionManagement.php
@@ -428,7 +428,6 @@ public function getConfig($cartId = null, $omitPayloads = false)
                 // without collecting totals
                 $quote->collectTotals();
 
-                $config['pay_only'] = $this->amazonHelper->isPayOnly($quote);
                 if (!$omitPayloads) {
                     $config = array_merge($config, $this->getPayNowButtonPayload($quote));
                 }
diff --git a/Plugin/CustomerData/Cart.php b/Plugin/CustomerData/Cart.php
new file mode 100644
index 00000000..7e1152e0
--- /dev/null
+++ b/Plugin/CustomerData/Cart.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Amazon\Pay\Plugin\CustomerData;
+
+use Magento\Checkout\Model\Session;
+
+class Cart
+{
+    /**
+     * @var Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @param Session $checkoutSession
+     */
+    public function __construct(
+        Session $checkoutSession
+    )
+    {
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * @param \Magento\Checkout\CustomerData\Cart $subject
+     * @param $result
+     * @return mixed
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     *
+     * Adds virtual cart flag to the cart local storage for button rendering
+     */
+    public function afterGetSectionData(
+        \Magento\Checkout\CustomerData\Cart $subject,
+        $result
+    )
+    {
+        $result['amzn_pay_only'] = $this->checkoutSession->getQuote()->isVirtual();
+
+        return $result;
+    }
+}
diff --git a/etc/di.xml b/etc/di.xml
index 258c6658..b58e9b20 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -379,4 +379,7 @@
     <type name="Magento\Sales\Model\Order">
         <plugin name="amazon_payv2_legacy_order" type="Amazon\Pay\Plugin\LegacyPaymentHandler" />
     </type>
+    <type name="Magento\Checkout\CustomerData\Cart">
+        <plugin name="amazon_pay_customerdata_cart" type="Amazon\Pay\Plugin\CustomerData\Cart" />
+    </type>
 </config>
diff --git a/view/frontend/web/js/action/checkout-session-button-payload-load.js b/view/frontend/web/js/action/checkout-session-button-payload-load.js
index 5d042c9b..3e788c6e 100644
--- a/view/frontend/web/js/action/checkout-session-button-payload-load.js
+++ b/view/frontend/web/js/action/checkout-session-button-payload-load.js
@@ -23,8 +23,8 @@
     'use strict';
 
     return function (callback, payloadType) {
-        var serviceUrl = url.build(`/rest/V1/amazon-checkout-session/button-payload/${payloadType}`);
-        
+        var serviceUrl = url.build(`rest/V1/amazon-checkout-session/button-payload/${payloadType}`);
+
         remoteStorage.get(serviceUrl).done(function (payload) {
                 callback(payload);
             });
diff --git a/view/frontend/web/js/action/checkout-session-config-load.js b/view/frontend/web/js/action/checkout-session-config-load.js
index 9bb959ec..6510ae6b 100644
--- a/view/frontend/web/js/action/checkout-session-config-load.js
+++ b/view/frontend/web/js/action/checkout-session-config-load.js
@@ -22,7 +22,6 @@ define([
 ], function ($, _, remoteStorage, url, customerData) {
     'use strict';
 
-    var callbacks = [];
     var localStorage = null;
     var getLocalStorage = function () {
         if (localStorage === null) {
@@ -33,19 +32,16 @@ define([
     return function (callback) {
         var cartId = customerData.get('cart')()['data_id'] || window.checkout.storeId;
         var config = getLocalStorage().get('config') || false;
-        if (!config || cartId !== getLocalStorage().get('cart_id')) {
-            callbacks.push(callback);
-            if (callbacks.length == 1) {
-                remoteStorage.get(url.build('amazon_pay/checkout/config?omit_payloads=true')).done(function (config) {
-                    getLocalStorage().set('cart_id', cartId);
-                    getLocalStorage().set('config', config);
-                    do {
-                        callbacks.shift()(config);
-                    } while (callbacks.length);
-                });
-            }
-        }
+        if (!config) {
+            remoteStorage.get(url.build('amazon_pay/checkout/config?omit_payloads=true')).done(function (config) {
+                getLocalStorage().set('cart_id', cartId);
+                getLocalStorage().set('config', config);
 
-        callback(getLocalStorage().get('config'));
+                callback(getLocalStorage().get('config'));
+            });
+        }
+        else {
+            callback(getLocalStorage().get('config'));
+        }
     };
 });
diff --git a/view/frontend/web/js/amazon-button.js b/view/frontend/web/js/amazon-button.js
index e943fc9f..2a8dae24 100755
--- a/view/frontend/web/js/amazon-button.js
+++ b/view/frontend/web/js/amazon-button.js
@@ -59,10 +59,9 @@ define([
                         ledgerCurrency: checkoutSessionConfig['currency'],
                         sandbox: checkoutSessionConfig['sandbox'],
                         checkoutLanguage: checkoutSessionConfig['language'],
-                        productType: this._isPayOnly(checkoutSessionConfig['pay_only']) ? 'PayOnly' : 'PayAndShip',
+                        productType: this._isPayOnly() ? 'PayOnly' : 'PayAndShip',
                         placement: this.options.placement,
-                        buttonColor: checkoutSessionConfig['button_color'],
-                        publicKeyId: checkoutSessionConfig['public_key_id']
+                        buttonColor: checkoutSessionConfig['button_color']
                     });
 
                     if (this.options.placement !== "Checkout") {
@@ -89,16 +88,23 @@ define([
         },
 
         /**
-         * @param {boolean} isCheckoutSessionPayOnly
          * @returns {boolean}
          * @private
          */
-        _isPayOnly: function (isCheckoutSessionPayOnly) {
-            var result = isCheckoutSessionPayOnly;
-            if (result && this.options.payOnly !== null) {
-                result = this.options.payOnly;
+        _isPayOnly: function () {
+            var cartData = customerData.get('cart');
+
+            // No cart data yet or cart is empty, for the pdp button
+            if (typeof cartData().amzn_pay_only === 'undefined' || parseInt(cartData().summary_count) === 0) {
+                return this.options.payOnly
+            }
+
+            // Check if cart has items and it's the pdp button
+            if (parseInt(cartData().summary_count) > 0 && this.options.payOnly !== null) {
+                return cartData().amzn_pay_only && this.options.payOnly;
             }
-            return result;
+
+            return cartData().amzn_pay_only;
         },
 
         /**

From e82527537d2c279f9876fe79c2945feee5aad3f0 Mon Sep 17 00:00:00 2001
From: jajajaime <jaimelopezav@gmail.com>
Date: Tue, 19 Apr 2022 14:48:23 -0700
Subject: [PATCH 17/23] ASD-889 moves pay only flag to cart local storage

---
 Model/CheckoutSessionManagement.php           |  1 -
 Plugin/CustomerData/Cart.php                  | 42 +++++++++++++++++++
 etc/di.xml                                    |  3 ++
 .../checkout-session-button-payload-load.js   |  4 +-
 .../js/action/checkout-session-config-load.js | 24 +++++------
 view/frontend/web/js/amazon-button.js         | 24 +++++++----
 6 files changed, 72 insertions(+), 26 deletions(-)
 create mode 100644 Plugin/CustomerData/Cart.php

diff --git a/Model/CheckoutSessionManagement.php b/Model/CheckoutSessionManagement.php
index f6b05d49..287a603a 100755
--- a/Model/CheckoutSessionManagement.php
+++ b/Model/CheckoutSessionManagement.php
@@ -428,7 +428,6 @@ public function getConfig($cartId = null, $omitPayloads = false)
                 // without collecting totals
                 $quote->collectTotals();
 
-                $config['pay_only'] = $this->amazonHelper->isPayOnly($quote);
                 if (!$omitPayloads) {
                     $config = array_merge($config, $this->getPayNowButtonPayload($quote));
                 }
diff --git a/Plugin/CustomerData/Cart.php b/Plugin/CustomerData/Cart.php
new file mode 100644
index 00000000..7e1152e0
--- /dev/null
+++ b/Plugin/CustomerData/Cart.php
@@ -0,0 +1,42 @@
+<?php
+
+namespace Amazon\Pay\Plugin\CustomerData;
+
+use Magento\Checkout\Model\Session;
+
+class Cart
+{
+    /**
+     * @var Session
+     */
+    protected $checkoutSession;
+
+    /**
+     * @param Session $checkoutSession
+     */
+    public function __construct(
+        Session $checkoutSession
+    )
+    {
+        $this->checkoutSession = $checkoutSession;
+    }
+
+    /**
+     * @param \Magento\Checkout\CustomerData\Cart $subject
+     * @param $result
+     * @return mixed
+     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws \Magento\Framework\Exception\NoSuchEntityException
+     *
+     * Adds virtual cart flag to the cart local storage for button rendering
+     */
+    public function afterGetSectionData(
+        \Magento\Checkout\CustomerData\Cart $subject,
+        $result
+    )
+    {
+        $result['amzn_pay_only'] = $this->checkoutSession->getQuote()->isVirtual();
+
+        return $result;
+    }
+}
diff --git a/etc/di.xml b/etc/di.xml
index 258c6658..b58e9b20 100755
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -379,4 +379,7 @@
     <type name="Magento\Sales\Model\Order">
         <plugin name="amazon_payv2_legacy_order" type="Amazon\Pay\Plugin\LegacyPaymentHandler" />
     </type>
+    <type name="Magento\Checkout\CustomerData\Cart">
+        <plugin name="amazon_pay_customerdata_cart" type="Amazon\Pay\Plugin\CustomerData\Cart" />
+    </type>
 </config>
diff --git a/view/frontend/web/js/action/checkout-session-button-payload-load.js b/view/frontend/web/js/action/checkout-session-button-payload-load.js
index 5d042c9b..3e788c6e 100644
--- a/view/frontend/web/js/action/checkout-session-button-payload-load.js
+++ b/view/frontend/web/js/action/checkout-session-button-payload-load.js
@@ -23,8 +23,8 @@
     'use strict';
 
     return function (callback, payloadType) {
-        var serviceUrl = url.build(`/rest/V1/amazon-checkout-session/button-payload/${payloadType}`);
-        
+        var serviceUrl = url.build(`rest/V1/amazon-checkout-session/button-payload/${payloadType}`);
+
         remoteStorage.get(serviceUrl).done(function (payload) {
                 callback(payload);
             });
diff --git a/view/frontend/web/js/action/checkout-session-config-load.js b/view/frontend/web/js/action/checkout-session-config-load.js
index 9bb959ec..6510ae6b 100644
--- a/view/frontend/web/js/action/checkout-session-config-load.js
+++ b/view/frontend/web/js/action/checkout-session-config-load.js
@@ -22,7 +22,6 @@ define([
 ], function ($, _, remoteStorage, url, customerData) {
     'use strict';
 
-    var callbacks = [];
     var localStorage = null;
     var getLocalStorage = function () {
         if (localStorage === null) {
@@ -33,19 +32,16 @@ define([
     return function (callback) {
         var cartId = customerData.get('cart')()['data_id'] || window.checkout.storeId;
         var config = getLocalStorage().get('config') || false;
-        if (!config || cartId !== getLocalStorage().get('cart_id')) {
-            callbacks.push(callback);
-            if (callbacks.length == 1) {
-                remoteStorage.get(url.build('amazon_pay/checkout/config?omit_payloads=true')).done(function (config) {
-                    getLocalStorage().set('cart_id', cartId);
-                    getLocalStorage().set('config', config);
-                    do {
-                        callbacks.shift()(config);
-                    } while (callbacks.length);
-                });
-            }
-        }
+        if (!config) {
+            remoteStorage.get(url.build('amazon_pay/checkout/config?omit_payloads=true')).done(function (config) {
+                getLocalStorage().set('cart_id', cartId);
+                getLocalStorage().set('config', config);
 
-        callback(getLocalStorage().get('config'));
+                callback(getLocalStorage().get('config'));
+            });
+        }
+        else {
+            callback(getLocalStorage().get('config'));
+        }
     };
 });
diff --git a/view/frontend/web/js/amazon-button.js b/view/frontend/web/js/amazon-button.js
index e943fc9f..2a8dae24 100755
--- a/view/frontend/web/js/amazon-button.js
+++ b/view/frontend/web/js/amazon-button.js
@@ -59,10 +59,9 @@ define([
                         ledgerCurrency: checkoutSessionConfig['currency'],
                         sandbox: checkoutSessionConfig['sandbox'],
                         checkoutLanguage: checkoutSessionConfig['language'],
-                        productType: this._isPayOnly(checkoutSessionConfig['pay_only']) ? 'PayOnly' : 'PayAndShip',
+                        productType: this._isPayOnly() ? 'PayOnly' : 'PayAndShip',
                         placement: this.options.placement,
-                        buttonColor: checkoutSessionConfig['button_color'],
-                        publicKeyId: checkoutSessionConfig['public_key_id']
+                        buttonColor: checkoutSessionConfig['button_color']
                     });
 
                     if (this.options.placement !== "Checkout") {
@@ -89,16 +88,23 @@ define([
         },
 
         /**
-         * @param {boolean} isCheckoutSessionPayOnly
          * @returns {boolean}
          * @private
          */
-        _isPayOnly: function (isCheckoutSessionPayOnly) {
-            var result = isCheckoutSessionPayOnly;
-            if (result && this.options.payOnly !== null) {
-                result = this.options.payOnly;
+        _isPayOnly: function () {
+            var cartData = customerData.get('cart');
+
+            // No cart data yet or cart is empty, for the pdp button
+            if (typeof cartData().amzn_pay_only === 'undefined' || parseInt(cartData().summary_count) === 0) {
+                return this.options.payOnly
+            }
+
+            // Check if cart has items and it's the pdp button
+            if (parseInt(cartData().summary_count) > 0 && this.options.payOnly !== null) {
+                return cartData().amzn_pay_only && this.options.payOnly;
             }
-            return result;
+
+            return cartData().amzn_pay_only;
         },
 
         /**

From 1871c38bd8a4f63a056b6b84ff03777affedc7b8 Mon Sep 17 00:00:00 2001
From: Spencer Gabhart <sgabhart2230@gmail.com>
Date: Thu, 21 Apr 2022 16:07:13 -0400
Subject: [PATCH 18/23] Update admin translations

---
 Model/Config/Source/PaymentAction.php |  4 +-
 etc/adminhtml/system.xml              | 18 ++++-----
 i18n/de_AT.csv                        | 32 +++++++--------
 i18n/de_CH.csv                        | 29 +++++++-------
 i18n/de_DE.csv                        | 30 +++++++-------
 i18n/es_AR.csv                        | 23 ++++++-----
 i18n/es_CL.csv                        | 26 ++++++-------
 i18n/es_CO.csv                        | 26 ++++++-------
 i18n/es_CR.csv                        | 22 +++++------
 i18n/es_ES.csv                        | 23 ++++++-----
 i18n/es_MX.csv                        | 56 +++++++++++++++++++++++++++
 i18n/es_PA.csv                        | 23 ++++++-----
 i18n/es_PE.csv                        | 23 ++++++-----
 i18n/es_VE.csv                        | 23 ++++++-----
 i18n/fr_CA.csv                        | 23 ++++++-----
 i18n/fr_FR.csv                        | 31 +++++++--------
 i18n/it_CH.csv                        | 28 +++++++-------
 i18n/it_IT.csv                        | 23 ++++++-----
 18 files changed, 250 insertions(+), 213 deletions(-)

diff --git a/Model/Config/Source/PaymentAction.php b/Model/Config/Source/PaymentAction.php
index 9968b673..b66f776d 100644
--- a/Model/Config/Source/PaymentAction.php
+++ b/Model/Config/Source/PaymentAction.php
@@ -28,8 +28,8 @@ class PaymentAction implements \Magento\Framework\Data\OptionSourceInterface
     public function toOptionArray()
     {
         return [
-            ['value' => static::AUTHORIZE, 'label' => __('Charge on Shipment')],
-            ['value' => static::AUTHORIZE_AND_CAPTURE, 'label' => __('Charge on Order')],
+            ['value' => static::AUTHORIZE, 'label' => __('Charge when order is shipped')],
+            ['value' => static::AUTHORIZE_AND_CAPTURE, 'label' => __('Charge when order is placed')],
         ];
     }
 }
diff --git a/etc/adminhtml/system.xml b/etc/adminhtml/system.xml
index 7d4ec54d..b0c52027 100755
--- a/etc/adminhtml/system.xml
+++ b/etc/adminhtml/system.xml
@@ -67,7 +67,7 @@
                         <config_path>payment/amazon_payment_v2/merchant_id</config_path>
                         <depends><field id="active_v2">1</field></depends>
                     </field>
-                    <field id="store_id" translate="label" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="store_id" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Store Id</label>
                         <comment><![CDATA[Sometimes referred to as "Client ID" in Seller Central.]]></comment>
                         <config_path>payment/amazon_payment_v2/store_id</config_path>
@@ -86,7 +86,7 @@
                         <config_path>payment/amazon_payment/sandbox</config_path>
                         <depends><field id="active_v2">1</field></depends>
                     </field>
-                    <field id="ipn_url_v2" type="note" translate="label" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="ipn_url_v2" type="note" translate="label comment" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>IPN URL</label>
                         <frontend_model>Amazon\Pay\Block\Adminhtml\System\Config\Form\IpnUrl</frontend_model>
                         <comment><![CDATA[To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.]]></comment>
@@ -95,22 +95,22 @@
                 </group>
                 <group id="options" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Options</label>
-                    <field id="v2_lwa_enabled" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="v2_lwa_enabled" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Amazon Sign-in</label>
                         <source_model>Amazon\Pay\Model\Config\Source\EnabledDisabled</source_model>
                         <config_path>payment/amazon_payment_v2/lwa_enabled</config_path>
-                        <comment><![CDATA[Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.]]></comment>
+                        <comment><![CDATA[Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.]]></comment>
                     </field>
                     <field id="payment_action_v2" translate="label" type="select" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
-                        <label>Payment Action</label>
+                        <label>Payment</label>
                         <source_model>Amazon\Pay\Model\Config\Source\PaymentAction</source_model>
                         <config_path>payment/amazon_payment_v2/payment_action</config_path>
                     </field>
-                    <field id="multicurrency" translate="label" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="multicurrency" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Multi-currency Functionality</label>
+                        <comment><![CDATA[Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.]]></comment>
                         <source_model>Amazon\Pay\Model\Config\Source\EnabledDisabled</source_model>
                         <config_path>payment/amazon_payment/multicurrency</config_path>
-                        <comment><![CDATA["Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."]]></comment>
                     </field>
                     <field id="authorization_mode" translate="label" type="select" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Authorization Mode</label>
@@ -122,7 +122,7 @@
                     <label>Alexa Delivery Notifications</label>
                     <field id="active" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Alexa Delivery Notifications</label>
-                        <comment><![CDATA[Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see Setting up delivery notifications <a href="https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html" target="_blank">here</a> and supported carriers <a href="https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv" target="_blank">here</a>]]></comment>
+                        <comment><![CDATA[Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href="https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html" target="_blank">Setting up delivery notifications</a>, and <a href="https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv" target="_blank">supported carriers</a>.]]></comment>
                         <source_model>Amazon\Pay\Model\Config\Source\EnabledDisabled</source_model>
                         <config_path>payment/amazon_payment_v2/alexa_active</config_path>
                     </field>
@@ -233,7 +233,7 @@
                         </field>
                         <field id="checkout_result_return_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                             <label>Amazon checkout result return URL</label>
-                            <comment><![CDATA[<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.]]></comment>
+                            <comment><![CDATA[<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.]]></comment>
                             <config_path>payment/amazon_payment_v2/checkout_result_return_url</config_path>
                         </field>
                         <field id="sign_in_result_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
diff --git a/i18n/de_AT.csv b/i18n/de_AT.csv
index 92fdc4f3..e05abda2 100644
--- a/i18n/de_AT.csv
+++ b/i18n/de_AT.csv
@@ -85,7 +85,7 @@
 "I've already set up Amazon Pay with Magento and I want to edit my configuration.","Ich habe Amazon Pay bereits für Magento eingerichtet und möchte meine Konfiguration bearbeiten."
 "Back to account connection/registration","Zurück zur Kontoverknüpfung/Registrierung"
 "Updating your configuration with new keys...","Ihre Konfiguration wird mit neuen Schlüsseln aktualisiert..."
-"For easy setup and automatic transfer of your keys and IDs from your Amazon Pay merchant account to Magento, turn on Use Secure URLs in Admin under General > Web > Base URLs (secure).",Für eine einfache Einrichtung und automatische Übertragung Ihrer Schlüssel und IDs von Ihrem Amazon Payments-Händlerkonto zu Magento aktivieren Sie die Option Sichere URLs in Admin verwenden unter Allgemein> Web > Basis-URLs (sicher) ."
+"For easy setup and automatic transfer of your keys and IDs from your Amazon Pay merchant account to Magento, turn on Use Secure URLs in Admin under General > Web > Base URLs (secure).",Für eine einfache Einrichtung und automatische Übertragung Ihrer Schlüssel und IDs von Ihrem Amazon Payments-Händlerkonto zu Magento aktivieren Sie die Option Sichere URLs in Admin verwenden unter Allgemein > Web > Basis-URLs (sicher) ."
 "Paste JSON credentials here","JSON Zugangsdaten hier einfügen"
 "Save Credentials","Zugansdaten übernehmen"
 "Valid JSON credentials are required.","Gültige JSON Zugangsdaten werden benötigt."
@@ -125,6 +125,7 @@
 "Please select a payment method.","Wählen Sie eine Zahlungsweise aus."
 "Your session has expired, please reload the page and try again.","Ihre Sitzung ist abgelaufen. Bitte laden Sie die Seite erneut und versuchen Sie es noch einmal."
 "Return to standard checkout","Zum Standard Checkout zurückkehren"
+"Amazon Pay was unable to authenticate the payment instrument.  Please try again, or use a different payment method.","Beim Zahlungsvorgang ist ein Problem aufgetreten. Ihre Bestellung wurde nicht aufgegeben und Ihr Konto nicht belastet."
 "The SCA challenge was not completed successfully.  Please try again, or use a different payment method.","Mit dieser Zahlungsart ist ein Problem aufgetreten. Um Ihre Bestellung abzuschließen, wählen Sie bitte eine andere aus."
 "Your transaction with Amazon Pay is currently being validated. Please be aware that we will inform you shortly as needed.","Ihre Zahlung mit Amazon Pay ist derzeit noch in Prufung. Bitte beachten Sie, dass wir uns mit Ihnen in Kurze per Email in Verbindung setzen werden, falls noch Unklarheiten bestehen sollten."
 "In order to reset your password, please <a href=""%1"">Sign Out</a> and click on “Forgot Your Password?” from the Sign In page","Fall Sie ihr Passwort zurücksetzen möchten, <a href=""%1"">loggen Sie sich bitte aus</a> und klicken Sie auf der Anmeldeseite auf “Passwort vergessen”"
@@ -136,23 +137,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","leider hat Amazon Pay die Zahlung für Ihre Bestellung in unserem Online-Shop %storeName abgelehnt, bitte versuchen Sie die Bestellung mit einer anderen Zahlungsmethode erneut aufzugeben."
 "Kind regards","Mit freundlichen Grüßen"
 "Alexa Delivery Notifications","Alexa-Lieferbenachrichtigungen"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Hinweis: Wenn Sie Alexa-Lieferbenachrichtigungen aktivieren, sendet Amazon Pay Benachrichtigungen an das Alexa-Gerät der Kunden, wenn der Status der Bestellung Zustellung läuft oder Zugestellt lautet. Weitere Informationen finden Sie unter <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a> (in Englischer Sprache) und <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a> (in Englischer Sprache)."
 "Enabled","Aktiviert"
 "Disabled","Deaktiviert"
 "Private Key","Privater Schlüssel"
 "Upload options","Upload-Optionen"
-".pem file",".pem-Datei"
-"copy & paste","Kopieren und Einfügen"
-"The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again
-.","Der von Ihnen eingegebene private Schlüssel ist nicht gültig. Vergewissern Sie sich, dass Sie auch die Kopf- und Fußzeile des privaten Schlüssels kopieren und dass er aus 24 Zeichen besteht. Versuchen Sie es dann erneut."
+"Upload .pem file","Upload .pem-Datei"
+"Copy & Paste","Kopieren und Einfügen"
+"The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","Der von Ihnen eingegebene private Schlüssel ist nicht gültig. Stellen Sie sicher, dass Sie die Kopf- und Fußzeile des privaten Schlüssels mitkopieren, und versuchen Sie es erneut."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","Die von Ihnen eingegebene Public Key ID ist nicht gültig. Stellen Sie sicher, dass sie aus 24 Zeichen besteht und versuchen Sie es erneut."
-"Sometimes referred to as "Client ID" in Seller Central.","Wird in Seller Central manchmal als "Client-ID" bezeichnet."
+"Sometimes referred to as ""Client ID"" in Seller Central.","Wird in Seller Central manchmal als ""Client-ID"" bezeichnet."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","Die eingegebene Händler-ID ist ungültig. Stellen Sie sicher, dass sie aus 13 bis 14 Zeichen besteht, und versuchen Sie es erneut."
 "-- Choose region --","-- Region wählen --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Um Zahlungsbenachrichtigungen (Instant Payment Notifications, IPN) zu aktivieren, gehen Sie zu Seller Central, klicken Sie auf Einstellungen  Integrationseinstellungen Bearbeiten und fügen Sie dann die obige URL in das Feld Händler-URL ein. Klicken Sie dann auf Speichern.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Fremdwährungsfunktion"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Um Zahlungsbenachrichtigungen (Instant Payment Notifications, IPN) zu aktivieren, gehen Sie zu Seller Central, klicken Sie auf Einstellungen  Integrationseinstellungen Bearbeiten und fügen Sie dann die obige URL in das Feld Händler-URL ein. Klicken Sie dann auf Speichern."
+"Multi-currency Functionality","Fremdwährungsfunktion"
 "Amazon Sign-in","Anmelden mit Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Hinweis: Wenn Sie beide, Amazon-Anmeldung und Magento Guest Checkout, deaktiviert haben, können Ihre Kunden Amazon Pay erst verwenden, nachdem sie sich mit einem Magento-Konto angemeldet haben.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Hinweis: Wenn Sie beide Amazon-Anmeldung und Magento Guest Checkout, deaktiviert haben, können Ihre Kunden Amazon Pay erst verwenden, nachdem sie sich mit einem Magento-Konto angemeldet haben."
 "Immediate","Sofort"
 "Automatic","Automatisch"
 "Shipping Restrictions","Versandbeschränkungen"
@@ -161,16 +161,13 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.",""Hinweis: Wenn die Option aktiviert ist, erscheint Amazon Pay in der Liste der verfügbaren Zahlungsarten im letzten Schritt des Bezahlvorgangs.""
 "Sort Order","Ordina per"
 "Store Name","Shopname"
-"Restricted Product Categories","Engeschränkte Produktkategorien"
+"Restrict Product Categories","Engeschränkte Produktkategorien"
 "Restrict Post Office Boxes","Postfächer verbieten"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Hinweis: Wenn diese Option aktiviert ist, werden Lieferungen an Postfachadressen in den USA, CA, UK, FR, DE, ES, PT, IT, AU nicht akzeptiert."
 "Restrict Packstations","Packstationen verbieten"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Hinweis: Packstationen sind nur in Deutschland verfügbar. Wenn diese Option aktiviert ist, werden Lieferungen an Packstationen nicht unterstützt."
-"<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem Ihre Kunden ihre Zahlungsart und Lieferadresse ausgewählt haben, werden sie zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
 "Checkout Result URL Path","Percorso URL risultato pagamento"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
-"Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Geben Sie IP-Addessn durch Kommas getrennt ein.
-Hinweis: Der Amazon Pay-Button ist nur für Kunden mit entsprechenden IP-Adressen sichtbar.""
+"Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.","Geben Sie IP-Addessn durch Kommas getrennt ein. Hinweis: Der Amazon Pay-Button ist nur für Kunden mit entsprechenden IP-Adressen sichtbar."
 "Developer Logs","Entwickler-Logs"
 "Alexa Log","Alexa-Protokoll"
 "IPN Log","IPN-Protokoll"
@@ -185,11 +182,10 @@ Hinweis: Der Amazon Pay-Button ist nur für Kunden mit entsprechenden IP-Adresse
 "Captured amount of %1.","Eingezogener Betrag ist %1."
 "Authorized amount of %1.","Autorisierter Betrag ist %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay hat Versandinformationen für Transportdienstleister %1 mit der Sendungsverfolgungsnummer %2 erhalten."
-"Amazon Pay for Magento","Amazon Pay für Magento"
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Ermöglichen Sie einen vertrauten, schnellen Bezahlvorgang für Hunderte Millionen von Amazon Kunden weltweit"
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay für Magento</strong>Ermöglichen Sie einen vertrauten, schnellen Bezahlvorgang für Hunderte Millionen von Amazon Kunden weltweit.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Konfiguration zurücksetzen"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Die Amazon Pay-Konfiguration wird zurückgesetzt. Nachdem die Seite neu geladen wurde, klicken Sie auf Konfiguration/Registrierung starten."
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","<strong>Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","<strong>Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
 "Refund declined for order #%1","Erstattung für Bestellung #%1 wurde abgelehnt"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Hinweis: Amazon Pay unterstützt die Fremdwährungsfunktion nur für die Zahlungsregionen Vereinigtes Königreich und Euroraum. Unterstützte Währungen: AUD, GBP, DKK, EUR, HKD, JPY,  NZD, NOK, ZAR, SEK, CHF, USD."
diff --git a/i18n/de_CH.csv b/i18n/de_CH.csv
index c19ff5e2..e05abda2 100644
--- a/i18n/de_CH.csv
+++ b/i18n/de_CH.csv
@@ -85,7 +85,7 @@
 "I've already set up Amazon Pay with Magento and I want to edit my configuration.","Ich habe Amazon Pay bereits für Magento eingerichtet und möchte meine Konfiguration bearbeiten."
 "Back to account connection/registration","Zurück zur Kontoverknüpfung/Registrierung"
 "Updating your configuration with new keys...","Ihre Konfiguration wird mit neuen Schlüsseln aktualisiert..."
-"For easy setup and automatic transfer of your keys and IDs from your Amazon Pay merchant account to Magento, turn on Use Secure URLs in Admin under General > Web > Base URLs (secure).",Für eine einfache Einrichtung und automatische Übertragung Ihrer Schlüssel und IDs von Ihrem Amazon Payments-Händlerkonto zu Magento aktivieren Sie die Option Sichere URLs in Admin verwenden unter Allgemein> Web> Basis-URLs (sicher) ."
+"For easy setup and automatic transfer of your keys and IDs from your Amazon Pay merchant account to Magento, turn on Use Secure URLs in Admin under General > Web > Base URLs (secure).",Für eine einfache Einrichtung und automatische Übertragung Ihrer Schlüssel und IDs von Ihrem Amazon Payments-Händlerkonto zu Magento aktivieren Sie die Option Sichere URLs in Admin verwenden unter Allgemein > Web > Basis-URLs (sicher) ."
 "Paste JSON credentials here","JSON Zugangsdaten hier einfügen"
 "Save Credentials","Zugansdaten übernehmen"
 "Valid JSON credentials are required.","Gültige JSON Zugangsdaten werden benötigt."
@@ -125,6 +125,7 @@
 "Please select a payment method.","Wählen Sie eine Zahlungsweise aus."
 "Your session has expired, please reload the page and try again.","Ihre Sitzung ist abgelaufen. Bitte laden Sie die Seite erneut und versuchen Sie es noch einmal."
 "Return to standard checkout","Zum Standard Checkout zurückkehren"
+"Amazon Pay was unable to authenticate the payment instrument.  Please try again, or use a different payment method.","Beim Zahlungsvorgang ist ein Problem aufgetreten. Ihre Bestellung wurde nicht aufgegeben und Ihr Konto nicht belastet."
 "The SCA challenge was not completed successfully.  Please try again, or use a different payment method.","Mit dieser Zahlungsart ist ein Problem aufgetreten. Um Ihre Bestellung abzuschließen, wählen Sie bitte eine andere aus."
 "Your transaction with Amazon Pay is currently being validated. Please be aware that we will inform you shortly as needed.","Ihre Zahlung mit Amazon Pay ist derzeit noch in Prufung. Bitte beachten Sie, dass wir uns mit Ihnen in Kurze per Email in Verbindung setzen werden, falls noch Unklarheiten bestehen sollten."
 "In order to reset your password, please <a href=""%1"">Sign Out</a> and click on “Forgot Your Password?” from the Sign In page","Fall Sie ihr Passwort zurücksetzen möchten, <a href=""%1"">loggen Sie sich bitte aus</a> und klicken Sie auf der Anmeldeseite auf “Passwort vergessen”"
@@ -136,21 +137,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","leider hat Amazon Pay die Zahlung für Ihre Bestellung in unserem Online-Shop %storeName abgelehnt, bitte versuchen Sie die Bestellung mit einer anderen Zahlungsmethode erneut aufzugeben."
 "Kind regards","Mit freundlichen Grüßen"
 "Alexa Delivery Notifications","Alexa-Lieferbenachrichtigungen"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Hinweis: Wenn Sie Alexa-Lieferbenachrichtigungen aktivieren, sendet Amazon Pay Benachrichtigungen an das Alexa-Gerät der Kunden, wenn der Status der Bestellung Zustellung läuft oder Zugestellt lautet. Weitere Informationen finden Sie unter <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a> (in Englischer Sprache) und <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a> (in Englischer Sprache)."
 "Enabled","Aktiviert"
 "Disabled","Deaktiviert"
 "Private Key","Privater Schlüssel"
 "Upload options","Upload-Optionen"
-".pem file",".pem-Datei"
-"copy & paste","Kopieren und Einfügen"
-"The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","Der von Ihnen eingegebene private Schlüssel ist nicht gültig. Vergewissern Sie sich, dass Sie auch die Kopf- und Fußzeile des privaten Schlüssels kopieren und dass er aus 24Zeichen besteht. Versuchen Sie es dann erneut."
+"Upload .pem file","Upload .pem-Datei"
+"Copy & Paste","Kopieren und Einfügen"
+"The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","Der von Ihnen eingegebene private Schlüssel ist nicht gültig. Stellen Sie sicher, dass Sie die Kopf- und Fußzeile des privaten Schlüssels mitkopieren, und versuchen Sie es erneut."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","Die von Ihnen eingegebene Public Key ID ist nicht gültig. Stellen Sie sicher, dass sie aus 24 Zeichen besteht und versuchen Sie es erneut."
-"Sometimes referred to as "Client ID" in Seller Central.","Wird in Seller Central manchmal als "Client-ID" bezeichnet."
+"Sometimes referred to as ""Client ID"" in Seller Central.","Wird in Seller Central manchmal als ""Client-ID"" bezeichnet."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","Die eingegebene Händler-ID ist ungültig. Stellen Sie sicher, dass sie aus 13 bis 14 Zeichen besteht, und versuchen Sie es erneut."
 "-- Choose region --","-- Region wählen --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Um Zahlungsbenachrichtigungen (Instant Payment Notifications, IPN) zu aktivieren, gehen Sie zu Seller Central, klicken Sie auf Einstellungen  Integrationseinstellungen Bearbeiten und fügen Sie dann die obige URL in das Feld Händler-URL ein. Klicken Sie dann auf Speichern."                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Fremdwährungsfunktion"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Um Zahlungsbenachrichtigungen (Instant Payment Notifications, IPN) zu aktivieren, gehen Sie zu Seller Central, klicken Sie auf Einstellungen  Integrationseinstellungen Bearbeiten und fügen Sie dann die obige URL in das Feld Händler-URL ein. Klicken Sie dann auf Speichern."
+"Multi-currency Functionality","Fremdwährungsfunktion"
 "Amazon Sign-in","Anmelden mit Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Hinweis: Wenn Sie beide, Amazon-Anmeldung und Magento Guest Checkout, deaktiviert haben, können Ihre Kunden Amazon Pay erst verwenden, nachdem sie sich mit einem Magento-Konto angemeldet haben.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Hinweis: Wenn Sie beide Amazon-Anmeldung und Magento Guest Checkout, deaktiviert haben, können Ihre Kunden Amazon Pay erst verwenden, nachdem sie sich mit einem Magento-Konto angemeldet haben."
 "Immediate","Sofort"
 "Automatic","Automatisch"
 "Shipping Restrictions","Versandbeschränkungen"
@@ -159,15 +161,13 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.",""Hinweis: Wenn die Option aktiviert ist, erscheint Amazon Pay in der Liste der verfügbaren Zahlungsarten im letzten Schritt des Bezahlvorgangs.""
 "Sort Order","Ordina per"
 "Store Name","Shopname"
-"Restricted Product Categories","Engeschränkte Produktkategorien"
+"Restrict Product Categories","Engeschränkte Produktkategorien"
 "Restrict Post Office Boxes","Postfächer verbieten"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Hinweis: Wenn diese Option aktiviert ist, werden Lieferungen an Postfachadressen in den USA, CA, UK, FR, DE, ES, PT, IT, AU nicht akzeptiert."
 "Restrict Packstations","Packstationen verbieten"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Hinweis: Packstationen sind nur in Deutschland verfügbar. Wenn diese Option aktiviert ist, werden Lieferungen an Packstationen nicht unterstützt."
-"<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem Ihre Kunden ihre Zahlungsart und Lieferadresse ausgewählt haben, werden sie zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
 "Checkout Result URL Path","Percorso URL risultato pagamento"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
-"Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP  addresses.",""Geben Sie IP-Addessn durch Kommas getrennt ein. Hinweis: Der Amazon Pay-Button ist nur für Kunden mit entsprechenden IP-Adressen sichtbar."
+"Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.","Geben Sie IP-Addessn durch Kommas getrennt ein. Hinweis: Der Amazon Pay-Button ist nur für Kunden mit entsprechenden IP-Adressen sichtbar."
 "Developer Logs","Entwickler-Logs"
 "Alexa Log","Alexa-Protokoll"
 "IPN Log","IPN-Protokoll"
@@ -182,11 +182,10 @@
 "Captured amount of %1.","Eingezogener Betrag ist %1."
 "Authorized amount of %1.","Autorisierter Betrag ist %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay hat Versandinformationen für Transportdienstleister %1 mit der Sendungsverfolgungsnummer %2 erhalten."
-"Amazon Pay for Magento","Amazon Pay für Magento"
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Ermöglichen Sie einen vertrauten, schnellen Bezahlvorgang für Hunderte Millionen von Amazon Kunden weltweit"
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay für Magento</strong>Ermöglichen Sie einen vertrauten, schnellen Bezahlvorgang für Hunderte Millionen von Amazon Kunden weltweit.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Konfiguration zurücksetzen"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Die Amazon Pay-Konfiguration wird zurückgesetzt. Nachdem die Seite neu geladen wurde, klicken Sie auf Konfiguration/Registrierung starten."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","<strong>Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
 "Refund declined for order #%1","Erstattung für Bestellung #%1 wurde abgelehnt"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Hinweis: Amazon Pay unterstützt die Fremdwährungsfunktion nur für die Zahlungsregionen Vereinigtes Königreich und Euroraum. Unterstützte Währungen: AUD, GBP, DKK, EUR, HKD, JPY,  NZD, NOK, ZAR, SEK, CHF, USD."
diff --git a/i18n/de_DE.csv b/i18n/de_DE.csv
index 9ac0eee3..e05abda2 100644
--- a/i18n/de_DE.csv
+++ b/i18n/de_DE.csv
@@ -85,7 +85,7 @@
 "I've already set up Amazon Pay with Magento and I want to edit my configuration.","Ich habe Amazon Pay bereits für Magento eingerichtet und möchte meine Konfiguration bearbeiten."
 "Back to account connection/registration","Zurück zur Kontoverknüpfung/Registrierung"
 "Updating your configuration with new keys...","Ihre Konfiguration wird mit neuen Schlüsseln aktualisiert..."
-"For easy setup and automatic transfer of your keys and IDs from your Amazon Pay merchant account to Magento, turn on Use Secure URLs in Admin under General > Web > Base URLs (secure).",Für eine einfache Einrichtung und automatische Übertragung Ihrer Schlüssel und IDs von Ihrem Amazon Payments-Händlerkonto zu Magento aktivieren Sie die Option Sichere URLs in Admin verwenden unter Allgemein> Web> Basis-URLs (sicher) ."
+"For easy setup and automatic transfer of your keys and IDs from your Amazon Pay merchant account to Magento, turn on Use Secure URLs in Admin under General > Web > Base URLs (secure).",Für eine einfache Einrichtung und automatische Übertragung Ihrer Schlüssel und IDs von Ihrem Amazon Payments-Händlerkonto zu Magento aktivieren Sie die Option Sichere URLs in Admin verwenden unter Allgemein > Web > Basis-URLs (sicher) ."
 "Paste JSON credentials here","JSON Zugangsdaten hier einfügen"
 "Save Credentials","Zugansdaten übernehmen"
 "Valid JSON credentials are required.","Gültige JSON Zugangsdaten werden benötigt."
@@ -137,22 +137,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","leider hat Amazon Pay die Zahlung für Ihre Bestellung in unserem Online-Shop %storeName abgelehnt, bitte versuchen Sie die Bestellung mit einer anderen Zahlungsmethode erneut aufzugeben."
 "Kind regards","Mit freundlichen Grüßen"
 "Alexa Delivery Notifications","Alexa-Lieferbenachrichtigungen"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Hinweis: Wenn Sie Alexa-Lieferbenachrichtigungen aktivieren, sendet Amazon Pay Benachrichtigungen an das Alexa-Gerät der Kunden, wenn der Status der Bestellung Zustellung läuft oder Zugestellt lautet. Weitere Informationen finden Sie unter <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a> (in Englischer Sprache) und <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a> (in Englischer Sprache)."
 "Enabled","Aktiviert"
 "Disabled","Deaktiviert"
 "Private Key","Privater Schlüssel"
 "Upload options","Upload-Optionen"
-".pem file",".pem-Datei"
-"copy & paste","Kopieren und Einfügen"
-"The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","Der von Ihnen eingegebene private Schlüssel ist nicht gültig. Vergewissern Sie sich, dass Sie auch die Kopf- und Fußzeile des privaten Schlüssels kopieren und dass er aus 24Zeichen besteht. Versuchen Sie es dann erneut."
+"Upload .pem file","Upload .pem-Datei"
+"Copy & Paste","Kopieren und Einfügen"
+"The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","Der von Ihnen eingegebene private Schlüssel ist nicht gültig. Stellen Sie sicher, dass Sie die Kopf- und Fußzeile des privaten Schlüssels mitkopieren, und versuchen Sie es erneut."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","Die von Ihnen eingegebene Public Key ID ist nicht gültig. Stellen Sie sicher, dass sie aus 24 Zeichen besteht und versuchen Sie es erneut."
-"Sometimes referred to as "Client ID" in Seller Central.","Wird in Seller Central manchmal als "Client-ID" bezeichnet."
+"Sometimes referred to as ""Client ID"" in Seller Central.","Wird in Seller Central manchmal als ""Client-ID"" bezeichnet."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","Die eingegebene Händler-ID ist ungültig. Stellen Sie sicher, dass sie aus 13 bis 14 Zeichen besteht, und versuchen Sie es erneut."
 "-- Choose region --","-- Region wählen --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Um Zahlungsbenachrichtigungen (Instant Payment Notifications, IPN) zu aktivieren, gehen Sie zu Seller Central, klicken Sie auf Einstellungen  Integrationseinstellungen Bearbeiten und fügen Sie dann die obige URL in das Feld Händler-URL ein. Klicken Sie dann auf Speichern.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Fremdwährungsfunktion"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Um Zahlungsbenachrichtigungen (Instant Payment Notifications, IPN) zu aktivieren, gehen Sie zu Seller Central, klicken Sie auf Einstellungen  Integrationseinstellungen Bearbeiten und fügen Sie dann die obige URL in das Feld Händler-URL ein. Klicken Sie dann auf Speichern."
+"Multi-currency Functionality","Fremdwährungsfunktion"
 "Amazon Sign-in","Anmelden mit Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Hinweis: Wenn Sie beide, Amazon-Anmeldung und Magento Guest Checkout, deaktiviert haben, können Ihre Kunden Amazon Pay erst verwenden, nachdem sie sich mit einem Magento-Konto angemeldet haben.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Hinweis: Wenn Sie beide Amazon-Anmeldung und Magento Guest Checkout, deaktiviert haben, können Ihre Kunden Amazon Pay erst verwenden, nachdem sie sich mit einem Magento-Konto angemeldet haben."
 "Immediate","Sofort"
 "Automatic","Automatisch"
 "Shipping Restrictions","Versandbeschränkungen"
@@ -161,16 +161,13 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.",""Hinweis: Wenn die Option aktiviert ist, erscheint Amazon Pay in der Liste der verfügbaren Zahlungsarten im letzten Schritt des Bezahlvorgangs.""
 "Sort Order","Ordina per"
 "Store Name","Shopname"
-"Restricted Product Categories","Engeschränkte Produktkategorien"
+"Restrict Product Categories","Engeschränkte Produktkategorien"
 "Restrict Post Office Boxes","Postfächer verbieten"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Hinweis: Wenn diese Option aktiviert ist, werden Lieferungen an Postfachadressen in den USA, CA, UK, FR, DE, ES, PT, IT, AU nicht akzeptiert."
 "Restrict Packstations","Packstationen verbieten"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Hinweis: Packstationen sind nur in Deutschland verfügbar. Wenn diese Option aktiviert ist, werden Lieferungen an Packstationen nicht unterstützt."
-"<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem Ihre Kunden ihre Zahlungsart und Lieferadresse ausgewählt haben, werden sie zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
 "Checkout Result URL Path","Percorso URL risultato pagamento"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
-"Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Geben Sie IP-Addessn durch Kommas getrennt ein.
-Hinweis: Der Amazon Pay-Button ist nur für Kunden mit entsprechenden IP-Adressen sichtbar.""
+"Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.","Geben Sie IP-Addessn durch Kommas getrennt ein. Hinweis: Der Amazon Pay-Button ist nur für Kunden mit entsprechenden IP-Adressen sichtbar."
 "Developer Logs","Entwickler-Logs"
 "Alexa Log","Alexa-Protokoll"
 "IPN Log","IPN-Protokoll"
@@ -185,11 +182,10 @@ Hinweis: Der Amazon Pay-Button ist nur für Kunden mit entsprechenden IP-Adresse
 "Captured amount of %1.","Eingezogener Betrag ist %1."
 "Authorized amount of %1.","Autorisierter Betrag ist %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay hat Versandinformationen für Transportdienstleister %1 mit der Sendungsverfolgungsnummer %2 erhalten."
-"Amazon Pay for Magento","Amazon Pay für Magento"
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Ermöglichen Sie einen vertrauten, schnellen Bezahlvorgang für Hunderte Millionen von Amazon Kunden weltweit"
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay für Magento</strong>Ermöglichen Sie einen vertrauten, schnellen Bezahlvorgang für Hunderte Millionen von Amazon Kunden weltweit.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Konfiguration zurücksetzen"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Die Amazon Pay-Konfiguration wird zurückgesetzt. Nachdem die Seite neu geladen wurde, klicken Sie auf Konfiguration/Registrierung starten."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","<strong>Ändern Sie diesen Wert nur bei Bedarf. Unsachgemäße Änderungen können zu einer fehlerhaften Integration führen. Nachdem die Bestellung abgeschlossen ist, werden Ihre Kunden zu dieser URL weitergeleitet. Tragen Sie keinen vorangestellten Schrägstrich ein."
 "Refund declined for order #%1","Erstattung für Bestellung #%1 wurde abgelehnt"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Hinweis: Amazon Pay unterstützt die Fremdwährungsfunktion nur für die Zahlungsregionen Vereinigtes Königreich und Euroraum. Unterstützte Währungen: AUD, GBP, DKK, EUR, HKD, JPY,  NZD, NOK, ZAR, SEK, CHF, USD."
diff --git a/i18n/es_AR.csv b/i18n/es_AR.csv
index 9d4db61b..5ca8e41f 100644
--- a/i18n/es_AR.csv
+++ b/i18n/es_AR.csv
@@ -138,22 +138,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
 "Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
 "Enabled","Activado"
 "Disabled","Desactivado"
 "Private Key","Clave privada"
 "Upload options","Opciones de carga"
-".pem file","Archivo .pem"
-"copy & paste","Copiar y pegar"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
-"Sometimes referred to as "Client ID" in Seller Central.","A veces se denomina "identificador del cliente" en Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
 "-- Choose region --","-- Elige la región --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funcionalidad multidivisa"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
 "Amazon Sign-in","Inicia sesión con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restricciones de envío"
@@ -162,14 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
 "Sort Order","Orden"
 "Store Name","Nombre de la tienda"
-"Restricted Product Categories","Categorías de productos restringidas"
+"Restrict Product Categories","Categorías de productos restringidas"
 "Restrict Post Office Boxes","Restringir apartados de correos"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
 "Restrict Packstations","Restringir Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
 "Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
 Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
 "Developer Logs","Registros de desarrollador"
@@ -186,12 +186,11 @@ Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direccione
 "Captured amount of %1.","Importe capturado de %1."
 "Authorized amount of %1.","Importe autorizado de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
-"Amazon Pay for Magento","Amazon Pay para Magento
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Restablecer configuración"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/es_CL.csv b/i18n/es_CL.csv
index da61f111..5ca8e41f 100644
--- a/i18n/es_CL.csv
+++ b/i18n/es_CL.csv
@@ -101,7 +101,8 @@
 "* Required Fields","* Campos obligatorios"
 "Password","Contraseña"
 "Ok","Aceptar"
-"Forgot Your Password?","¿Has olvidado la contraseña?""The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","La clave privada que has introducido no es válida. Asegúrate de que incluye el encabezado y el pie de página de la clave privada e inténtalo de nuevo."
+"Forgot Your Password?","¿Has olvidado la contraseña?"
+"The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","La clave privada que has introducido no es válida. Asegúrate de que incluye el encabezado y el pie de página de la clave privada e inténtalo de nuevo."
 "Login with Amazon available in authentication popup","Login con Amazon disponible en la ventana emergente de iniciar sesión"
 "You will be redirected shortly...","En breve serás redirigido a una nueva página..."
 "If you are not redirected automatically, try refreshing the page, or return to your cart and use another payment method.","Si no fueses redirigido automáticamente, intenta refrescar la página o vuelve al carro de compra y utiliza otro medio de pago."
@@ -137,22 +138,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
 "Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
 "Enabled","Activado"
 "Disabled","Desactivado"
 "Private Key","Clave privada"
 "Upload options","Opciones de carga"
-".pem file","Archivo .pem"
-"copy & paste","Copiar y pegar"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
-"Sometimes referred to as "Client ID" in Seller Central.","A veces se denomina "identificador del cliente" en Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
 "-- Choose region --","-- Elige la región --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funcionalidad multidivisa"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
 "Amazon Sign-in","Inicia sesión con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restricciones de envío"
@@ -161,14 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
 "Sort Order","Orden"
 "Store Name","Nombre de la tienda"
-"Restricted Product Categories","Categorías de productos restringidas"
+"Restrict Product Categories","Categorías de productos restringidas"
 "Restrict Post Office Boxes","Restringir apartados de correos"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
 "Restrict Packstations","Restringir Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
 "Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
 Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
 "Developer Logs","Registros de desarrollador"
@@ -185,12 +186,11 @@ Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direccione
 "Captured amount of %1.","Importe capturado de %1."
 "Authorized amount of %1.","Importe autorizado de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
-"Amazon Pay for Magento","Amazon Pay para Magento
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Restablecer configuración"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/es_CO.csv b/i18n/es_CO.csv
index 005ecd39..5ca8e41f 100644
--- a/i18n/es_CO.csv
+++ b/i18n/es_CO.csv
@@ -138,22 +138,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
 "Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
 "Enabled","Activado"
 "Disabled","Desactivado"
 "Private Key","Clave privada"
 "Upload options","Opciones de carga"
-".pem file","Archivo .pem"
-"copy & paste","Copiar y pegar"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
-"Sometimes referred to as "Client ID" in Seller Central.","A veces se denomina "identificador del cliente" en Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
 "-- Choose region --","-- Elige la región --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funcionalidad multidivisa"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
 "Amazon Sign-in","Inicia sesión con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restricciones de envío"
@@ -162,15 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
 "Sort Order","Orden"
 "Store Name","Nombre de la tienda"
-"Restricted Product Categories","Categorías de productos restringidas"
+"Restrict Product Categories","Categorías de productos restringidas"
 "Restrict Post Office Boxes","Restringir apartados de correos"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
 "Restrict Packstations","Restringir Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
-"<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la
- integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
 "Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
 Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
 "Developer Logs","Registros de desarrollador"
@@ -187,12 +186,11 @@ Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direccione
 "Captured amount of %1.","Importe capturado de %1."
 "Authorized amount of %1.","Importe autorizado de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
-"Amazon Pay for Magento","Amazon Pay para Magento
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Restablecer configuración"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/es_CR.csv b/i18n/es_CR.csv
index 573de1d0..5ca8e41f 100644
--- a/i18n/es_CR.csv
+++ b/i18n/es_CR.csv
@@ -138,21 +138,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
 "Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
 "Enabled","Activado"
 "Disabled","Desactivado"
 "Private Key","Clave privada"
 "Upload options","Opciones de carga"
-".pem file","Archivo .pem"
-"copy & paste","Copiar y pegar"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
-"Sometimes referred to as "Client ID" in Seller Central.","A veces se denomina "identificador del cliente" en Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
 "-- Choose region --","-- Elige la región --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."                                                                                                                                                                                              ""
-"Multi-currency Funtionality","Funcionalidad multidivisa"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
 "Amazon Sign-in","Inicia sesión con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restricciones de envío"
@@ -161,14 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
 "Sort Order","Orden"
 "Store Name","Nombre de la tienda"
-"Restricted Product Categories","Categorías de productos restringidas"
+"Restrict Product Categories","Categorías de productos restringidas"
 "Restrict Post Office Boxes","Restringir apartados de correos"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
 "Restrict Packstations","Restringir Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
 "Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
 Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
 "Developer Logs","Registros de desarrollador"
@@ -185,12 +186,11 @@ Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direccione
 "Captured amount of %1.","Importe capturado de %1."
 "Authorized amount of %1.","Importe autorizado de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
-"Amazon Pay for Magento","Amazon Pay para Magento
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Restablecer configuración"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/es_ES.csv b/i18n/es_ES.csv
index 9d4db61b..5ca8e41f 100644
--- a/i18n/es_ES.csv
+++ b/i18n/es_ES.csv
@@ -138,22 +138,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
 "Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
 "Enabled","Activado"
 "Disabled","Desactivado"
 "Private Key","Clave privada"
 "Upload options","Opciones de carga"
-".pem file","Archivo .pem"
-"copy & paste","Copiar y pegar"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
-"Sometimes referred to as "Client ID" in Seller Central.","A veces se denomina "identificador del cliente" en Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
 "-- Choose region --","-- Elige la región --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funcionalidad multidivisa"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
 "Amazon Sign-in","Inicia sesión con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restricciones de envío"
@@ -162,14 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
 "Sort Order","Orden"
 "Store Name","Nombre de la tienda"
-"Restricted Product Categories","Categorías de productos restringidas"
+"Restrict Product Categories","Categorías de productos restringidas"
 "Restrict Post Office Boxes","Restringir apartados de correos"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
 "Restrict Packstations","Restringir Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
 "Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
 Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
 "Developer Logs","Registros de desarrollador"
@@ -186,12 +186,11 @@ Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direccione
 "Captured amount of %1.","Importe capturado de %1."
 "Authorized amount of %1.","Importe autorizado de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
-"Amazon Pay for Magento","Amazon Pay para Magento
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Restablecer configuración"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/es_MX.csv b/i18n/es_MX.csv
index c94fe1d9..5ca8e41f 100644
--- a/i18n/es_MX.csv
+++ b/i18n/es_MX.csv
@@ -102,6 +102,7 @@
 "Password","Contraseña"
 "Ok","Aceptar"
 "Forgot Your Password?","¿Has olvidado la contraseña?"
+"The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","La clave privada que has introducido no es válida. Asegúrate de que incluye el encabezado y el pie de página de la clave privada e inténtalo de nuevo."
 "Login with Amazon available in authentication popup","Login con Amazon disponible en la ventana emergente de iniciar sesión"
 "You will be redirected shortly...","En breve serás redirigido a una nueva página..."
 "If you are not redirected automatically, try refreshing the page, or return to your cart and use another payment method.","Si no fueses redirigido automáticamente, intenta refrescar la página o vuelve al carro de compra y utiliza otro medio de pago."
@@ -136,5 +137,60 @@
 "Valued customer","Estimado cliente"
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
+"Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
+"Enabled","Activado"
+"Disabled","Desactivado"
+"Private Key","Clave privada"
+"Upload options","Opciones de carga"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
+"Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
+"The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
+"The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
+"-- Choose region --","-- Elige la región --"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
+"Amazon Sign-in","Inicia sesión con Amazon"
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
+"Immediate","Immediata"
+"Automatic","Automatica"
+"Shipping Restrictions","Restricciones de envío"
+"Amazon Pay button on product page","Botón de Amazon Pay en la página del producto"
+"Amazon Pay in final checkout step","Amazon Pay en el último paso antes de completar la compra"
+"Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
+"Sort Order","Orden"
+"Store Name","Nombre de la tienda"
+"Restrict Product Categories","Categorías de productos restringidas"
+"Restrict Post Office Boxes","Restringir apartados de correos"
+"Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
+"Restrict Packstations","Restringir Packstation"
+"Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
+"<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
+"Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
+Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
+"Developer Logs","Registros de desarrollador"
+"Alexa Log","Registro de Alexa"
+"IPN Log","Registro de IPN"
+"Client Log","Registro de cliente"
+"No logs available","No hay registros disponibles"
+"Something went wrong. Choose another payment method for checkout and try again.","Se ha producido un error. Elige otro método de pago para completar la compra e inténtalo de nuevo."
+"Failed to complete the Amazon Pay checkout","No se ha podido completar el pago con Amazon Pay"
+"Charge declined for order #%1","Captura del pedido n.º %1 rechazada"
+"If you experience consistent errors during key transfer, click Amazon Pay for Magento 2 for detailed instructions.","Si experimentas errores continuos durante el proceso de transferencia de claves, haz clic en Amazon Pay para Magento 2 para obtener instrucciones detalladas."
+"Failed to enable Amazon Pay","No se ha podido activar Amazon Pay"
+"The refund through Amazon Pay was successful.","El reembolso a través de Amazon Pay se ha realizado correctamente."
+"Captured amount of %1.","Importe capturado de %1."
+"Authorized amount of %1.","Importe autorizado de %1."
+"Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
+"An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
+"Reset configuration","Restablecer configuración"
+"Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/es_PA.csv b/i18n/es_PA.csv
index 9d4db61b..5ca8e41f 100644
--- a/i18n/es_PA.csv
+++ b/i18n/es_PA.csv
@@ -138,22 +138,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
 "Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
 "Enabled","Activado"
 "Disabled","Desactivado"
 "Private Key","Clave privada"
 "Upload options","Opciones de carga"
-".pem file","Archivo .pem"
-"copy & paste","Copiar y pegar"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
-"Sometimes referred to as "Client ID" in Seller Central.","A veces se denomina "identificador del cliente" en Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
 "-- Choose region --","-- Elige la región --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funcionalidad multidivisa"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
 "Amazon Sign-in","Inicia sesión con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restricciones de envío"
@@ -162,14 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
 "Sort Order","Orden"
 "Store Name","Nombre de la tienda"
-"Restricted Product Categories","Categorías de productos restringidas"
+"Restrict Product Categories","Categorías de productos restringidas"
 "Restrict Post Office Boxes","Restringir apartados de correos"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
 "Restrict Packstations","Restringir Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
 "Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
 Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
 "Developer Logs","Registros de desarrollador"
@@ -186,12 +186,11 @@ Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direccione
 "Captured amount of %1.","Importe capturado de %1."
 "Authorized amount of %1.","Importe autorizado de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
-"Amazon Pay for Magento","Amazon Pay para Magento
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Restablecer configuración"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/es_PE.csv b/i18n/es_PE.csv
index dd624d7e..5ca8e41f 100644
--- a/i18n/es_PE.csv
+++ b/i18n/es_PE.csv
@@ -138,22 +138,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
 "Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
 "Enabled","Activado"
 "Disabled","Desactivado"
 "Private Key","Clave privada"
 "Upload options","Opciones de carga"
-".pem file","Archivo .pem"
-"copy & paste","Copiar y pegar"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
-"Sometimes referred to as "Client ID" in Seller Central.","A veces se denomina "identificador del cliente" en Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
 "-- Choose region --","-- Elige la región --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funcionalidad multidivisa"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
 "Amazon Sign-in","Inicia sesión con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restricciones de envío"
@@ -162,14 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
 "Sort Order","Orden"
 "Store Name","Nombre de la tienda"
-"Restricted Product Categories","Categorías de productos restringidas"
+"Restrict Product Categories","Categorías de productos restringidas"
 "Restrict Post Office Boxes","Restringir apartados de correos"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
 "Restrict Packstations","Restringir Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
 "Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
 Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
 "Developer Logs","Registros de desarrollador"
@@ -186,12 +186,11 @@ Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direccione
 "Captured amount of %1.","Importe capturado de %1."
 "Authorized amount of %1.","Importe autorizado de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
-"Amazon Pay for Magento","Amazon Pay para Magento
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Restablecer configuración"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/es_VE.csv b/i18n/es_VE.csv
index 9d4db61b..5ca8e41f 100644
--- a/i18n/es_VE.csv
+++ b/i18n/es_VE.csv
@@ -138,22 +138,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Desafortunadamente Amazon Pay ha rechazado el pago de tu compra en nuestra tienda online %storeName, por favor intente realizar la compra de nuevo con otro metodo de pago."
 "Kind regards","Un cordial saludo"
 "Alexa Delivery Notifications","Notificaciones de entrega de Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: Si habilitas las notificaciones de entrega de Alexa, Amazon Pay enviará notificaciones al dispositivo Alexa del cliente cuando el pedido esté en reparto, así como cuando esté entregado. Para obtener más información, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurar notificaciones de entrega</a> y <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">transportistas compatibles</a>."
 "Enabled","Activado"
 "Disabled","Desactivado"
 "Private Key","Clave privada"
 "Upload options","Opciones de carga"
-".pem file","Archivo .pem"
-"copy & paste","Copiar y pegar"
+"Upload .pem file","Archivo .pem de carga"
+"Copy & Paste","Copiar y pegar"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","La clave privada que has introducido no es válida. Asegúrate de copiar también el encabezado y el pie de página de la clave privada y de que contiene 24 caracteres, e inténtalo de nuevo."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","El Public Key ID que has introducido no es válido. Asegúrate de que contiene 24 caracteres e inténtalo de nuevo."
-"Sometimes referred to as "Client ID" in Seller Central.","A veces se denomina "identificador del cliente" en Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A veces se denomina ""identificador del cliente"" en Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","El identificador de vendedor que has introducido no es válido. Asegúrate de que contiene de 13 a 14 caracteres e inténtalo de nuevo."
 "-- Choose region --","-- Elige la región --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.",""Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar.
-""                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funcionalidad multidivisa"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Para activar las notificaciones inmediatas de pago (IPN), dirígete a Seller Central, haz clic en Configuración > Configuración de integración > Editar y, a continuación, pega la URL que aparece arriba en el campo URL del vendedor y haz clic en Guardar."
+"Multi-currency Functionality","Funcionalidad multidivisa"
 "Amazon Sign-in","Inicia sesión con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.",""Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento.""
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: Si has desactivado ambos, Inicio de sesión de Amazon y Paso por caja como invitado de Magento, tus clientes solo podrán usar Amazon Pay si han iniciado sesión con una cuenta de Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restricciones de envío"
@@ -162,14 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Cuando esté activado, Amazon Pay aparecerá en la lista de métodos de pago disponibles en el último paso antes de completar la compra."
 "Sort Order","Orden"
 "Store Name","Nombre de la tienda"
-"Restricted Product Categories","Categorías de productos restringidas"
+"Restrict Product Categories","Categorías de productos restringidas"
 "Restrict Post Office Boxes","Restringir apartados de correos"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: Cuando esté activado, no se aceptarán direcciones de apartados de correos de EE. UU., Canadá, Reino Unido, Francia, Alemania, España, Portugal, Italia y Australia."
 "Restrict Packstations","Restringir Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: Packstation solo está disponible en Alemania. Cuando esté activado, no se aceptarán direcciones de Packstation."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Una vez que el cliente haya elegido el método de pago y la dirección de entrega, se le redirigirá a esta URL. No incluyas una barra diagonal al principio."
 "Checkout Result URL Path","Ruta de la URL de resultado al completar la compra"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.",""Las direcciones IP deben introducirse separadas por comas.
 Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direcciones IP correspondientes.""
 "Developer Logs","Registros de desarrollador"
@@ -186,12 +186,11 @@ Nota: El botón de Amazon Pay solo podrán verlo los clientes con las direccione
 "Captured amount of %1.","Importe capturado de %1."
 "Authorized amount of %1.","Importe autorizado de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha recibido información de envío del transportista %1 con el número de seguimiento %2."
-"Amazon Pay for Magento","Amazon Pay para Magento
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay para Magento</strong>Habilita un paso por caja rápido y familiar para cientos de millones de clientes activos de Amazon en todo el mundo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Restablecer configuración"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Restableciendo la configuración de Amazon Pay. Cuando se haya recargado la página, haz clic en Iniciar configuración/registro."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
+"Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","Solo debes cambiar este valor si es necesario. Las modificaciones inadecuadas pueden interrumpir la integración. Cuando se haya completado el pedido, se redirigirá al cliente a esta URL. No incluyas una barra diagonal al principio."
 "Refund declined for order #%1","Reembolso del pedido n.º %1 rechazado"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: Amazon Pay solo admite la funcionalidad multidivisas en las regiones de pago del Reino Unido y la Eurozona. Divisas admitidas: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD."
 "You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Vas a registrar o a conectarte a una cuenta de %1. basada en la divisa de visualización del ámbito de tu tienda. Para obtener más información, consulta Amazon Pay para Magento 2"
diff --git a/i18n/fr_CA.csv b/i18n/fr_CA.csv
index bf571bb7..21a7673e 100644
--- a/i18n/fr_CA.csv
+++ b/i18n/fr_CA.csv
@@ -138,22 +138,22 @@
 "Kind regards","Bien Cordialement"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Réinitialisation de la configuration d'Amazon Pay. Une fois la page rechargée, cliquez sur Démarrer la configuration/l'enregistrement."
 "Alexa Delivery Notifications","Notifications de livraison Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Remarque : Si vous activez les notifications de livraison Alexa, Amazon Pay enverra des notifications à l'appareil Alexa du client lorsque la commande est en cours de livraison et lorsqu'elle est livrée. Pour plus d'informations, consultez <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurer les notifications de livraison</a> et <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">Transporteurs pris en charge</a>."
 "Enabled","Activé",
 "Disabled","Désactivé"
 "Private Key","Clé privée"
 "Upload options","Options de chargement"
-".pem file","fichier .pem"
-"copy & paste","copier-coller"
+"Upload .pem file","fichier .pem de chargement"
+"Copy & Paste","copier-coller"
 "The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","La clé privée que vous avez saisie n'est pas valide. Vérifiez que vous avez inclus l'en-tête et le pied de page de la clé privée, puis réessayez."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","Le Public Key ID que vous avez saisi n'est pas valide. Assurez-vous qu'il contient 24caractères, puis réessayez."
-"Sometimes referred to as "Client ID" in Seller Central.","Parfois appelé Identifiant du client dans Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","Parfois appelé « Identifiant du client » dans Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","L'ID marchand que vous avez saisi n'est pas valide. Assurez-vous qu'il contient 13 à 14caractères, puis réessayez."
 "-- Choose region --","-- Sélectionnez la région --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and
-then paste the above URL in the Merchant URL field, and click Save.","Pour activer les notifications de paiement instantané (IPN), accédez à Seller Central, cliquez sur Paramètres > Paramètres d'intégration > Modifier, puis collez l'URL ci-dessus dans le champ URL du vendeur, puis cliquez sur Enregistrer."
-"Multi-currency Funtionality","Fonction multidevise"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Pour activer les notifications de paiement instantané (IPN), accédez à Seller Central, cliquez sur Paramètres > Paramètres d'intégration > Modifier, puis collez l'URL ci-dessus dans le champ URL du vendeur, puis cliquez sur Enregistrer."
+"Multi-currency Functionality","Fonction multidevise"
 "Amazon Sign-in","Identifiez-vous avec Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Remarque: Si vous avez désactivé à la fois Amazon Sign-in et  Magento Guest Checkout, vos clients ne pourront utiliser Amazon Pay qu'après s'être connectés avec un compte Magento."
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Remarque : Si vous avez désactivé à la fois Amazon Sign-in et Magento Guest Checkout, vos clients ne pourront utiliser Amazon Pay qu'après s'être connectés avec un compte Magento."
 "Immediate","Immédiat"
 "Automatic","Automatique"
 "Shipping Restrictions","Restrictions d'expédition"
@@ -162,14 +162,14 @@ then paste the above URL in the Merchant URL field, and click Save.","Pour activ
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Remarque: Lorsque cette option est activée, Amazon Pay apparaîtra dans la liste des moyens de paiement disponibles lors de la dernière étape du paiement."
 "Sort Order","Trier les commandes"
 "Store Name","Nom de la boutique"
-"Restricted Product Categories","Catégories de produits soumis à restrictions"
+"Restrict Product Categories","Catégories de produits soumis à restrictions"
 "Restrict Post Office Boxes","Limiter les boîtes postales"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Remarque: Lorsque cette option est activée, les adresses des boîtes postales aux États-Unis, au Canada, au Royaume-Uni, en France, en Allemagne, en Espagne, au Portugal, en Italie et en Australie ne sont pas acceptées."
 "Restrict Packstations","Limiter les Packstations"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Remarque: Les Packstations sont uniquement disponibles en Allemagne. Lorsque cette option est activée, les adresses Packstation ne sont pas acceptées."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Modifiez cette valeur uniquement si nécessaire. Des modifications incorrectes peuvent casser l'intégration. Une fois que votre client a choisi son moyen de paiement et son adresse de livraison, il est redirigé vers cette URL. N'entrez pas de barre oblique."
-"Checkout Result URL Path","Chemin de l'URL de résultat du paiement"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifiez cette valeur uniquement si nécessaire. Des modifications incorrectes peuvent casser l'intégration. Une fois la commande passée, votre client est redirigé vers cette URL. N'entrez pas de barre oblique."
+"Magento Checkout result URL Path","Chemin de l'URL de résultat du paiement"
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifiez cette valeur uniquement si nécessaire. Des modifications incorrectes peuvent casser l'intégration. Une fois la commande passée, votre client est redirigé vers cette URL. N'entrez pas de barre oblique."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.","Saisissez des adresses IP séparées par des virgules. Remarque: Le bouton Amazon Pay sera visible uniquement par les clients à qui appartiennent ces adresses IP."
 "Developer Logs","Journaux des développeurs"
 "Alexa Log","Journal Alexa"
@@ -186,8 +186,7 @@ then paste the above URL in the Merchant URL field, and click Save.","Pour activ
 "Captured amount of %1.","Montant saisi de %1."
 "Authorized amount of %1.","Montant autorisé de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay a reçu des informations d'expédition pour le transporteur %1 avec le numéro de suivi %2."
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Offrez une solution de paiement rapide et connue à des centaines de millions de clients Amazon actifs dans le monde entier."
-"Amazon Pay for Magento","Amazon Pay pour Magento"
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay pour Magento</strong>Offrez une solution de paiement rapide et connue à des centaines de millions de clients Amazon actifs dans le monde entier.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La devise de base définie pour votre boutique n'est pas prise en charge. Pour plus d'informations, consultez Amazon Pay pour Magento 2"
 "In order to enable automatic account configuration using Amazon's secure key exchange, please turn on secure admin pages in General > Web > Use secure URLs in Admin.","Pour faciliter la configuration et le transfert automatique de vos clés et identifiants de votre compte marchand Amazon Payments vers Magento, activez Use Secure URLs in Admin (Utiliser des URL sécurisées dans Admin) sous Général > Web > Base URLs (secure) (URL de base sécurisées)."
 "Reset configuration","Réinitialiser la configuration"
diff --git a/i18n/fr_FR.csv b/i18n/fr_FR.csv
index e038c2de..21a7673e 100644
--- a/i18n/fr_FR.csv
+++ b/i18n/fr_FR.csv
@@ -68,13 +68,13 @@
 "A comma-separated list of case-insensitive terms which will be used to check whether a Customer Address is a locker or packing station.","Liste séparée par des virgules de termes ne tenant pas compte des majuscules et des minuscules, qui sera utilisée pour vérifier si l'adresse d'un client est un casier ou un lieu de conditionnement."
 "Excluded Categories","Catégories exclues"
 "The ""Amazon Pay"" button will not be available for products of the selected categories.","Le bouton Amazon Pay ne sera pas disponible pour les produits des catégories sélectionnées."
-"Developer Options","Options pour le développeur"
+"Developer Options","Options de développeur"
 "Logging","Journalisation"
 "Allowed IPs","IP autorisées"
 "Comma separated. The ""Login with Amazon"" and ""Amazon Pay"" buttons will <em>only</em> be rendered for clients having the above IPs.
                             If the field is empty, the buttons will be visible to all clients.","Séparée par des virgules. Les boutons Connectez-vous avec Amazon et Amazon Pay seront intégrés <em>uniquement</em> pour les clients aux IP ci-dessus.
                             Si le champ est vide, les boutons seront visibles par tous les clients."
-"Module version","Version du Module"
+"Module version","Version du module"
 "--","--"
 "Amazon Pay button in minicart","Bouton Amazon Pay dans le mini-panier"
 "The base currency set for your store isn't supported. For more information, see Amazon Pay for Magento 2.","La devise de base définie pour votre boutique n'est pas prise en charge. Pour plus d'informations, consultez Amazon Pay pour Magento 2."
@@ -90,11 +90,10 @@
 "Save Credentials","Enregistrer les informations d'identification"
 "Valid JSON credentials are required.","Des informations d'identification JSON valides sont requises."
 "Action unavailable","Action non disponible"
-"An error occurred while matching your Amazon account with your store account. ","Erreur lors du traitement de l'identifiant Amazon"
+"An error occurred while matching your Amazon account with your store account. ","Une erreur s'est produite lors de l’association de votre compte Amazon à votre compte de boutique. "
 "A shop account for this email address already exists. Please enter your shop accounts password to log in without leaving the shop.","Un compte pour cette boutique existe déjà avec cette adresse e-mail. Saisissez le mot de passe du compte de cette boutique afin de vous connecter sans quitter la boutique."
 "Login with Amazon","Connectez-vous avec Amazon"
 "With Amazon Pay and Amazon Sign-in, you can easily sign-in and use the shipping and payment information stored in your Amazon account to place an order on this shop.","Amazon Pay et Identifiez-vous avec Amazon vous permet d'utiliser les informations de paiement et d'expédition stockées dans votre compte Amazon pour passer une commande sur ce site Web."
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Remarque: Si vous avez désactivé à la fois Amazon Sign-in et  Magento Guest Checkout, vos clients ne pourront utiliser Amazon Pay qu'après s'être connectés avec un compte Magento."
 "Securely login into our website using your existing Amazon details.","Connectez-vous en toute sécurité à notre site Web à l'aide de vos identifiants Amazon existants."
 "Welcome back!","Bienvenue!"
 "Continue as Guest","Continuer en tant qu'invité"
@@ -110,7 +109,7 @@
 "Amazon capture declined : %1","Amazon Pay a rejeté la saisie. Code du motif: %1"
 "Amazon capture invalid state : %1 with reason %2","État imprévu pour la saisie d'Amazon Pay. État: %1; code du motif: %2"
 "Amazon refund invalid state : %1 with reason %2","État imprévu pour le remboursement d'Amazon Pay. État: %1; code du motif: %2"
-"The store doesn't support the country that was entered. To review allowed countries, go to General > General > Allow Countries list. Enter a supported country and try again. ","Le pays associé à votre adresse n'est pas autorisé pour ce site."
+"The store doesn't support the country that was entered. To review allowed countries, go to General > General > Allow Countries list. Enter a supported country and try again. ","La boutique ne prend pas en charge le pays saisi. Pour connaître les pays autorisés, rendez-vous sur Général > Général > Allow Countries list (Liste des pays autorisés). Saisissez un pays pris en charge, puis réessayez. "
 "Unfortunately it is not possible to use Amazon Pay for this order, please choose another payment method.","Nous sommes désolés, mais vous ne pouvez pas utiliser Amazon Pay pour cette commande. Sélectionnez un autre mode paiement."
 "There has been a problem with the selected payment method on your Amazon account. Please choose another one.","Nous sommes désolés, mais un problème s'est produit avec le mode de paiement sélectionné sur votre compte Amazon. Sélectionnez un autre mode paiement."
 "The currency selected is not supported by Amazon Pay","La devise sélectionnée n'est pas prise en charge par Amazon Pay sur ce site."
@@ -119,7 +118,7 @@
 "Capture declined","Saisie rejetée"
 "Capture declined for Order <a href=""%2"">#%1</a>","Saisie rejetée pour la commande <a href=""%2"">#%1</a>"
 "Capture pending approval from the payment gateway","Saisie en attente d'approbation du portail de paiement. Veuillez réessayer ultérieurement."
-"Could not find the ""multiline_count"" config of the ""street"" Customer address attribute.","Impossible de trouver la configuration «multiline_count de l'attribut «rue de l'adresse du client."
+"Could not find the ""multiline_count"" config of the ""street"" Customer address attribute.","Impossible de trouver la configuration multiline_count de l'attribut rue de l'adresse du client."
 "Are you an Amazon customer? Pay now with address and payment details stored in your Amazon account.","Vous êtes client Amazon? Payez désormais avec les informations de paiement et les coordonnées stockées dans votre compte Amazon."
 "Simulate Payment Scenarios","Simuler des scénarios de paiement"
 "Amazon could not process your request.","Amazon Pay n'a pas pu traiter votre demande. Veuillez réessayer."
@@ -139,21 +138,22 @@
 "Kind regards","Bien Cordialement"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Réinitialisation de la configuration d'Amazon Pay. Une fois la page rechargée, cliquez sur Démarrer la configuration/l'enregistrement."
 "Alexa Delivery Notifications","Notifications de livraison Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Remarque : Si vous activez les notifications de livraison Alexa, Amazon Pay enverra des notifications à l'appareil Alexa du client lorsque la commande est en cours de livraison et lorsqu'elle est livrée. Pour plus d'informations, consultez <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurer les notifications de livraison</a> et <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">Transporteurs pris en charge</a>."
 "Enabled","Activé",
 "Disabled","Désactivé"
 "Private Key","Clé privée"
 "Upload options","Options de chargement"
-".pem file","fichier .pem"
-"copy & paste","copier-coller"
+"Upload .pem file","fichier .pem de chargement"
+"Copy & Paste","copier-coller"
 "The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","La clé privée que vous avez saisie n'est pas valide. Vérifiez que vous avez inclus l'en-tête et le pied de page de la clé privée, puis réessayez."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","Le Public Key ID que vous avez saisi n'est pas valide. Assurez-vous qu'il contient 24caractères, puis réessayez."
-"Sometimes referred to as "Client ID" in Seller Central.","Parfois appelé Identifiant du client dans Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","Parfois appelé « Identifiant du client » dans Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","L'ID marchand que vous avez saisi n'est pas valide. Assurez-vous qu'il contient 13 à 14caractères, puis réessayez."
 "-- Choose region --","-- Sélectionnez la région --"
 "To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Pour activer les notifications de paiement instantané (IPN), accédez à Seller Central, cliquez sur Paramètres > Paramètres d'intégration > Modifier, puis collez l'URL ci-dessus dans le champ URL du vendeur, puis cliquez sur Enregistrer."
-"Multi-currency Funtionality","Fonction multidevise"
+"Multi-currency Functionality","Fonction multidevise"
 "Amazon Sign-in","Identifiez-vous avec Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use   Amazon Pay after they signed in with a Magento account.","Remarque: Si vous avez désactivé à la fois Amazon Sign-in et  Magento Guest Checkout, vos clients ne pourront utiliser Amazon Pay qu'après s'être connectés avec un compte Magento."
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Remarque : Si vous avez désactivé à la fois Amazon Sign-in et Magento Guest Checkout, vos clients ne pourront utiliser Amazon Pay qu'après s'être connectés avec un compte Magento."
 "Immediate","Immédiat"
 "Automatic","Automatique"
 "Shipping Restrictions","Restrictions d'expédition"
@@ -162,14 +162,14 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Remarque: Lorsque cette option est activée, Amazon Pay apparaîtra dans la liste des moyens de paiement disponibles lors de la dernière étape du paiement."
 "Sort Order","Trier les commandes"
 "Store Name","Nom de la boutique"
-"Restricted Product Categories","Catégories de produits soumis à restrictions"
+"Restrict Product Categories","Catégories de produits soumis à restrictions"
 "Restrict Post Office Boxes","Limiter les boîtes postales"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Remarque: Lorsque cette option est activée, les adresses des boîtes postales aux États-Unis, au Canada, au Royaume-Uni, en France, en Allemagne, en Espagne, au Portugal, en Italie et en Australie ne sont pas acceptées."
 "Restrict Packstations","Limiter les Packstations"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Remarque: Les Packstations sont uniquement disponibles en Allemagne. Lorsque cette option est activée, les adresses Packstation ne sont pas acceptées."
 "<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Modifiez cette valeur uniquement si nécessaire. Des modifications incorrectes peuvent casser l'intégration. Une fois que votre client a choisi son moyen de paiement et son adresse de livraison, il est redirigé vers cette URL. N'entrez pas de barre oblique."
-"Checkout Result URL Path","Chemin de l'URL de résultat du paiement"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifiez cette valeur uniquement si nécessaire. Des modifications incorrectes peuvent casser l'intégration. Une fois la commande passée, votre client est redirigé vers cette URL. N'entrez pas de barre oblique."
+"Magento Checkout result URL Path","Chemin de l'URL de résultat du paiement"
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifiez cette valeur uniquement si nécessaire. Des modifications incorrectes peuvent casser l'intégration. Une fois la commande passée, votre client est redirigé vers cette URL. N'entrez pas de barre oblique."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.","Saisissez des adresses IP séparées par des virgules. Remarque: Le bouton Amazon Pay sera visible uniquement par les clients à qui appartiennent ces adresses IP."
 "Developer Logs","Journaux des développeurs"
 "Alexa Log","Journal Alexa"
@@ -186,8 +186,7 @@
 "Captured amount of %1.","Montant saisi de %1."
 "Authorized amount of %1.","Montant autorisé de %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay a reçu des informations d'expédition pour le transporteur %1 avec le numéro de suivi %2."
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Offrez une solution de paiement rapide et connue à des centaines de millions de clients Amazon actifs dans le monde entier."
-"Amazon Pay for Magento","Amazon Pay pour Magento"
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay pour Magento</strong>Offrez une solution de paiement rapide et connue à des centaines de millions de clients Amazon actifs dans le monde entier.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La devise de base définie pour votre boutique n'est pas prise en charge. Pour plus d'informations, consultez Amazon Pay pour Magento 2"
 "In order to enable automatic account configuration using Amazon's secure key exchange, please turn on secure admin pages in General > Web > Use secure URLs in Admin.","Pour faciliter la configuration et le transfert automatique de vos clés et identifiants de votre compte marchand Amazon Payments vers Magento, activez Use Secure URLs in Admin (Utiliser des URL sécurisées dans Admin) sous Général > Web > Base URLs (secure) (URL de base sécurisées)."
 "Reset configuration","Réinitialiser la configuration"
diff --git a/i18n/it_CH.csv b/i18n/it_CH.csv
index e3236ac0..a7061a2d 100644
--- a/i18n/it_CH.csv
+++ b/i18n/it_CH.csv
@@ -1,4 +1,4 @@
-ress","Modifica Indirizzo di Spedizione"
+"Edit Shipping Address","Modifica Indirizzo di Spedizione"
 "Edit Billing Address","Modifica Indirizzo di Fatturazione"
 "Edit Payment Method","Modifica Metodo di Pagamento"
 "Billing address associated with this payment method:","Indirizzo di Fatturazione associato a questo metodo di pagamento:"
@@ -78,7 +78,7 @@ ress","Modifica Indirizzo di Spedizione"
 "--","--"
 "Amazon Pay button in minicart","Pulsante Amazon Pay nel mini-carrello"
 "The base currency set for your store isn't supported. For more information, see Amazon Pay for Magento 2.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2."
-"You'll be connecting/registering a US account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Effettuerai la connessione/registrazione di un account statunitense in base alla valuta di visualizzazione del tuo negozio. Per maggiori informazioni, consulta Amazon Pay for Magento 2."
+"You'll be connecting/registering a %1 account based on your display currency of your store scope. For more information, see Amazon Pay for Magento 2.","Effettuerai la connessione/registrazione di un account %1 in base alla valuta di visualizzazione del tuo negozio. Per maggiori informazioni, consulta Amazon Pay for Magento 2."
 "Start account connection/registration","Inizia connessione/registrazione account"
 "My account is ready, I need to connect it to Magento","Il mio account è pronto, devo associarlo a Magento"
 "or","o"
@@ -137,21 +137,22 @@ ress","Modifica Indirizzo di Spedizione"
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Siamo spiacenti di comunicarvi che Amazon Pay ha declinato il pagamento per il tuo ordine nel nostro negozio online %storeName, vi preghiamo di riprovare con un altro metodo di pagamento."
 "Kind regards","Cordiali saluti"
 "Alexa Delivery Notifications","Notifiche di consegna Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: se abiliti le notifiche di consegna Alexa, Amazon Pay invierà notifiche al il dispositivo Alexa del cliente quando l'ordine è in consegna e quando è consegnato. Per maggiori informazioni, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurazione delle notifiche di spedizione</a>, e <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">corrieri supportati</a>."
 "Enabled","Abilitato"
 "Disabled","Disabilitato"
 "Private Key","Chiave privata"
 "Upload options","Opzioni di caricamento"
-".pem file","File .pem"
-"copy & paste","copia e incolla"
+"Upload .pem file","File .pem di caricamento"
+"Copy & Paste","copia e incolla"
 "The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","La chiave privata che hai inserito non è valida. Assicurati che includa l'intestazione e la parte finale della chiave privata, quindi riprova."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","Il Public Key ID che hai inserito non è valido. Assicurati che contenga 24 caratteri e riprova."
-"Sometimes referred to as "Client ID" in Seller Central.","A volte è indicato come "client ID" su Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A volte è indicato come ""client ID"" su Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","L’ID venditore che hai inserito non è valido. Assicurati che contenga 13 o 14 caratteri, quindi riprova."
 "-- Choose region --","-- Scegli l'area --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.","Per abilitare le notifiche di pagamento istantanee, accedi a Seller Central, clicca su Impostazioni > Impostazioni di integrazione > Modifica, quindi incolla l'URL sopra riportato nel campo URL venditore e clicca Salva."                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funzione multivaluta"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Per abilitare le notifiche di pagamento istantanee, accedi a Seller Central, clicca su Impostazioni > Impostazioni di integrazione > Modifica, quindi incolla l'URL sopra riportato nel campo URL venditore e clicca Salva."
+"Multi-currency Functionality","Funzione multivaluta"
 "Amazon Sign-in","Accedi con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: se hai disabilitato sia l'accesso Amazon sia il pagamento Magento come ospite, i tuoi clienti potranno utilizzare Amazon Pay solo dopo aver effettuato l'accesso con un account Magento."
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: se hai disabilitato sia l'accesso Amazon sia il pagamento Magento come ospite, i tuoi clienti potranno utilizzare Amazon Pay solo dopo aver effettuato l'accesso con un account Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restrizioni sulle spedizioni"
@@ -160,14 +161,13 @@ ress","Modifica Indirizzo di Spedizione"
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Se abilitato, Amazon Pay verrà visualizzato nell'elenco dei metodi di pagamento disponibili nella fase finale del pagamento."
 "Sort Order","Ordina per"
 "Store Name","Nome negozio"
-"Restricted Product Categories","Categorie di prodotti con restrizioni"
+"Restrict Product Categories","Categorie di prodotti con restrizioni"
 "Restrict Post Office Boxes","Limita le caselle postali"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: se abilitati, gli indirizzi delle caselle postali negli Stati Uniti, Canada, Regno Unito, Francia, Germania, Spagna, Portogallo, Italia, Australia non sono accettati."
 "Restrict Packstations","Limita le Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: le Packstation sono disponibili solo in Germania. Se abilitati, gli indirizzi delle Packstation non sono accettati."
-"<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Dopo che il cliente ha scelto il metodo di pagamento e l'indirizzo di consegna, verrà reindirizzato a questo URL. Non inserire una barra iniziale."
 "Checkout Result URL Path","Percorso URL risultato pagamento"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Una volta completato l'ordine, il cliente verrà reindirizzato a questo URL. Non inserire una barra iniziale."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Una volta completato l'ordine, il cliente verrà reindirizzato a questo URL. Non inserire una barra iniziale."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.","Inserisci gli IP separati da virgole. Nota: il pulsante Amazon Pay sarà visibile solo ai clienti con indirizzi IP corrispondenti."
 "Developer Logs","Registro degli sviluppatori"
 "Alexa Log","Registro Alexa"
@@ -183,10 +183,10 @@ ress","Modifica Indirizzo di Spedizione"
 "Captured amount of %1.","Importo acquisito di %1."
 "Authorized amount of %1.","Importo autorizzato di %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha ricevuto informazioni sulla spedizione per il corriere %1 con numero di tracciabilità %2."
-"Amazon Pay for Magento","Amazon Pay per Magento"
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Offri un metodo di pagamento rapido e familiare a centinaia di milioni di clienti Amazon attivi in tutto il mondo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay per Magento</strong>Offri un metodo di pagamento rapido e familiare a centinaia di milioni di clienti Amazon attivi in tutto il mondo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Ripristina configurazione"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Ripristino della configurazione di Amazon Pay. Dopo aver ricaricato la pagina, clicca su Avvia configurazione/registrazione."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Una volta completato l'ordine, il cliente verrà reindirizzato a questo URL. Non inserire una barra iniziale."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Una volta completato l'ordine, il cliente verrà reindirizzato a questo URL. Non inserire una barra iniziale."
 "Refund declined for order #%1","Rimborso rifiutato per l'ordine #%1"
+"Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: se abilitati, gli indirizzi delle caselle postali negli Stati Uniti, Canada, Regno Unito, Francia, Germania, Spagna, Portogallo, Italia, Australia non sono accettati."
diff --git a/i18n/it_IT.csv b/i18n/it_IT.csv
index 3626774d..a7061a2d 100644
--- a/i18n/it_IT.csv
+++ b/i18n/it_IT.csv
@@ -137,21 +137,22 @@
 "Unfortunately Amazon Pay declined the payment for your order in our online shop %storeName, please try placing the order again with another payment method.","Siamo spiacenti di comunicarvi che Amazon Pay ha declinato il pagamento per il tuo ordine nel nostro negozio online %storeName, vi preghiamo di riprovare con un altro metodo di pagamento."
 "Kind regards","Cordiali saluti"
 "Alexa Delivery Notifications","Notifiche di consegna Alexa"
+"Note: If you enable Alexa Delivery Notifications, Amazon Pay will send notifications to the customer’s Alexa device when the order is out for delivery and when it’s delivered. For more information, see <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Setting up delivery notifications</a>, and <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">supported carriers</a>.","Nota: se abiliti le notifiche di consegna Alexa, Amazon Pay invierà notifiche al il dispositivo Alexa del cliente quando l'ordine è in consegna e quando è consegnato. Per maggiori informazioni, consulta <a href=""https://amazonpaylegacyintegrationguide.s3.amazonaws.com/docs/amazon-pay-onetime/delivery-notifications.html"" target=""_blank"">Configurazione delle notifiche di spedizione</a>, e <a href=""https://eps-eu-external-file-share.s3.eu-central-1.amazonaws.com/Alexa/Delivery+Notifications/amazon-pay-delivery-tracker-supported-carriers-v2.csv"" target=""_blank"">corrieri supportati</a>."
 "Enabled","Abilitato"
 "Disabled","Disabilitato"
 "Private Key","Chiave privata"
 "Upload options","Opzioni di caricamento"
-".pem file","File .pem"
-"copy & paste","copia e incolla"
+"Upload .pem file","File .pem di caricamento"
+"Copy & Paste","copia e incolla"
 "The Private Key you've entered isn't valid. Make sure it includes the Private Key's header and footer, then try again.","La chiave privata che hai inserito non è valida. Assicurati che includa l'intestazione e la parte finale della chiave privata, quindi riprova."
 "The Public Key ID you've entered isn't valid. Make sure it holds 24 characters and try again.","Il Public Key ID che hai inserito non è valido. Assicurati che contenga 24 caratteri e riprova."
-"Sometimes referred to as "Client ID" in Seller Central.","A volte è indicato come "client ID" su Seller Central."
+"Sometimes referred to as ""Client ID"" in Seller Central.","A volte è indicato come ""client ID"" su Seller Central."
 "The Merchant ID you've entered isn't valid. Make sure it contains 13 to 14 characters, then try again.","L’ID venditore che hai inserito non è valido. Assicurati che contenga 13 o 14 caratteri, quindi riprova."
 "-- Choose region --","-- Scegli l'area --"
-"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and  then paste the above URL in the Merchant URL field, and click Save.","Per abilitare le notifiche di pagamento istantanee, accedi a Seller Central, clicca su Impostazioni > Impostazioni di integrazione > Modifica, quindi incolla l'URL sopra riportato nel campo URL venditore e clicca Salva."                                                                                                                                                                                               ""
-"Multi-currency Funtionality","Funzione multivaluta"
+"To enable instant payment notifications (IPN), go to Seller Central, click Settings > Integration Settings > Edit, and then paste the above URL in the Merchant URL field, and click Save.","Per abilitare le notifiche di pagamento istantanee, accedi a Seller Central, clicca su Impostazioni > Impostazioni di integrazione > Modifica, quindi incolla l'URL sopra riportato nel campo URL venditore e clicca Salva."
+"Multi-currency Functionality","Funzione multivaluta"
 "Amazon Sign-in","Accedi con Amazon"
-"Note: If you've disabled both, Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: se hai disabilitato sia l'accesso Amazon sia il pagamento Magento come ospite, i tuoi clienti potranno utilizzare Amazon Pay solo dopo aver effettuato l'accesso con un account Magento."
+"Note: If you've disabled both Amazon Sign-in and Magento Guest Checkout, your customers will only be able to use Amazon Pay after they signed in with a Magento account.","Nota: se hai disabilitato sia l'accesso Amazon sia il pagamento Magento come ospite, i tuoi clienti potranno utilizzare Amazon Pay solo dopo aver effettuato l'accesso con un account Magento."
 "Immediate","Immediata"
 "Automatic","Automatica"
 "Shipping Restrictions","Restrizioni sulle spedizioni"
@@ -160,14 +161,13 @@
 "Note: When enabled, Amazon Pay will appear in the list of available payment methods at the final checkout step.","Nota: Se abilitato, Amazon Pay verrà visualizzato nell'elenco dei metodi di pagamento disponibili nella fase finale del pagamento."
 "Sort Order","Ordina per"
 "Store Name","Nome negozio"
-"Restricted Product Categories","Categorie di prodotti con restrizioni"
+"Restrict Product Categories","Categorie di prodotti con restrizioni"
 "Restrict Post Office Boxes","Limita le caselle postali"
 "Note: When enabled, post office box addresses in US, CA, UK, FR, DE, ES, PT, IT, AU aren't accepted.","Nota: se abilitati, gli indirizzi delle caselle postali negli Stati Uniti, Canada, Regno Unito, Francia, Germania, Spagna, Portogallo, Italia, Australia non sono accettati."
 "Restrict Packstations","Limita le Packstation"
 "Note: Packstations are only available in Germany. When enabled, Packstation addresses aren't accepted.","Nota: le Packstation sono disponibili solo in Germania. Se abilitati, gli indirizzi delle Packstation non sono accettati."
-"<strong>Only change this value if required. Improper modifications can break the integration. After your customer chose their payment method and delivery address, they will be redirected to this URL. Don't enter a leading slash.","Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Dopo che il cliente ha scelto il metodo di pagamento e l'indirizzo di consegna, verrà reindirizzato a questo URL. Non inserire una barra iniziale."
 "Checkout Result URL Path","Percorso URL risultato pagamento"
-"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, you  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Una volta completato l'ordine, il cliente verrà reindirizzato a questo URL. Non inserire una barra iniziale."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your  customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Una volta completato l'ordine, il cliente verrà reindirizzato a questo URL. Non inserire una barra iniziale."
 "Enter IPs seperated by commas. Note: The Amazon Pay button will only be visible to clients with corresponding IP addresses.","Inserisci gli IP separati da virgole. Nota: il pulsante Amazon Pay sarà visibile solo ai clienti con indirizzi IP corrispondenti."
 "Developer Logs","Registro degli sviluppatori"
 "Alexa Log","Registro Alexa"
@@ -183,11 +183,10 @@
 "Captured amount of %1.","Importo acquisito di %1."
 "Authorized amount of %1.","Importo autorizzato di %1."
 "Amazon Pay has received shipping information for carrier %1 with tracking number %2.","Amazon Pay ha ricevuto informazioni sulla spedizione per il corriere %1 con numero di tracciabilità %2."
-"Amazon Pay for Magento","Amazon Pay per Magento"
-"Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.","Offri un metodo di pagamento rapido e familiare a centinaia di milioni di clienti Amazon attivi in tutto il mondo."
+"<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay for Magento</strong>Enable a familiar, fast checkout for hundreds of millions of active Amazon customers globally.</div>","<div class=""amazon-pay-logo""></div><div class=""amazon-payment-byline""><strong>Amazon Pay per Magento</strong>Offri un metodo di pagamento rapido e familiare a centinaia di milioni di clienti Amazon attivi in tutto il mondo.</div>"
 "An unsupported currency is currently selected. Please review our configuration guide.","La valuta base impostata per il tuo negozio non è supportata. Per maggiori informazioni, consulta Amazon Pay for Magento 2"
 "Reset configuration","Ripristina configurazione"
 "Resetting the Amazon Pay configuration. After the page reloaded, click Start configuration/registration.","Ripristino della configurazione di Amazon Pay. Dopo aver ricaricato la pagina, clicca su Avvia configurazione/registrazione."
-"Only change this value if required. Improper modifications can break the integration. After the order is complete, you customer will be redirected to this URL. Don't enter a leading slash.","Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Una volta completato l'ordine, il cliente verrà reindirizzato a questo URL. Non inserire una barra iniziale."
+"<strong>Only change this value if required. Improper modifications can break the integration. After the order is complete, your customer will be redirected to this URL. Don't enter a leading slash.","<strong>Modifica questo valore solo se necessario. Le modifiche improprie possono danneggiare l'integrazione. Una volta completato l'ordine, il cliente verrà reindirizzato a questo URL. Non inserire una barra iniziale."
 "Refund declined for order #%1","Rimborso rifiutato per l'ordine #%1"
 "Note: Amazon Pay only supports multi-currency functionality for the payment regions United Kingdom and Euro region. Supported currencies: AUD, GBP, DKK, EUR, HKD, JPY, NZD, NOK, ZAR, SEK, CHF, USD.","Nota: se abilitati, gli indirizzi delle caselle postali negli Stati Uniti, Canada, Regno Unito, Francia, Germania, Spagna, Portogallo, Italia, Australia non sono accettati."

From 2e45591dd809a406eb02b0ea9a9df04c363a8f87 Mon Sep 17 00:00:00 2001
From: Spencer Gabhart <sgabhart2230@gmail.com>
Date: Fri, 22 Apr 2022 07:10:39 -0400
Subject: [PATCH 19/23] MFTF updates for Amazon popup behavior/experiment

---
 .../ActionGroup/AmazonCheckoutActionGroup.xml | 23 +++++-----
 .../ActionGroup/AmazonLoginActionGroup.xml    |  9 +---
 .../AmazonLoginAndCheckoutActionGroup.xml     | 23 +++++-----
 .../Mftf-23/Section/AmazonCheckoutSection.xml |  2 +-
 Test/Mftf-23/Section/AmazonPageSection.xml    |  2 +
 ...=> AmazonBillingAddressVisibilityTest.xml} |  0
 .../Test/AmazonCheckoutPayNowDeclinedTest.xml | 10 +++--
 .../Test/AmazonShippingAddressTest.xml        |  7 ++-
 .../ActionGroup/AmazonCheckoutActionGroup.xml | 16 +++++--
 .../ActionGroup/AmazonLoginActionGroup.xml    |  2 +-
 .../AmazonLoginAndCheckoutActionGroup.xml     | 18 +++++---
 Test/Mftf-24/Helper/LoadAddresses.php         | 30 +++++++++++++
 .../Mftf-24/Helper/SecureSignInWorkaround.php | 10 ++---
 .../Helper/UseAddressOrPaymentMethod.php      | 27 ++++++++++++
 .../Mftf-24/Section/AmazonCheckoutSection.xml |  2 +-
 Test/Mftf-24/Section/AmazonPageSection.xml    |  3 +-
 .../AmazonBillingAddressVisibilityTest.xml    | 43 +++++++++++++++++++
 Test/Mftf-24/Test/AmazonCancelReturnUrl.xml   |  2 +-
 .../Test/AmazonCheckoutPayNowDeclinedTest.xml |  9 ++--
 .../Test/AmazonShippingAddressTest.xml        |  7 ++-
 20 files changed, 185 insertions(+), 60 deletions(-)
 rename Test/Mftf-23/Test/{AmazonBillingFormVisibilityTest.xml => AmazonBillingAddressVisibilityTest.xml} (100%)
 create mode 100644 Test/Mftf-24/Helper/LoadAddresses.php
 create mode 100644 Test/Mftf-24/Helper/UseAddressOrPaymentMethod.php
 create mode 100644 Test/Mftf-24/Test/AmazonBillingAddressVisibilityTest.xml

diff --git a/Test/Mftf-23/ActionGroup/AmazonCheckoutActionGroup.xml b/Test/Mftf-23/ActionGroup/AmazonCheckoutActionGroup.xml
index 259f0e3c..c3f06cef 100644
--- a/Test/Mftf-23/ActionGroup/AmazonCheckoutActionGroup.xml
+++ b/Test/Mftf-23/ActionGroup/AmazonCheckoutActionGroup.xml
@@ -6,6 +6,12 @@
             <argument name="openerName" type="string"/>
         </arguments>
 
+        <!-- Load address list in DOM -->
+        <waitForElementVisible selector="{{AmazonPageSection.changeAddressButton}}" stepKey="waitForChangeAddressButton"/>
+        <click selector="{{AmazonPageSection.changeAddressButton}}" stepKey="clickChangeAddress"/>
+        <waitForElementVisible selector="{{AmazonPageSection.addressBackButton}}" stepKey="waitForAddressBackButton"/>
+        <click selector="{{AmazonPageSection.addressBackButton}}" stepKey="clickAddressBackButton"/>
+
         <!--Get shipping address information-->
         <grabAttributeFrom selector="{{AmazonPageSection.addressId}}" userInput="data-address_id" stepKey="amazonAddressId"/>
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-name_on_address" stepKey="amazonAddressName"/>
@@ -17,18 +23,13 @@
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-country" stepKey="amazonAddressCountryCode"/>
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-phone_number" stepKey="amazonAddressPhoneNumber"/>
 
-        <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) {
-            $changePaymentSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.changePaymentButton}}');
-            $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($changePaymentSelector));
-            $usePaymentSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.usePaymentButton}}');
-            $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($usePaymentSelector));
-        }" stepKey="allowPaymentMethodsToLoad" />
-
         <!-- choose card -->
-        <waitForJS function="return document.querySelectorAll('#maxo_payment_methods .a-radio-label').length > 0;" time="30" stepKey="waitForPaymentMethodRadioButtons"/>
-        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangeAddress"/>
-        <executeJS function="document.querySelectorAll('#maxo_payment_methods .a-radio-label').forEach(function(v,i,o) { if (v.querySelector('.trail_number').innerText.includes('{{cc}}')) { v.click() } });" stepKey="executeJsCc"/>
-        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.changePaymentButton}}" stepKey="waitForChangePaymentButton"/>
+        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangePaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.paymentMethodRadioButton(cc)}}" stepKey="waitForPaymentMethods"/>
+        <click selector="{{AmazonPageSection.paymentMethodRadioButton(cc)}}" stepKey="clickPaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.usePaymentButton}}" stepKey="waitForUsePaymentMethodButton"/>
+        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethodButton"/>
 
         <!--Go back to checkout-->
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="waitForAmazonCheckoutButton"/>
diff --git a/Test/Mftf-23/ActionGroup/AmazonLoginActionGroup.xml b/Test/Mftf-23/ActionGroup/AmazonLoginActionGroup.xml
index b66dcc27..8bb17e0b 100644
--- a/Test/Mftf-23/ActionGroup/AmazonLoginActionGroup.xml
+++ b/Test/Mftf-23/ActionGroup/AmazonLoginActionGroup.xml
@@ -10,7 +10,7 @@
         <wait time="1" stepKey="allowButtonToActivate"/>
 
         <executeInSelenium function="function (\Facebook\WebDriver\Remote\RemoteWebDriver $remoteWebDriver) use ($I, $openerName) {
-            $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('#maxo_buy_now input[type=submit]'));
+            $continueAs = $remoteWebDriver->findElements(\Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.continueButton}}'));
 
             if (!empty($continueAs)) {
                 $I->comment('Click Continue as... button and return to checkout');
@@ -26,13 +26,6 @@
                 
                 $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
                 $I->switchToNextTab();
-                $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
-
-                $changePaymentSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.changePaymentButton}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($changePaymentSelector));
-                $usePaymentSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.usePaymentButton}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($usePaymentSelector));
             }
         }" stepKey="secureSignInWorkaround" />
 
diff --git a/Test/Mftf-23/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml b/Test/Mftf-23/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
index 3ec886bd..95349f78 100644
--- a/Test/Mftf-23/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
+++ b/Test/Mftf-23/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
@@ -44,16 +44,15 @@
                 
                 $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::numberOfWindowsToBe(2));
                 $I->switchToNextTab();
-                $addressIdSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.addressId}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($addressIdSelector));
-
-                $changePaymentSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.changePaymentButton}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::elementToBeClickable($changePaymentSelector));
-                $usePaymentSelector = \Facebook\WebDriver\WebDriverBy::cssSelector('{{AmazonPageSection.usePaymentButton}}');
-                $remoteWebDriver->wait(30, 100)->until(\Facebook\WebDriver\WebDriverExpectedCondition::presenceOfElementLocated($usePaymentSelector));
             }
         }" stepKey="secureSignInWorkaround" />
 
+        <!-- Load address list in DOM -->
+        <waitForElementVisible selector="{{AmazonPageSection.changeAddressButton}}" stepKey="waitForChangeAddressButton"/>
+        <click selector="{{AmazonPageSection.changeAddressButton}}" stepKey="clickChangeAddress"/>
+        <waitForElementVisible selector="{{AmazonPageSection.addressBackButton}}" stepKey="waitForAddressBackButton"/>
+        <click selector="{{AmazonPageSection.addressBackButton}}" stepKey="clickAddressBackButton"/>
+
         <!--Get shipping address information-->
         <grabAttributeFrom selector="{{AmazonPageSection.addressId}}" userInput="data-address_id" stepKey="amazonAddressId"/>
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-name_on_address" stepKey="amazonAddressName"/>
@@ -66,10 +65,12 @@
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-phone_number" stepKey="amazonAddressPhoneNumber"/>
 
         <!-- choose card -->
-        <waitForJS function="return document.querySelectorAll('#maxo_payment_methods .a-radio-label').length > 0;" time="30" stepKey="waitForPaymentMethodRadioButtons"/>
-        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangeAddress"/>
-        <executeJS function="document.querySelectorAll('#maxo_payment_methods .a-radio-label').forEach(function(v,i,o) { if (v.querySelector('.trail_number').innerText.includes('{{cc}}')) { v.click() } });" stepKey="executeJsCc"/>
-        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.changePaymentButton}}" stepKey="waitForChangePaymentButton"/>
+        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangePaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.paymentMethodRadioButton(cc)}}" stepKey="waitForPaymentMethods"/>
+        <click selector="{{AmazonPageSection.paymentMethodRadioButton(cc)}}" stepKey="clickPaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.usePaymentButton}}" stepKey="waitForUsePaymentMethodButton"/>
+        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethodButton"/>
 
         <!--Go back to checkout-->
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="waitForAmazonCheckoutButton"/>
diff --git a/Test/Mftf-23/Section/AmazonCheckoutSection.xml b/Test/Mftf-23/Section/AmazonCheckoutSection.xml
index 39680390..875b69e3 100644
--- a/Test/Mftf-23/Section/AmazonCheckoutSection.xml
+++ b/Test/Mftf-23/Section/AmazonCheckoutSection.xml
@@ -7,7 +7,7 @@
         <element name="editShippingButton" type="button" selector="#checkout-step-shipping .shipping-address-item.selected-item .edit-address-link"/>
         <element name="editPaymentButton" type="button" selector="#amazon-payment .action-edit-payment"/>
         <element name="v1Method" type="input" selector="#amazonlogin"/>
-        <element name="method" type="input" selector="#amazon_payment"/>
+        <element name="method" type="input" selector="#amazon_payment_v2"/>
         <element name="returnToStandardCheckout" type="text" selector="#checkout-step-shipping .revert-checkout"/>
     </section>
 </sections>
diff --git a/Test/Mftf-23/Section/AmazonPageSection.xml b/Test/Mftf-23/Section/AmazonPageSection.xml
index 4b607c50..bef5a519 100644
--- a/Test/Mftf-23/Section/AmazonPageSection.xml
+++ b/Test/Mftf-23/Section/AmazonPageSection.xml
@@ -11,9 +11,11 @@
         <element name="addressId" type="text" selector="#default .default_address .address_id"/>
         <element name="addressDetails" type="text" selector="#change-buyer-details li[data-address_id='{{address_id}}']" parameterized="true"/>
         <element name="changeAddressButton" type="button" selector="#change-address-button"/>
+        <element name="addressBackButton" type="button" selector="#addresses-back-button"/>
         <element name="changePaymentButton" type="button" selector="#change-payment-button"/>
         <element name="notSelectedAddress" type="button" selector="#maxo_addresses li[data-selected=false]"/>
         <element name="useAddressButton" type="button" selector="#buyer-action-button-bottom .a-button-input"/>
+        <element name="paymentMethodRadioButton" type="input" selector='li[data-trail_number="{{cc}}"]' parameterized="true"/>
         <element name="usePaymentButton" type="button" selector="#maxo_payment_methods #buyer-action-button-bottom .a-button-input"/>
     </section>
 </sections>
diff --git a/Test/Mftf-23/Test/AmazonBillingFormVisibilityTest.xml b/Test/Mftf-23/Test/AmazonBillingAddressVisibilityTest.xml
similarity index 100%
rename from Test/Mftf-23/Test/AmazonBillingFormVisibilityTest.xml
rename to Test/Mftf-23/Test/AmazonBillingAddressVisibilityTest.xml
diff --git a/Test/Mftf-23/Test/AmazonCheckoutPayNowDeclinedTest.xml b/Test/Mftf-23/Test/AmazonCheckoutPayNowDeclinedTest.xml
index 4d7a4696..046afd11 100644
--- a/Test/Mftf-23/Test/AmazonCheckoutPayNowDeclinedTest.xml
+++ b/Test/Mftf-23/Test/AmazonCheckoutPayNowDeclinedTest.xml
@@ -31,10 +31,12 @@
         <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin" />
 
         <!-- choose card -->
-        <waitForJS function="return document.querySelectorAll('#maxo_payment_methods .a-radio-label').length > 0;" time="30" stepKey="waitForPaymentMethodRadioButtons"/>
-        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangeAddress"/>
-        <executeJS function="document.querySelectorAll('#maxo_payment_methods .a-radio-label').forEach(function(v,i,o) { if (v.querySelector('.trail_number').innerText.includes('3434')) { v.click() } });" stepKey="executeJsCc"/>
-        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.changePaymentButton}}" stepKey="waitForChangePaymentButton"/>
+        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangePaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.paymentMethodRadioButton('3434')}}" stepKey="waitForPaymentMethods"/>
+        <click selector="{{AmazonPageSection.paymentMethodRadioButton('3434')}}" stepKey="clickPaymentMethod"/>
+        <waitForElementVisible selector="{{AmazonPageSection.usePaymentButton}}" stepKey="waitForUsePaymentMethodButton"/>
+        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethodButton"/>
 
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seePayNow" />
         <wait time="2" stepKey="allowPayNowButtonToBeClickable" />
diff --git a/Test/Mftf-23/Test/AmazonShippingAddressTest.xml b/Test/Mftf-23/Test/AmazonShippingAddressTest.xml
index 9a0d05f6..1bf1bd0c 100644
--- a/Test/Mftf-23/Test/AmazonShippingAddressTest.xml
+++ b/Test/Mftf-23/Test/AmazonShippingAddressTest.xml
@@ -18,10 +18,15 @@
         <click selector="{{AmazonCheckoutSection.editShippingButton}}" stepKey="clickAmazonEditShippingButton"/>
         <wait time="1" stepKey="amazonSignInWorkaround" />
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen" />
+
+        <!-- choose address -->
         <waitForElement selector="{{AmazonPageSection.changeAddressButton}}" stepKey="waitForAmazonEditShippingPageLoad"/>
         <click selector="{{AmazonPageSection.changeAddressButton}}" stepKey="clickChangeAmazonAddressButton"/>
-        <click selector="{{AmazonPageSection.notSelectedAddress}}" stepKey="clickNotSelectedAmazonAddress"/>
+        <waitForElementVisible selector="{{AmazonPageSection.notSelectedAddress}}" stepKey="waitForNotSelectedAddress"/>
+        <click selector="{{AmazonPageSection.notSelectedAddress}}" stepKey="clickNotSelectedAddress"/>
+        <waitForElementVisible selector="{{AmazonPageSection.useAddressButton}}" stepKey="waitForUseAddressButton"/>
         <click selector="{{AmazonPageSection.useAddressButton}}" stepKey="clickUseAddressButton"/>
+
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="waitForAmazonChangedShippingPageLoad"/>
         <wait time="1" stepKey="allowButtonToActivate2"/>
         <!--Come back to checkout with changed address-->
diff --git a/Test/Mftf-24/ActionGroup/AmazonCheckoutActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonCheckoutActionGroup.xml
index 6162f270..c2dbc349 100644
--- a/Test/Mftf-24/ActionGroup/AmazonCheckoutActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonCheckoutActionGroup.xml
@@ -6,6 +6,13 @@
             <argument name="openerName" type="string"/>
         </arguments>
 
+        <!-- Load address list in DOM -->
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\LoadAddresses" method="loadAddresses" stepKey="loadAddresses">
+            <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
+            <argument name="addressBackButtonSelector">{{AmazonPageSection.addressBackButton}}</argument>
+            <argument name="defaultAddressSelector">{{AmazonPageSection.addressId}}</argument>
+        </helper>
+
         <!--Get shipping address information-->
         <grabAttributeFrom selector="{{AmazonPageSection.addressId}}" userInput="data-address_id" stepKey="amazonAddressId"/>
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-name_on_address" stepKey="amazonAddressName"/>
@@ -18,10 +25,11 @@
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-phone_number" stepKey="amazonAddressPhoneNumber"/>
 
         <!-- choose card -->
-        <waitForJS function="return document.querySelectorAll('{{AmazonPageSection.paymentRadioButtons}}').length > 0;" time="30" stepKey="waitForPaymentMethodRadioButtons"/>
-        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangeAddress"/>
-        <executeJS function="document.querySelectorAll('{{AmazonPageSection.paymentRadioButtons}}').forEach(function(v,i,o) { if (v.querySelector('.trail_number').innerText.includes('{{cc}}')) { v.click() } });" stepKey="executeJsCc"/>
-        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethod"/>
+        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangePaymentMethod"/>
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\UseAddressOrPaymentMethod" method="clickUseAddressOrPaymentMethod" stepKey="clickUseAddressOrPaymentMethod">
+            <argument name="addressOrPaymentMethodRadioButtonSelector">{{AmazonPageSection.paymentMethodRadioButton(cc)}}</argument>
+            <argument name="useAddressOrPaymentMethodSelector">{{AmazonPageSection.usePaymentButton}}</argument>
+        </helper>
 
         <!--Go back to checkout-->
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="waitForAmazonCheckoutButton"/>
diff --git a/Test/Mftf-24/ActionGroup/AmazonLoginActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonLoginActionGroup.xml
index f694ab0c..60961a62 100644
--- a/Test/Mftf-24/ActionGroup/AmazonLoginActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonLoginActionGroup.xml
@@ -16,7 +16,7 @@
             <argument name="editAddressSelector">{{AmazonCheckoutSection.editShippingButton}}</argument>
             <argument name="addressIdSelector">{{AmazonPageSection.addressId}}</argument>
             <argument name="changePaymentSelector">{{AmazonPageSection.changePaymentButton}}</argument>
-            <argument name="usePaymentSelector">{{AmazonPageSection.usePaymentButton}}</argument>
+            <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
         </helper>
 
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seeAmazonCheckoutButton"/>
diff --git a/Test/Mftf-24/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml b/Test/Mftf-24/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
index 3afae22a..9759d48b 100644
--- a/Test/Mftf-24/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
+++ b/Test/Mftf-24/ActionGroup/AmazonLoginAndCheckoutActionGroup.xml
@@ -32,10 +32,17 @@
             <argument name="editAddressSelector">{{AmazonCheckoutSection.editShippingButton}}</argument>
             <argument name="addressIdSelector">{{AmazonPageSection.addressId}}</argument>
             <argument name="changePaymentSelector">{{AmazonPageSection.changePaymentButton}}</argument>
-            <argument name="usePaymentSelector">{{AmazonPageSection.usePaymentButton}}</argument>
+            <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
         </helper>
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seeAmazonCheckoutButton"/>
 
+        <!-- Load address list in DOM -->
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\LoadAddresses" method="loadAddresses" stepKey="loadAddresses">
+            <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
+            <argument name="addressBackButtonSelector">{{AmazonPageSection.addressBackButton}}</argument>
+            <argument name="defaultAddressSelector">{{AmazonPageSection.addressId}}</argument>
+        </helper>
+
         <!--Get shipping address information-->
         <grabAttributeFrom selector="{{AmazonPageSection.addressId}}" userInput="data-address_id" stepKey="amazonAddressId"/>
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-name_on_address" stepKey="amazonAddressName"/>
@@ -48,10 +55,11 @@
         <grabAttributeFrom selector="{{AmazonPageSection.addressDetails({$amazonAddressId})}}" userInput="data-phone_number" stepKey="amazonAddressPhoneNumber"/>
 
         <!-- choose card -->
-        <waitForJS function="return document.querySelectorAll('{{AmazonPageSection.paymentRadioButtons}}').length > 0;" time="30" stepKey="waitForPaymentMethodRadioButtons"/>
-        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangeAddress"/>
-        <executeJS function="document.querySelectorAll('{{AmazonPageSection.paymentRadioButtons}}').forEach(function(v,i,o) { if (v.querySelector('.trail_number').innerText.includes('{{cc}}')) { v.click() } });" stepKey="executeJsCc"/>
-        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethod"/>
+        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangePaymentMethod"/>
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\UseAddressOrPaymentMethod" method="clickUseAddressOrPaymentMethod" stepKey="clickUsePaymentMethod">
+            <argument name="addressOrPaymentMethodRadioButtonSelector">{{AmazonPageSection.paymentMethodRadioButton(cc)}}</argument>
+            <argument name="useAddressOrPaymentMethodSelector">{{AmazonPageSection.usePaymentButton}}</argument>
+        </helper>
 
         <!--Go back to checkout-->
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="waitForAmazonCheckoutButton"/>
diff --git a/Test/Mftf-24/Helper/LoadAddresses.php b/Test/Mftf-24/Helper/LoadAddresses.php
new file mode 100644
index 00000000..3e0a8562
--- /dev/null
+++ b/Test/Mftf-24/Helper/LoadAddresses.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Amazon\Pay\Test\Mftf\Helper;
+
+use Magento\FunctionalTestingFramework\Helper\Helper;
+
+class LoadAddresses extends Helper
+{
+    public function loadAddresses(
+        $changeAddressSelector,
+        $addressBackButtonSelector,
+        $defaultAddressSelector
+    ) {
+        /** @var \Magento\FunctionalTestingFramework\Module\MagentoWebDriver $webDriver */
+        $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+        $waitTime = 15000;
+
+        try {
+            $webDriver->waitForElementClickable($changeAddressSelector, $waitTime);
+            $webDriver->click($changeAddressSelector);
+            $webDriver->waitForElementClickable($addressBackButtonSelector, $waitTime);
+            $webDriver->click($addressBackButtonSelector);
+
+            $webDriver->waitForElement($defaultAddressSelector, $waitTime);
+        } catch (\Exception $e) {
+            // Avoid out of memory error sometimes caused by print_r
+            // print_r($e);
+        }
+    }
+}
diff --git a/Test/Mftf-24/Helper/SecureSignInWorkaround.php b/Test/Mftf-24/Helper/SecureSignInWorkaround.php
index 25053096..ff4f3195 100644
--- a/Test/Mftf-24/Helper/SecureSignInWorkaround.php
+++ b/Test/Mftf-24/Helper/SecureSignInWorkaround.php
@@ -14,7 +14,7 @@ public function continueAsUser(
         $editAddressSelector,
         $addressIdSelector,
         $changePaymentSelector,
-        $usePaymentSelector
+        $changeAddressSelector
     ) {
         /** @var \Magento\FunctionalTestingFramework\Module\MagentoWebDriver $webDriver */
         $magentoWebDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
@@ -25,7 +25,7 @@ public function continueAsUser(
                 $editAddressSelector,
                 $addressIdSelector,
                 $changePaymentSelector,
-                $usePaymentSelector,
+                $changeAddressSelector,
                 $magentoWebDriver
             ) {
                 // Do nothing here unless the new 'Continue as...' button is present
@@ -53,15 +53,15 @@ public function continueAsUser(
 
                     $addressId = WebDriverBy::cssSelector($addressIdSelector);
                     $changePayment = WebDriverBy::cssSelector($changePaymentSelector);
-                    $usePayment = WebDriverBy::cssSelector($usePaymentSelector);
+                    $changeAddress = WebDriverBy::cssSelector($changeAddressSelector);
                     $remoteWebDriver->wait(30, 100)->until(
                         WebDriverExpectedCondition::presenceOfElementLocated($addressId)
                     );
                     $remoteWebDriver->wait(30, 100)->until(
-                        WebDriverExpectedCondition::elementToBeClickable($changePayment)
+                        WebDriverExpectedCondition::elementToBeClickable($changeAddress)
                     );
                     $remoteWebDriver->wait(30, 100)->until(
-                        WebDriverExpectedCondition::presenceOfElementLocated($usePayment)
+                        WebDriverExpectedCondition::elementToBeClickable($changePayment)
                     );
                 }
             });
diff --git a/Test/Mftf-24/Helper/UseAddressOrPaymentMethod.php b/Test/Mftf-24/Helper/UseAddressOrPaymentMethod.php
new file mode 100644
index 00000000..63a55fa6
--- /dev/null
+++ b/Test/Mftf-24/Helper/UseAddressOrPaymentMethod.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace Amazon\Pay\Test\Mftf\Helper;
+
+use Magento\FunctionalTestingFramework\Helper\Helper;
+
+class UseAddressOrPaymentMethod extends Helper
+{
+    public function clickUseAddressOrPaymentMethod(
+        $addressOrPaymentMethodRadioButtonSelector,
+        $useAddressOrPaymentMethodSelector
+    ) {
+        /** @var \Magento\FunctionalTestingFramework\Module\MagentoWebDriver $webDriver */
+        $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
+        $waitTime = 15000;
+
+        try {
+            $webDriver->waitForElementClickable($addressOrPaymentMethodRadioButtonSelector, $waitTime);
+            $webDriver->click($addressOrPaymentMethodRadioButtonSelector);
+            $webDriver->waitForElementClickable($useAddressOrPaymentMethodSelector, $waitTime);
+            $webDriver->click($useAddressOrPaymentMethodSelector);
+        } catch (\Exception $e) {
+            // Avoid out of memory error sometimes caused by print_r
+            // print_r($e);
+        }
+    }
+}
diff --git a/Test/Mftf-24/Section/AmazonCheckoutSection.xml b/Test/Mftf-24/Section/AmazonCheckoutSection.xml
index 39680390..875b69e3 100644
--- a/Test/Mftf-24/Section/AmazonCheckoutSection.xml
+++ b/Test/Mftf-24/Section/AmazonCheckoutSection.xml
@@ -7,7 +7,7 @@
         <element name="editShippingButton" type="button" selector="#checkout-step-shipping .shipping-address-item.selected-item .edit-address-link"/>
         <element name="editPaymentButton" type="button" selector="#amazon-payment .action-edit-payment"/>
         <element name="v1Method" type="input" selector="#amazonlogin"/>
-        <element name="method" type="input" selector="#amazon_payment"/>
+        <element name="method" type="input" selector="#amazon_payment_v2"/>
         <element name="returnToStandardCheckout" type="text" selector="#checkout-step-shipping .revert-checkout"/>
     </section>
 </sections>
diff --git a/Test/Mftf-24/Section/AmazonPageSection.xml b/Test/Mftf-24/Section/AmazonPageSection.xml
index 05f59a70..2bdefc48 100644
--- a/Test/Mftf-24/Section/AmazonPageSection.xml
+++ b/Test/Mftf-24/Section/AmazonPageSection.xml
@@ -11,10 +11,11 @@
         <element name="addressId" type="text" selector="#default .default_address .address_id"/>
         <element name="addressDetails" type="text" selector="#change-buyer-details li[data-address_id='{{address_id}}']" parameterized="true"/>
         <element name="changeAddressButton" type="button" selector="#change-address-button"/>
+        <element name="addressBackButton" type="button" selector="#addresses-back-button"/>
         <element name="changePaymentButton" type="button" selector="#change-payment-button"/>
         <element name="notSelectedAddress" type="button" selector="#maxo_addresses li[data-selected=false]"/>
         <element name="useAddressButton" type="button" selector="#buyer-action-button-bottom .a-button-input"/>
-        <element name="paymentRadioButtons" type="input" selector="#maxo_payment_methods .a-radio-label"/>
+        <element name="paymentMethodRadioButton" type="input" selector="li[data-trail_number='{{cc}}']" parameterized="true"/>
         <element name="usePaymentButton" type="button" selector="#maxo_payment_methods #buyer-action-button-bottom .a-button-input"/>
     </section>
 </sections>
diff --git a/Test/Mftf-24/Test/AmazonBillingAddressVisibilityTest.xml b/Test/Mftf-24/Test/AmazonBillingAddressVisibilityTest.xml
new file mode 100644
index 00000000..12a8a160
--- /dev/null
+++ b/Test/Mftf-24/Test/AmazonBillingAddressVisibilityTest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AmazonBillingAddressVisibility">
+        <annotations>
+            <stories value="Amazon Billing Address Visibility"/>
+            <title value="Amazon Billing Address Visibility"/>
+            <description value="User should be presented the billing address details/form in any region"/>
+            <severity value="CRITICAL"/>
+            <group value="amazon_pay"/>
+        </annotations>
+
+        <before>
+            <createData entity="SimpleTwo" stepKey="createSimpleProduct"/>
+            <createData entity="SampleAmazonPaymentConfig" stepKey="SampleAmazonPaymentConfigData"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </before>
+
+        <after>
+            <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        </after>
+
+        <!-- Go to new product page and add it to cart -->
+        <actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductStoreFront">
+            <argument name="productUrl" value="$$createSimpleProduct.custom_attributes[url_key]$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addToCart">
+            <argument name="product" value="$$createSimpleProduct$$"/>
+            <argument name="productCount" value="1"/>
+        </actionGroup>
+
+        <!-- Open minicart and login with Amazon -->
+        <actionGroup ref="StorefrontClickOnMiniCartActionGroup" stepKey="clickOnMiniCart"/>
+        <seeElement selector="{{AmazonButtonSection.miniCart}}" stepKey="seeEnabledAmazonButton"/>
+        <actionGroup ref="AmazonLoginAndCheckoutActionGroup" stepKey="AmazonLoginAndCheckoutActionGroup">
+            <argument name="buttonSelector" value="{{AmazonButtonSection.miniCart}}"/>
+        </actionGroup>
+
+        <!-- Move to payments page and verify visibility of billing address -->
+        <click selector="{{CheckoutShippingSection.next}}" stepKey="clickCheckoutShippingNext"/>
+        <seeElement selector="{{AmazonCheckoutSection.billingAddress}}" stepKey="seeBillingAddress"/>
+    </test>
+</tests>
diff --git a/Test/Mftf-24/Test/AmazonCancelReturnUrl.xml b/Test/Mftf-24/Test/AmazonCancelReturnUrl.xml
index ac766ca0..8ed75685 100644
--- a/Test/Mftf-24/Test/AmazonCancelReturnUrl.xml
+++ b/Test/Mftf-24/Test/AmazonCancelReturnUrl.xml
@@ -67,7 +67,7 @@
             <argument name="editAddressSelector">{{AmazonCheckoutSection.editShippingButton}}</argument>
             <argument name="addressIdSelector">{{AmazonPageSection.addressId}}</argument>
             <argument name="changePaymentSelector">{{AmazonPageSection.changePaymentButton}}</argument>
-            <argument name="usePaymentSelector">{{AmazonPageSection.usePaymentButton}}</argument>
+            <argument name="changeAddressSelector">{{AmazonPageSection.changeAddressButton}}</argument>
         </helper>
 
         <!--Come back to checkout with default address-->
diff --git a/Test/Mftf-24/Test/AmazonCheckoutPayNowDeclinedTest.xml b/Test/Mftf-24/Test/AmazonCheckoutPayNowDeclinedTest.xml
index 90e6eb2c..f0d0e2d5 100644
--- a/Test/Mftf-24/Test/AmazonCheckoutPayNowDeclinedTest.xml
+++ b/Test/Mftf-24/Test/AmazonCheckoutPayNowDeclinedTest.xml
@@ -31,10 +31,11 @@
         <actionGroup ref="AmazonLoginActionGroup" stepKey="amazonLogin" />
 
         <!-- choose card -->
-        <waitForJS function="return document.querySelectorAll('{{AmazonPageSection.paymentRadioButtons}}').length > 0;" time="30" stepKey="waitForPaymentMethodRadioButtons"/>
-        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangeAddress"/>
-        <executeJS function="document.querySelectorAll('{{AmazonPageSection.paymentRadioButtons}}').forEach(function(v,i,o) { if (v.querySelector('.trail_number').innerText.includes('3434')) { v.click() } });" stepKey="executeJsCc"/>
-        <click selector="{{AmazonPageSection.usePaymentButton}}" stepKey="clickUsePaymentMethod"/>
+        <click selector="{{AmazonPageSection.changePaymentButton}}" stepKey="clickChangePaymentMethod"/>
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\UseAddressOrPaymentMethod" method="clickUseAddressOrPaymentMethod" stepKey="clickUsePaymentMethod">
+            <argument name="addressOrPaymentMethodRadioButtonSelector">{{AmazonPageSection.paymentMethodRadioButton('3434')}}</argument>
+            <argument name="useAddressOrPaymentMethodSelector">{{AmazonPageSection.usePaymentButton}}</argument>
+        </helper>
 
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="seePayNow" />
         <wait time="2" stepKey="allowPayNowButtonToBeClickable" />
diff --git a/Test/Mftf-24/Test/AmazonShippingAddressTest.xml b/Test/Mftf-24/Test/AmazonShippingAddressTest.xml
index 9a0d05f6..b8c98f4a 100644
--- a/Test/Mftf-24/Test/AmazonShippingAddressTest.xml
+++ b/Test/Mftf-24/Test/AmazonShippingAddressTest.xml
@@ -20,8 +20,11 @@
         <actionGroup ref="AmazonSwitchToPopupActionGroup" stepKey="allowPopupToOpen" />
         <waitForElement selector="{{AmazonPageSection.changeAddressButton}}" stepKey="waitForAmazonEditShippingPageLoad"/>
         <click selector="{{AmazonPageSection.changeAddressButton}}" stepKey="clickChangeAmazonAddressButton"/>
-        <click selector="{{AmazonPageSection.notSelectedAddress}}" stepKey="clickNotSelectedAmazonAddress"/>
-        <click selector="{{AmazonPageSection.useAddressButton}}" stepKey="clickUseAddressButton"/>
+        <helper class="\Amazon\Pay\Test\Mftf\Helper\UseAddressOrPaymentMethod" method="clickUseAddressOrPaymentMethod" stepKey="clickUseAddress">
+            <argument name="addressOrPaymentMethodRadioButtonSelector">{{AmazonPageSection.notSelectedAddress}}</argument>
+            <argument name="useAddressOrPaymentMethodSelector">{{AmazonPageSection.useAddressButton}}</argument>
+        </helper>
+
         <waitForElement selector="{{AmazonPageSection.checkoutButton}}" stepKey="waitForAmazonChangedShippingPageLoad"/>
         <wait time="1" stepKey="allowButtonToActivate2"/>
         <!--Come back to checkout with changed address-->

From 416a3c973bf094565266b9fdb25a30c0b6158be7 Mon Sep 17 00:00:00 2001
From: Jay Becker <jay@beargroup.com>
Date: Wed, 4 May 2022 20:03:33 -0500
Subject: [PATCH 20/23] APF-320 - removed comments

---
 Model/Resolver/CheckoutSessionConfig.php | 2 --
 Model/Resolver/CheckoutSessionSignIn.php | 2 --
 Model/Resolver/SetCustomerLink.php       | 2 --
 3 files changed, 6 deletions(-)

diff --git a/Model/Resolver/CheckoutSessionConfig.php b/Model/Resolver/CheckoutSessionConfig.php
index 92f89b2b..835a50d0 100644
--- a/Model/Resolver/CheckoutSessionConfig.php
+++ b/Model/Resolver/CheckoutSessionConfig.php
@@ -38,8 +38,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
     {
         $cartId = $args['cartId'] ?? null;
 
-        // old php version friendly. later the spread operator can be used for a slight performance increase
-        // array_merge(...$response);
         $response = $this->checkoutSessionManagement->getConfig($cartId);
         return array_shift($response);
     }
diff --git a/Model/Resolver/CheckoutSessionSignIn.php b/Model/Resolver/CheckoutSessionSignIn.php
index f40bac27..afe5e2e0 100644
--- a/Model/Resolver/CheckoutSessionSignIn.php
+++ b/Model/Resolver/CheckoutSessionSignIn.php
@@ -44,8 +44,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "buyerToken" is missing'));
         }
 
-        // old php version friendly. later the spread operator can be used for a slight performance increase
-        // array_merge(...$response);
         $response = $this->checkoutSessionManagement->signIn($buyerToken);
         return array_shift($response);
     }
diff --git a/Model/Resolver/SetCustomerLink.php b/Model/Resolver/SetCustomerLink.php
index 6b3b2ba3..3f70b5ed 100644
--- a/Model/Resolver/SetCustomerLink.php
+++ b/Model/Resolver/SetCustomerLink.php
@@ -48,8 +48,6 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Required parameter "password" is missing'));
         }
 
-        // old php version friendly. later the spread operator can be used for a slight performance increase
-        // array_merge(...$response);
         $response = $this->checkoutSessionManagementModel->setCustomerLink($buyerToken, $password);
         return array_shift($response);
     }

From c3904776a4adc4249701e058210d515dbbdae120 Mon Sep 17 00:00:00 2001
From: Jay Becker <jay@beargroup.com>
Date: Wed, 4 May 2022 20:20:59 -0500
Subject: [PATCH 21/23] Version bump to 5.13.0 and update changelog

---
 CHANGELOG.md  | 7 +++++++
 README.md     | 2 +-
 composer.json | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0977ba80..c9054859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 5.13.0
+* Added Graphql support
+* Added endpoints to fetch individual config types
+* Change how buttons are rendered so they are not blocked waiting for config
+* Fixed an error when using the REST complete endpoint with a declined card
+* Updated some translations
+
 ## 5.12.0
 * Change to display billing address for US/JP regions to match EU/UK
 * Fixed a regression with restricted categories
diff --git a/README.md b/README.md
index f8710a72..dea5e33c 100755
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ The following table provides an overview on which Git branch is compatible to wh
 Magento Version | Github Branch | Latest release
 ---|---|---
 2.2.6 - 2.2.11 (EOL) | [V2checkout-1.2.x](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/V2checkout-1.2.x)  | 1.20.0 (EOL)
-2.3.0 - 2.4.x | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 5.12.0
+2.3.0 - 2.4.x | [master](https://github.com/amzn/amazon-payments-magento-2-plugin/tree/master) | 5.13.0
 
 ## Release Notes
 See [CHANGELOG.md](/CHANGELOG.md) 
diff --git a/composer.json b/composer.json
index 40923578..a11207e4 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "amzn/amazon-pay-magento-2-module",
   "description": "Official Magento2 Plugin to integrate with Amazon Pay",
   "type": "magento2-module",
-  "version": "5.12.0",
+  "version": "5.13.0",
   "license": [
     "Apache-2.0"
   ],

From 0b47686a68cdc49b09f959990ec95855c7fd0d41 Mon Sep 17 00:00:00 2001
From: Jay Becker <jay@beargroup.com>
Date: Wed, 4 May 2022 22:20:23 -0500
Subject: [PATCH 22/23] Fix phpcs

---
 Plugin/CustomerData/Cart.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Plugin/CustomerData/Cart.php b/Plugin/CustomerData/Cart.php
index 7e1152e0..4c991b21 100644
--- a/Plugin/CustomerData/Cart.php
+++ b/Plugin/CustomerData/Cart.php
@@ -16,8 +16,7 @@ class Cart
      */
     public function __construct(
         Session $checkoutSession
-    )
-    {
+    ) {
         $this->checkoutSession = $checkoutSession;
     }
 
@@ -33,8 +32,7 @@ public function __construct(
     public function afterGetSectionData(
         \Magento\Checkout\CustomerData\Cart $subject,
         $result
-    )
-    {
+    ) {
         $result['amzn_pay_only'] = $this->checkoutSession->getQuote()->isVirtual();
 
         return $result;

From 6962ebf50669841e65f87a368ff7d6cac55d9cba Mon Sep 17 00:00:00 2001
From: Spencer Gabhart <sgabhart2230@gmail.com>
Date: Thu, 5 May 2022 11:06:42 -0400
Subject: [PATCH 23/23] Correct config retrieval for Amazon Sign In

---
 Controller/Checkout/Config.php                              | 2 +-
 Model/CheckoutSessionManagement.php                         | 2 +-
 view/frontend/web/js/action/checkout-session-config-load.js | 4 ++--
 view/frontend/web/js/amazon-login-button.js                 | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Controller/Checkout/Config.php b/Controller/Checkout/Config.php
index 429e09f6..fc6294b1 100644
--- a/Controller/Checkout/Config.php
+++ b/Controller/Checkout/Config.php
@@ -46,7 +46,7 @@ public function __construct(
      */
     public function execute()
     {
-        $omitPayloads = isset($this->getRequest()->getParams()['omit_payloads']);
+        $omitPayloads = filter_var($this->getRequest()->getParams()['omit_payloads'], FILTER_VALIDATE_BOOLEAN);
         $data = $this->amazonCheckoutSession->getConfig($omitPayloads);
         return $this->resultJsonFactory->create()->setData($data);
     }
diff --git a/Model/CheckoutSessionManagement.php b/Model/CheckoutSessionManagement.php
index 49de814f..005d9646 100755
--- a/Model/CheckoutSessionManagement.php
+++ b/Model/CheckoutSessionManagement.php
@@ -413,7 +413,7 @@ protected function convertToMagentoAddress(array $address, $isShippingAddress =
     /**
      * {@inheritdoc}
      */
-    public function getConfig($cartId = null, $omitPayloads = false)
+    public function getConfig($cartId = null, $omitPayloads = true)
     {
         $result = [];
         $quote = $this->session->getQuoteFromIdOrSession($cartId);
diff --git a/view/frontend/web/js/action/checkout-session-config-load.js b/view/frontend/web/js/action/checkout-session-config-load.js
index 6510ae6b..2561af37 100644
--- a/view/frontend/web/js/action/checkout-session-config-load.js
+++ b/view/frontend/web/js/action/checkout-session-config-load.js
@@ -29,11 +29,11 @@ define([
         }
         return localStorage;
     };
-    return function (callback) {
+    return function (callback, omitPayloads = true) {
         var cartId = customerData.get('cart')()['data_id'] || window.checkout.storeId;
         var config = getLocalStorage().get('config') || false;
         if (!config) {
-            remoteStorage.get(url.build('amazon_pay/checkout/config?omit_payloads=true')).done(function (config) {
+            remoteStorage.get(url.build(`amazon_pay/checkout/config?omit_payloads=${omitPayloads}`)).done(function (config) {
                 getLocalStorage().set('cart_id', cartId);
                 getLocalStorage().set('config', config);
 
diff --git a/view/frontend/web/js/amazon-login-button.js b/view/frontend/web/js/amazon-login-button.js
index 8025bfce..3ce15061 100755
--- a/view/frontend/web/js/amazon-login-button.js
+++ b/view/frontend/web/js/amazon-login-button.js
@@ -46,7 +46,7 @@ define([
                             publicKeyId: checkoutSessionConfig['public_key_id']
                         }
                     });
-                }.bind(this));
+                }.bind(this), false);
             },
 
             /**