From b29b61110ed1084b99fbcba49ad72ff76c06ac36 Mon Sep 17 00:00:00 2001 From: eric lin <128665795+EricLin-BBpos@users.noreply.github.com> Date: Tue, 23 Jul 2024 23:54:37 +0800 Subject: [PATCH] Fix wrong display of the "terminal.didRequestReaderDisplayMessage" (#762) * Fix wrong display of the "terminal.didRequestReaderDisplayMessage" * fix e2e test fail * sort collect methods. * revert log check string. * sort collect methods. --------- Co-authored-by: Ian Lin --- dev-app/src/screens/CollectCardPaymentScreen.tsx | 2 +- dev-app/src/screens/SetupIntentScreen.tsx | 2 +- ios/Mappers.swift | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-app/src/screens/CollectCardPaymentScreen.tsx b/dev-app/src/screens/CollectCardPaymentScreen.tsx index aa27caac..2297b813 100644 --- a/dev-app/src/screens/CollectCardPaymentScreen.tsx +++ b/dev-app/src/screens/CollectCardPaymentScreen.tsx @@ -120,7 +120,7 @@ export default function CollectCardPaymentScreen() { name: 'Collect Payment Method', events: [ { - name: input.join(' / '), + name: input.sort().join(' / '), description: 'terminal.didRequestReaderInput', onBack: cancelCollectPaymentMethod, }, diff --git a/dev-app/src/screens/SetupIntentScreen.tsx b/dev-app/src/screens/SetupIntentScreen.tsx index 43ef00ec..e4c90d50 100644 --- a/dev-app/src/screens/SetupIntentScreen.tsx +++ b/dev-app/src/screens/SetupIntentScreen.tsx @@ -37,7 +37,7 @@ export default function SetupIntentScreen() { name: 'Collect Setup Intent', events: [ { - name: input.join(' / '), + name: input.sort().join(' / '), description: 'terminal.didRequestReaderInput', onBack: cancelCollectSetupIntent, }, diff --git a/ios/Mappers.swift b/ios/Mappers.swift index 665b839b..aa349a17 100644 --- a/ios/Mappers.swift +++ b/ios/Mappers.swift @@ -349,8 +349,8 @@ class Mappers { array.forEach { item in switch item { case 0: return - case 1: return mappedOptions.add("insertCard") - case 2: return mappedOptions.add("swipeCard") + case 1: return mappedOptions.add("swipeCard") + case 2: return mappedOptions.add("insertCard") case 4: return mappedOptions.add("tapCard") default: return }