From 6deed182ee06244f1f67fea4df7ed69a65981b8f Mon Sep 17 00:00:00 2001
From: Eliza Lucas <eliza.lucas@circle.com>
Date: Tue, 15 Mar 2022 15:24:36 -0400
Subject: [PATCH 1/2] make lineItemType a dropdown field

---
 pages/debug/payments/digitalWallets/convertToken.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/debug/payments/digitalWallets/convertToken.vue b/pages/debug/payments/digitalWallets/convertToken.vue
index 6ddccd7c..c5bc87a8 100644
--- a/pages/debug/payments/digitalWallets/convertToken.vue
+++ b/pages/debug/payments/digitalWallets/convertToken.vue
@@ -21,9 +21,10 @@
             v-model="applePayFormData.shopName"
             label="Shop Name"
           />
-          <v-text-field
+          <v-select
             v-if="displayApplePayForm"
             v-model="applePayFormData.lineItemType"
+            :items="lineItemTypeApplePay"
             label="Line Item Type"
           />
           <v-text-field v-model="formData.amount" label="Amount" />
@@ -190,6 +191,7 @@ export default class ConvertToken extends Vue {
   paymentType = ['Google Pay', 'Apple Pay']
   merchantTypeApplePay = ['PayFac', 'Partnership']
   merchantTypeGooglePay = ['PayFac']
+  lineItemTypeApplePay = ['final', 'pending']
   error = {}
   loading = false
   showError = false

From d2b898634ea8a689e8fdf2c5a2c453ecf5b7a138 Mon Sep 17 00:00:00 2001
From: Eliza Lucas <eliza.lucas@circle.com>
Date: Tue, 15 Mar 2022 16:49:53 -0400
Subject: [PATCH 2/2] remove old applepay page and rename convertTokens to
 paymenttokens

---
 layouts/default.vue                           | 25 ++---------
 pages/debug/payments/applepay/create.vue      | 45 -------------------
 .../{convertToken.vue => paymenttokens.vue}   |  0
 3 files changed, 4 insertions(+), 66 deletions(-)
 delete mode 100644 pages/debug/payments/applepay/create.vue
 rename pages/debug/payments/digitalWallets/{convertToken.vue => paymenttokens.vue} (100%)

diff --git a/layouts/default.vue b/layouts/default.vue
index 4b26815d..65faae4b 100644
--- a/layouts/default.vue
+++ b/layouts/default.vue
@@ -73,7 +73,7 @@
           </v-list-item>
 
           <v-list-item
-            v-for="(item, i) in allPaymentLinks"
+            v-for="(item, i) in paymentsLinks"
             :key="`paymentlink-${i}`"
             :to="item.to"
             router
@@ -204,15 +204,12 @@
 <script lang="ts">
 import { Vue, Component } from 'nuxt-property-decorator'
 import { getIsStaging, getIsLocalHost } from '@/lib/apiTarget'
-import { getIsSafari } from '@/lib/navigatorInfo'
 @Component
 export default class DefaultLayoutsClass extends Vue {
   isStaging: boolean = getIsStaging()
 
   isLocalHost: boolean = getIsLocalHost()
 
-  isSafari: boolean = getIsSafari()
-
   flowLinks = [
     {
       title: 'Charge a card',
@@ -429,18 +426,11 @@ export default class DefaultLayoutsClass extends Vue {
       to: '/debug/payments/balances/fetch',
     },
     {
-      title: 'POST /convertToken',
-      to: '/debug/payments/digitalWallets/convertToken',
+      title: 'POST /paymenttokens',
+      to: '/debug/payments/digitalWallets/paymenttokens',
     },
   ]
 
-  applePayStaging = {
-    title: 'Apple Pay',
-    to: '/debug/payments/applepay/create',
-  }
-
-  paymentsLinksWithApplePay = this.paymentsLinks.concat(this.applePayStaging)
-
   marketplaceLinks = [
     {
       title: 'GET /marketplace/merchants',
@@ -643,15 +633,8 @@ export default class DefaultLayoutsClass extends Vue {
   showRightDrawer = false
   showDrawer = false
 
-  get allPaymentLinks() {
-    if (this.isSafari && (this.isStaging || this.isLocalHost)) {
-      return this.paymentsLinksWithApplePay
-    }
-    return this.paymentsLinks
-  }
-
   get title() {
-    const navItems = this.flowLinks.concat(this.allPaymentLinks)
+    const navItems = this.flowLinks.concat(this.paymentsLinks)
     const currentPage = navItems.find((item) => {
       return item.to === this.$route.path
     })
diff --git a/pages/debug/payments/applepay/create.vue b/pages/debug/payments/applepay/create.vue
deleted file mode 100644
index 72d07af4..00000000
--- a/pages/debug/payments/applepay/create.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <v-btn
-    v-if="isApplePayAvailable"
-    elevation="24"
-    dark
-    class="apple-pay-button apple-pay-button-text-pay"
-    @click.prevent="doApplePay"
-  >
-  </v-btn>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from 'nuxt-property-decorator'
-import { mapGetters } from 'vuex'
-import {
-  DEFAULT_CONFIG,
-  applePayAvailable,
-  startApplePaySessionBackendPay,
-} from '@/lib/applePay'
-@Component({
-  computed: {
-    ...mapGetters({
-      apiKey: 'getApiKey',
-    }),
-  },
-})
-export default class CreateApplePayVue extends Vue {
-  apiKey!: string
-  merchantId = 'PayFac' // hardcoded for now, can parametrize in future PR if we want to implement UI to select merchant type for E2E applepay button
-
-  isApplePayAvailable: boolean = applePayAvailable()
-
-  doApplePay() {
-    startApplePaySessionBackendPay(
-      DEFAULT_CONFIG.payments,
-      this.apiKey,
-      this.merchantId
-    )
-  }
-}
-</script>
-
-<style scoped>
-@import '~/assets/applePayButton.css';
-</style>
diff --git a/pages/debug/payments/digitalWallets/convertToken.vue b/pages/debug/payments/digitalWallets/paymenttokens.vue
similarity index 100%
rename from pages/debug/payments/digitalWallets/convertToken.vue
rename to pages/debug/payments/digitalWallets/paymenttokens.vue