fix lint & debug on iOS.

stripe · Nov 17, 2023 · 5e725c1 · 5e725c1
1 parent b02f5ea
commit 5e725c1
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 31 deletions.
diff --git a/dev-app/src/screens/CollectCardPaymentScreen.tsx b/dev-app/src/screens/CollectCardPaymentScreen.tsx
@@ -409,28 +409,48 @@ export default function CollectCardPaymentScreen() {
       return;
     }
 
-    addLogs({
-      name: 'Confirm Payment Intent',
-      events: [
-        {
-          name: 'Processed',
-          description: 'terminal.confirmPaymentIntent',
-          metadata: {
-            paymententIntentId: paymentIntent.id,
-            chargeId: paymentIntent.charges[0].id,
+    if (paymentIntent.id) {
+      addLogs({
+        name: 'Confirm Payment Intent',
+        events: [
+          {
+            name: 'Processed',
+            description: 'terminal.confirmPaymentIntent',
+            metadata: {
+              paymententIntentId: paymentIntent.id,
+              chargeId: paymentIntent.charges[0].id,
+            },
           },
-        },
-      ],
-    });
+        ],
+      });
+    } else {
+      addLogs({
+        name: 'Confirm Payment Intent',
+        events: [
+          {
+            name: 'Processed',
+            description: 'terminal.confirmPaymentIntent',
+            metadata: {
+              paymententIntentId: "",
+              chargeId: "",
+            },
+          },
+        ],
+      });
+    }
 
     // Set last successful charge Id in context for refunding later
-    setLastSuccessfulChargeId(paymentIntent.charges[0].id);
-
+    if (paymentIntent?.charges[0]?.id) {
+      setLastSuccessfulChargeId(paymentIntent.charges[0].id);
+    }
+
     if (paymentIntent?.status === 'succeeded') {
       return;
     }
 
-    _capturePayment(paymentIntent.id);
+    if (paymentIntent.id) {
+      _capturePayment(paymentIntent.id);
+    }
   };
 
   const _capturePayment = async (paymentIntentId: string) => {

diff --git a/dev-app/src/screens/DatabaseScreen.tsx b/dev-app/src/screens/DatabaseScreen.tsx
@@ -54,7 +54,13 @@ export default function DatabaseScreen() {
               title={
                 getCurrencySymbols(key) +
                 ' ' +
-                (Number(offlinePaymentStatus.sdk.offlinePaymentAmountsByCurrency[key]) / 100).toFixed(2)
+                (
+                  Number(
+                    offlinePaymentStatus.sdk.offlinePaymentAmountsByCurrency[
+                      key
+                    ]
+                  ) / 100
+                ).toFixed(2)
               }
             />
           ))

diff --git a/ios/StripeTerminalReactNative.swift b/ios/StripeTerminalReactNative.swift
@@ -911,6 +911,21 @@ class StripeTerminalReactNative: RCTEventEmitter, DiscoveryDelegate, BluetoothRe
         resolve(["token": self.loggingToken])
     }
 
+    @objc(getOfflineStatus:rejecter:)
+    func getOfflineStatus(resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+        let sdkDic: NSDictionary = [
+            "offlinePaymentsCount": Terminal.shared.offlineStatus.sdk.paymentsCount ?? 0,
+            "offlinePaymentAmountsByCurrency": Terminal.shared.offlineStatus.sdk.paymentAmountsByCurrency
+        ]
+
+        let readDic: NSDictionary = [
+            "offlinePaymentsCount": Terminal.shared.offlineStatus.reader?.paymentsCount ?? 0,
+            "offlinePaymentAmountsByCurrency": Terminal.shared.offlineStatus.reader?.paymentAmountsByCurrency ?? {}
+        ]
+
+        resolve(["sdk": sdkDic, "reader": readDic])
+    }
+
     func reader(_ reader: Reader, didReportAvailableUpdate update: ReaderSoftwareUpdate) {
         sendEvent(withName: ReactNativeConstants.REPORT_AVAILABLE_UPDATE.rawValue, body: ["result": Mappers.mapFromReaderSoftwareUpdate(update) ?? [:]])
     }
@@ -999,19 +1014,4 @@ class StripeTerminalReactNative: RCTEventEmitter, DiscoveryDelegate, BluetoothRe
         let result = Errors.createError(nsError: error as NSError)
         sendEvent(withName: ReactNativeConstants.REPORT_FORWARDING_ERROR.rawValue, body: ["result": result])
     }
-
-    @objc(getOfflineStatus:rejecter:)
-    func getOfflineStatus(resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-        let sdkDic: NSDictionary = [
-            "offlinePaymentsCount": Terminal.shared.offlineStatus.sdk.paymentsCount,
-            "offlinePaymentAmountsByCurrency": Terminal.shared.offlineStatus.sdk.paymentAmountsByCurrency
-        ]
-
-        let readDic: NSDictionary = [
-            "offlinePaymentsCount": Terminal.shared.offlineStatus.reader?.paymentsCount,
-            "offlinePaymentAmountsByCurrency": Terminal.shared.offlineStatus.reader?.paymentAmountsByCurrency
-        ]
-
-        resolve(["sdk": sdkDic, "reader": readDic])
-    }
 }