From b4944fe2ea61e2d6c04a630b7b719f35f5d3a2cc Mon Sep 17 00:00:00 2001 From: "eric.lin" Date: Tue, 23 Jul 2024 11:39:01 +0800 Subject: [PATCH 1/5] Fix wrong display of the "terminal.didRequestReaderDisplayMessage" --- ios/Mappers.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 } From 8fc1439b160057c12cb7097e6baafde156807033 Mon Sep 17 00:00:00 2001 From: "eric.lin" Date: Tue, 23 Jul 2024 13:00:54 +0800 Subject: [PATCH 2/5] fix e2e test fail --- e2e/app.e2e.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/app.e2e.js b/e2e/app.e2e.js index e80bdbd6..c434fe38 100644 --- a/e2e/app.e2e.js +++ b/e2e/app.e2e.js @@ -114,7 +114,7 @@ describe('Basic funtionalities', () => { await checkIfLogExist('Create'); await checkIfLogExist('Created'); await checkIfLogExist('Collect'); - await checkIfLogExist('insertCard / swipeCard / tapCard'); + await checkIfLogExist('swipeCard / insertCard / tapCard'); await checkIfLogExist('removeCard'); await checkIfLogExist('Collected'); await checkIfLogExist('Process'); @@ -142,7 +142,7 @@ describe('Basic funtionalities', () => { await checkIfLogExist('Create'); await checkIfLogExist('Collect'); - await checkIfLogExist('insertCard / swipeCard / tapCard'); + await checkIfLogExist('swipeCard / insertCard / tapCard'); await checkIfLogExist('removeCard'); await checkIfLogExist('Created'); await checkIfLogExist('Process'); From be6e99cac9403c0ddcb7da73b8473546d9ae3703 Mon Sep 17 00:00:00 2001 From: Ian Lin Date: Tue, 23 Jul 2024 14:56:16 +0800 Subject: [PATCH 3/5] sort collect methods. --- dev-app/src/screens/CollectCardPaymentScreen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, }, From 66636d7a24ec678315f4f7f3672eac224ce4e328 Mon Sep 17 00:00:00 2001 From: Ian Lin Date: Tue, 23 Jul 2024 15:00:07 +0800 Subject: [PATCH 4/5] revert log check string. --- e2e/app.e2e.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/app.e2e.js b/e2e/app.e2e.js index c434fe38..e80bdbd6 100644 --- a/e2e/app.e2e.js +++ b/e2e/app.e2e.js @@ -114,7 +114,7 @@ describe('Basic funtionalities', () => { await checkIfLogExist('Create'); await checkIfLogExist('Created'); await checkIfLogExist('Collect'); - await checkIfLogExist('swipeCard / insertCard / tapCard'); + await checkIfLogExist('insertCard / swipeCard / tapCard'); await checkIfLogExist('removeCard'); await checkIfLogExist('Collected'); await checkIfLogExist('Process'); @@ -142,7 +142,7 @@ describe('Basic funtionalities', () => { await checkIfLogExist('Create'); await checkIfLogExist('Collect'); - await checkIfLogExist('swipeCard / insertCard / tapCard'); + await checkIfLogExist('insertCard / swipeCard / tapCard'); await checkIfLogExist('removeCard'); await checkIfLogExist('Created'); await checkIfLogExist('Process'); From d9a4f93d44f40e59a6a6963c674a0eab4c9882ff Mon Sep 17 00:00:00 2001 From: Ian Lin Date: Tue, 23 Jul 2024 15:21:39 +0800 Subject: [PATCH 5/5] sort collect methods. --- dev-app/src/screens/SetupIntentScreen.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, },