From cce7c99e1eedc741a38891cb1b9dfb99c9864b1c Mon Sep 17 00:00:00 2001
From: Mohanna Zakizadeh <mzakizadeh@paypal.com>
Date: Mon, 11 Nov 2024 13:22:33 +0100
Subject: [PATCH] Updated Sample app (#476)

---
 .../project.pbxproj                           |  36 ++-
 .../Base.lproj/Main~iphone.storyboard         |  75 ++---
 .../Helpers/UserDefaults+extension.swift      |  22 ++
 .../TippingSettingsStorage.swift              |  45 +++
 .../CardPaymentViewController.h               |  12 -
 .../CardPaymentViewController.m               | 175 -----------
 .../CardPaymentViewController.swift           | 158 ++++++++++
 .../ViewController/ConsoleViewController.m    |   1 -
 .../ManualCardEntryViewController.swift       |   2 +-
 .../SelectionTableViewController.swift        |   2 +-
 .../TippingSettingsViewController.swift       | 273 ++++++++++++++++++
 11 files changed, 564 insertions(+), 237 deletions(-)
 create mode 100644 Example/iZettleSDKSample/Helpers/UserDefaults+extension.swift
 create mode 100644 Example/iZettleSDKSample/TippingSettingsStorage.swift
 delete mode 100644 Example/iZettleSDKSample/ViewController/CardPaymentViewController.h
 delete mode 100644 Example/iZettleSDKSample/ViewController/CardPaymentViewController.m
 create mode 100644 Example/iZettleSDKSample/ViewController/CardPaymentViewController.swift
 create mode 100644 Example/iZettleSDKSample/ViewController/TippingSettingsViewController.swift

diff --git a/Example/iZettleSDKSample.xcodeproj/project.pbxproj b/Example/iZettleSDKSample.xcodeproj/project.pbxproj
index 891e4c6b..fed247f4 100644
--- a/Example/iZettleSDKSample.xcodeproj/project.pbxproj
+++ b/Example/iZettleSDKSample.xcodeproj/project.pbxproj
@@ -11,6 +11,10 @@
 		07B1AF2A28F55EB30066D1D8 /* iZettlePayments.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B803A23327B118DE00C5C4C7 /* iZettlePayments.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		07B1AF2B28F55EB60066D1D8 /* iZettleSDK.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = B803A23227B118DE00C5C4C7 /* iZettleSDK.xcframework */; };
 		07B1AF2C28F55EB60066D1D8 /* iZettleSDK.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = B803A23227B118DE00C5C4C7 /* iZettleSDK.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
+		64AACDEF2CBD20A100DB1AE5 /* CardPaymentViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64AACDEE2CBD20A100DB1AE5 /* CardPaymentViewController.swift */; };
+		64EE62C12CD39D4300B3C2FA /* TippingSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64EE62C02CD39D4300B3C2FA /* TippingSettingsViewController.swift */; };
+		64EE62C52CD3A1D500B3C2FA /* TippingSettingsStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64EE62C42CD3A1D500B3C2FA /* TippingSettingsStorage.swift */; };
+		64EE62C72CD3A1F000B3C2FA /* UserDefaults+extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 64EE62C62CD3A1F000B3C2FA /* UserDefaults+extension.swift */; };
 		739E173D2A4490E000839E00 /* ManualCardEntryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 739E173C2A4490E000839E00 /* ManualCardEntryViewController.swift */; };
 		876B84F42BCD2805006AE847 /* PPRiskMagnes.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 876B84F22BCD27FD006AE847 /* PPRiskMagnes.xcframework */; };
 		876B84F52BCD2805006AE847 /* PPRiskMagnes.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 876B84F22BCD27FD006AE847 /* PPRiskMagnes.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
@@ -25,7 +29,6 @@
 		E6F9FEEF1DDDFFC80051C21D /* ConsoleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E6F9FEE41DDDFFC80051C21D /* ConsoleViewController.m */; };
 		E6F9FEF01DDDFFC80051C21D /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = E6F9FEE51DDDFFC80051C21D /* Images.xcassets */; };
 		E6F9FEF21DDDFFC80051C21D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = E6F9FEE71DDDFFC80051C21D /* main.m */; };
-		E6F9FEF31DDDFFC80051C21D /* CardPaymentViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = E6F9FEE91DDDFFC80051C21D /* CardPaymentViewController.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -46,6 +49,10 @@
 
 /* Begin PBXFileReference section */
 		3F0C93981AC30F4600305D8F /* iZettle SDK Sample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "iZettle SDK Sample.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		64AACDEE2CBD20A100DB1AE5 /* CardPaymentViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPaymentViewController.swift; sourceTree = "<group>"; };
+		64EE62C02CD39D4300B3C2FA /* TippingSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TippingSettingsViewController.swift; sourceTree = "<group>"; };
+		64EE62C42CD3A1D500B3C2FA /* TippingSettingsStorage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TippingSettingsStorage.swift; sourceTree = "<group>"; };
+		64EE62C62CD3A1F000B3C2FA /* UserDefaults+extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UserDefaults+extension.swift"; sourceTree = "<group>"; };
 		739E173C2A4490E000839E00 /* ManualCardEntryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ManualCardEntryViewController.swift; sourceTree = "<group>"; };
 		876B84F22BCD27FD006AE847 /* PPRiskMagnes.xcframework */ = {isa = PBXFileReference; expectedSignature = "AppleDeveloperProgram:XEZPTDFLAS:changching chi"; lastKnownFileType = wrapper.xcframework; name = PPRiskMagnes.xcframework; path = ../iZettleSDK/PPRiskMagnes.xcframework; sourceTree = "<group>"; };
 		9B8B199C24754A0F00C74D78 /* CustomAuthorizationProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CustomAuthorizationProvider.h; sourceTree = "<group>"; };
@@ -68,8 +75,6 @@
 		E6F9FEE51DDDFFC80051C21D /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
 		E6F9FEE61DDDFFC80051C21D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		E6F9FEE71DDDFFC80051C21D /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		E6F9FEE81DDDFFC80051C21D /* CardPaymentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CardPaymentViewController.h; sourceTree = "<group>"; };
-		E6F9FEE91DDDFFC80051C21D /* CardPaymentViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CardPaymentViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -108,11 +113,11 @@
 			children = (
 				B803A22E27AC0A3000C5C4C7 /* SelectionTableViewController.swift */,
 				B803A22527AAA17D00C5C4C7 /* QRCPaymentViewController.swift */,
-				E6F9FEE81DDDFFC80051C21D /* CardPaymentViewController.h */,
-				E6F9FEE91DDDFFC80051C21D /* CardPaymentViewController.m */,
 				E6F9FEE31DDDFFC80051C21D /* ConsoleViewController.h */,
 				E6F9FEE41DDDFFC80051C21D /* ConsoleViewController.m */,
 				739E173C2A4490E000839E00 /* ManualCardEntryViewController.swift */,
+				64AACDEE2CBD20A100DB1AE5 /* CardPaymentViewController.swift */,
+				64EE62C02CD39D4300B3C2FA /* TippingSettingsViewController.swift */,
 			);
 			path = ViewController;
 			sourceTree = "<group>";
@@ -120,6 +125,7 @@
 		B8C1265E27C38FDF00AA6F45 /* Helpers */ = {
 			isa = PBXGroup;
 			children = (
+				64EE62C62CD3A1F000B3C2FA /* UserDefaults+extension.swift */,
 				B8C1266027C38FDF00AA6F45 /* AccessTokenFetcher.h */,
 				B8C1265F27C38FDF00AA6F45 /* AccessTokenFetcher.m */,
 			);
@@ -146,6 +152,7 @@
 				9B8B199D24754A0F00C74D78 /* CustomAuthorizationProvider.m */,
 				9BC1DCB924ACBA58004E74DC /* AccountManager.h */,
 				9BC1DCBA24ACBA58004E74DC /* AccountManager.m */,
+				64EE62C42CD3A1D500B3C2FA /* TippingSettingsStorage.swift */,
 				B803A23027AC1FE800C5C4C7 /* ViewController */,
 				E6F9FEDD1DDDFFC80051C21D /* LaunchScreen.xib */,
 				E6F9FEE11DDDFFC80051C21D /* Main~iphone.storyboard */,
@@ -229,15 +236,18 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				64EE62C12CD39D4300B3C2FA /* TippingSettingsViewController.swift in Sources */,
 				E6F9FEEB1DDDFFC80051C21D /* AppDelegate.m in Sources */,
 				B803A22F27AC0A3000C5C4C7 /* SelectionTableViewController.swift in Sources */,
 				E6F9FEF21DDDFFC80051C21D /* main.m in Sources */,
 				B8C1266127C38FDF00AA6F45 /* AccessTokenFetcher.m in Sources */,
 				9BC1DCBB24ACBA58004E74DC /* AccountManager.m in Sources */,
+				64AACDEF2CBD20A100DB1AE5 /* CardPaymentViewController.swift in Sources */,
 				B803A22627AAA17D00C5C4C7 /* QRCPaymentViewController.swift in Sources */,
+				64EE62C52CD3A1D500B3C2FA /* TippingSettingsStorage.swift in Sources */,
 				9B8B199E24754A0F00C74D78 /* CustomAuthorizationProvider.m in Sources */,
+				64EE62C72CD3A1F000B3C2FA /* UserDefaults+extension.swift in Sources */,
 				E6F9FEEF1DDDFFC80051C21D /* ConsoleViewController.m in Sources */,
-				E6F9FEF31DDDFFC80051C21D /* CardPaymentViewController.m in Sources */,
 				739E173D2A4490E000839E00 /* ManualCardEntryViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -374,9 +384,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = "";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 42YXYHRXV7;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -391,6 +401,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.izettle.iZorn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "iZettleSDKSample/iZettle SDK Sample-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -403,9 +414,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				CODE_SIGN_STYLE = Manual;
-				DEVELOPMENT_TEAM = "";
+				CODE_SIGN_IDENTITY = "Apple Development";
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = 42YXYHRXV7;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
@@ -420,6 +431,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.izettle.iZorn;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OBJC_BRIDGING_HEADER = "iZettleSDKSample/iZettle SDK Sample-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
diff --git a/Example/iZettleSDKSample/Base.lproj/Main~iphone.storyboard b/Example/iZettleSDKSample/Base.lproj/Main~iphone.storyboard
index f6744bc0..196260a7 100755
--- a/Example/iZettleSDKSample/Base.lproj/Main~iphone.storyboard
+++ b/Example/iZettleSDKSample/Base.lproj/Main~iphone.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="KVb-U6-kun">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES" initialViewController="KVb-U6-kun">
     <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -12,7 +12,7 @@
         <!--Card Payment-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController storyboardIdentifier="cardPaymentViewController" id="BYZ-38-t0r" userLabel="Card Payment" customClass="CardPaymentViewController" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="cardPaymentViewController" id="BYZ-38-t0r" userLabel="Card Payment" customClass="CardPaymentViewController" customModule="iZettle_SDK_Sample" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
@@ -22,7 +22,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="8IM-Z7-6c7" userLabel="Tipping section">
-                                <rect key="frame" x="200" y="74" width="155" height="31"/>
+                                <rect key="frame" x="140.5" y="74" width="214.5" height="31"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Enable tipping" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wVs-08-pAX">
                                         <rect key="frame" x="0.0" y="0.0" width="98" height="31"/>
@@ -30,8 +30,18 @@
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="r6P-Se-shM">
+                                        <rect key="frame" x="106" y="0.0" width="51.5" height="31"/>
+                                        <state key="normal" title="Button"/>
+                                        <buttonConfiguration key="configuration" style="plain" image="gear" catalog="system">
+                                            <color key="baseForegroundColor" name="light"/>
+                                        </buttonConfiguration>
+                                        <connections>
+                                            <action selector="tippingSettingsButtonTapped:" destination="BYZ-38-t0r" eventType="touchUpInside" id="0aO-eQ-6xp"/>
+                                        </connections>
+                                    </button>
                                     <switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Hoh-Nx-Uvc">
-                                        <rect key="frame" x="106" y="0.0" width="51" height="31"/>
+                                        <rect key="frame" x="165.5" y="0.0" width="51" height="31"/>
                                         <color key="onTintColor" name="dark"/>
                                         <connections>
                                             <action selector="tippingStyleValueChanged:" destination="BYZ-38-t0r" eventType="valueChanged" id="EOH-I5-WUz"/>
@@ -43,22 +53,22 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="19" translatesAutoresizingMaskIntoConstraints="NO" id="iZM-EU-drV" userLabel="AmountContainer">
-                                <rect key="frame" x="137" y="165" width="101.5" height="163.5"/>
+                                <rect key="frame" x="137" y="165" width="101.5" height="167.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5rZ-rh-PoO">
-                                        <rect key="frame" x="3" y="0.0" width="95.5" height="33.5"/>
+                                        <rect key="frame" x="3" y="0.0" width="95.5" height="37.5"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tYO-6N-XdP">
-                                        <rect key="frame" x="0.0" y="52.5" width="101.5" height="60"/>
+                                        <rect key="frame" x="0.0" y="56.5" width="101.5" height="60"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="50"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="10" minimumValue="1" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="Ali-2G-Luq">
-                                        <rect key="frame" x="3.5" y="131.5" width="94" height="32"/>
+                                        <rect key="frame" x="3.5" y="135.5" width="94" height="32"/>
                                         <connections>
                                             <action selector="stepperValueChanged:" destination="BYZ-38-t0r" eventType="valueChanged" id="WOa-di-TGz"/>
                                         </connections>
@@ -66,7 +76,7 @@
                                 </subviews>
                             </stackView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EkW-pF-2Ud">
-                                <rect key="frame" x="46" y="393.5" width="283" height="55"/>
+                                <rect key="frame" x="46" y="397.5" width="283" height="55"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="55" id="1ZU-RI-aez"/>
                                 </constraints>
@@ -97,28 +107,19 @@
                                     </barButtonItem>
                                 </items>
                             </toolbar>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TUS-q7-qWI">
-                                <rect key="frame" x="8" y="113" width="347" height="18"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <nil key="highlightedColor"/>
-                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="iZM-EU-drV" firstAttribute="top" secondItem="8IM-Z7-6c7" secondAttribute="bottom" constant="60" id="7Wv-XZ-BkT"/>
-                            <constraint firstItem="TUS-q7-qWI" firstAttribute="trailing" secondItem="Hoh-Nx-Uvc" secondAttribute="trailing" id="Bh2-9u-vii"/>
                             <constraint firstAttribute="trailing" secondItem="534-5V-1p8" secondAttribute="trailing" id="C3g-bE-YFF"/>
                             <constraint firstItem="EkW-pF-2Ud" firstAttribute="top" secondItem="iZM-EU-drV" secondAttribute="bottom" constant="65" id="Jvb-kI-NlG"/>
                             <constraint firstItem="EkW-pF-2Ud" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leadingMargin" constant="30" id="M1f-Bt-XJh"/>
                             <constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="534-5V-1p8" secondAttribute="bottom" id="MW7-zh-w9W"/>
-                            <constraint firstItem="TUS-q7-qWI" firstAttribute="top" secondItem="8IM-Z7-6c7" secondAttribute="bottom" constant="8" id="OTu-OO-MMd"/>
                             <constraint firstItem="iZM-EU-drV" firstAttribute="centerX" secondItem="8bC-Xf-vdC" secondAttribute="centerX" id="Oab-qX-wzD"/>
                             <constraint firstItem="8IM-Z7-6c7" firstAttribute="top" secondItem="y3c-jy-aDJ" secondAttribute="bottom" constant="10" id="PHL-8k-j0i"/>
                             <constraint firstAttribute="trailingMargin" secondItem="8IM-Z7-6c7" secondAttribute="trailing" constant="4" id="ZCs-dC-CFy"/>
                             <constraint firstAttribute="trailingMargin" secondItem="EkW-pF-2Ud" secondAttribute="trailing" constant="30" id="ZJ7-qa-mMn"/>
                             <constraint firstItem="534-5V-1p8" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="hZF-G0-68x"/>
-                            <constraint firstItem="TUS-q7-qWI" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" constant="8" id="yCc-eM-41v"/>
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Card Payment" id="zj9-m8-iu5">
@@ -133,8 +134,8 @@
                     <connections>
                         <outlet property="amountLabel" destination="tYO-6N-XdP" id="Gx5-5Z-YsE"/>
                         <outlet property="lastPaymentInfoToolBar" destination="534-5V-1p8" id="aHB-l6-KiI"/>
-                        <outlet property="selectedTippingStyleLabel" destination="TUS-q7-qWI" id="nvT-0B-Xiv"/>
                         <outlet property="stepper" destination="Ali-2G-Luq" id="luv-cg-s44"/>
+                        <outlet property="tippingSettingsButton" destination="r6P-Se-shM" id="iIP-wg-n5q"/>
                         <outlet property="tippingSwitch" destination="Hoh-Nx-Uvc" id="wfe-4q-eNt"/>
                     </connections>
                 </viewController>
@@ -205,22 +206,22 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="19" translatesAutoresizingMaskIntoConstraints="NO" id="TID-Vy-tjt" userLabel="AmountContainer">
-                                <rect key="frame" x="137" y="114" width="101.5" height="163.5"/>
+                                <rect key="frame" x="137" y="114" width="101.5" height="167.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ea9-Jy-P0Z">
-                                        <rect key="frame" x="3" y="0.0" width="95.5" height="33.5"/>
+                                        <rect key="frame" x="3" y="0.0" width="95.5" height="37.5"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uxO-UU-tFk">
-                                        <rect key="frame" x="0.0" y="52.5" width="101.5" height="60"/>
+                                        <rect key="frame" x="0.0" y="56.5" width="101.5" height="60"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="50"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="vkQ-qV-Oqo">
-                                        <rect key="frame" x="3.5" y="131.5" width="94" height="32"/>
+                                        <rect key="frame" x="3.5" y="135.5" width="94" height="32"/>
                                         <connections>
                                             <action selector="amountValueChanged:" destination="wRf-fL-k09" eventType="valueChanged" id="H0h-qB-zTg"/>
                                         </connections>
@@ -228,7 +229,7 @@
                                 </subviews>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="YAE-9v-zRl" userLabel="ButtonContainer">
-                                <rect key="frame" x="46" y="342.5" width="283" height="120"/>
+                                <rect key="frame" x="46" y="346.5" width="283" height="120"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2OK-8Z-fru">
                                         <rect key="frame" x="0.0" y="0.0" width="283" height="55"/>
@@ -296,7 +297,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="DHq-LG-Jtq" userLabel="ButtonContainer">
-                                <rect key="frame" x="46" y="331.5" width="283" height="120"/>
+                                <rect key="frame" x="46" y="335.5" width="283" height="120"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oha-bh-zHN">
                                         <rect key="frame" x="0.0" y="0.0" width="283" height="33.5"/>
@@ -335,22 +336,22 @@
                                 </constraints>
                             </stackView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="19" translatesAutoresizingMaskIntoConstraints="NO" id="VOY-bT-Xwm" userLabel="AmountContainer">
-                                <rect key="frame" x="46" y="128" width="283" height="163.5"/>
+                                <rect key="frame" x="46" y="128" width="283" height="167.5"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Amount" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mgi-uN-3TU">
-                                        <rect key="frame" x="94" y="0.0" width="95.5" height="33.5"/>
+                                        <rect key="frame" x="94" y="0.0" width="95.5" height="37.5"/>
                                         <fontDescription key="fontDescription" style="UICTFontTextStyleTitle1"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10.0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2ln-GD-NPS">
-                                        <rect key="frame" x="91" y="52.5" width="101.5" height="60"/>
+                                        <rect key="frame" x="91" y="56.5" width="101.5" height="60"/>
                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="50"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <stepper opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="1" minimumValue="1" maximumValue="100" translatesAutoresizingMaskIntoConstraints="NO" id="wUw-QT-INt">
-                                        <rect key="frame" x="94.5" y="131.5" width="94" height="32"/>
+                                        <rect key="frame" x="94.5" y="135.5" width="94" height="32"/>
                                         <connections>
                                             <action selector="amountValueChanged:" destination="fnb-MU-YIC" eventType="valueChanged" id="nEJ-8y-WD6"/>
                                         </connections>
@@ -396,21 +397,21 @@
                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="listCell" textLabel="7vT-4V-zXi" detailTextLabel="Ctn-sc-ROY" style="IBUITableViewCellStyleSubtitle" id="3X2-S3-B69">
-                                <rect key="frame" x="0.0" y="50" width="375" height="62.5"/>
+                                <rect key="frame" x="0.0" y="50" width="375" height="66.5"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3X2-S3-B69" id="OjC-yQ-nqy">
-                                    <rect key="frame" x="0.0" y="0.0" width="348.5" height="62.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="348.5" height="66.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Card Payment" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontForContentSizeCategory="YES" adjustsFontSizeToFit="NO" id="7vT-4V-zXi">
-                                            <rect key="frame" x="16" y="13" width="123.5" height="24"/>
+                                            <rect key="frame" x="16" y="11.5" width="123.5" height="26"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleTitle3"/>
                                             <nil key="textColor"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ctn-sc-ROY">
-                                            <rect key="frame" x="16" y="37" width="40.5" height="13.5"/>
+                                            <rect key="frame" x="16" y="40" width="40.5" height="13.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                             <nil key="textColor"/>
@@ -466,12 +467,16 @@
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="G4O-GL-xOk"/>
+        <segue reference="UEq-N7-4j6"/>
     </inferredMetricsTieBreakers>
     <resources>
+        <image name="gear" catalog="system" width="128" height="122"/>
         <namedColor name="dark">
             <color red="0.097999997437000275" green="0.14499999582767487" blue="0.31400001049041748" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="light">
+            <color red="0.63099998235702515" green="0.55699998140335083" blue="0.94099998474121094" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <systemColor name="systemBackgroundColor">
             <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
         </systemColor>
diff --git a/Example/iZettleSDKSample/Helpers/UserDefaults+extension.swift b/Example/iZettleSDKSample/Helpers/UserDefaults+extension.swift
new file mode 100644
index 00000000..34be9014
--- /dev/null
+++ b/Example/iZettleSDKSample/Helpers/UserDefaults+extension.swift
@@ -0,0 +1,22 @@
+//
+//  UserDefaults+extension.swift
+//  iZettle SDK Sample
+//
+//  Copyright © 2024 PayPal Inc. All rights reserved.
+//
+
+
+extension UserDefaults {
+    func set<Object: Encodable>(_ objects: Array<Object>, for key: String) {
+        set(try? JSONEncoder().encode(objects), forKey: key)
+    }
+    
+    func set<Object: Encodable>(_ object: Object, for key: String) {
+        set(try? JSONEncoder().encode(object), forKey: key)
+    }
+
+    func extract<Object: Decodable>(type: Object.Type, fromKey key: String) -> Object? {
+        guard let data = value(forKey: key) as? Data else { return nil }
+        return try? JSONDecoder().decode(type, from: data)
+    }
+}
diff --git a/Example/iZettleSDKSample/TippingSettingsStorage.swift b/Example/iZettleSDKSample/TippingSettingsStorage.swift
new file mode 100644
index 00000000..606a5ee7
--- /dev/null
+++ b/Example/iZettleSDKSample/TippingSettingsStorage.swift
@@ -0,0 +1,45 @@
+//
+//  TippingSettingsStorage.swift
+//  iZettle SDK Sample
+//
+//  Copyright © 2024 PayPal Inc. All rights reserved.
+//
+
+
+import Foundation
+
+final class TippingSettingsStorage {
+
+    private static let zettleReaderTippingKey = "com.izettle.iZorn.tipping_type_zettle"
+    private static let paypalReaderTippingKey = "com.izettle.iZorn.tipping_type_paypal"
+    private static let paypalReaderPredefinedTipsKey = "com.izettle.iZorn.predefined_tips_paypal"
+
+    static let shared = TippingSettingsStorage()
+
+    var zettleReaderTippingStyle: UInt {
+        get {
+            UserDefaults.standard.extract(type: UInt.self, fromKey: Self.zettleReaderTippingKey) ?? 0
+        }
+        set {
+            UserDefaults.standard.set(newValue, for: Self.zettleReaderTippingKey)
+        }
+    }
+
+    var paypalReaderTippingStyle: UInt {
+        get {
+            UserDefaults.standard.extract(type: UInt.self, fromKey: Self.paypalReaderTippingKey) ?? 0
+        }
+        set {
+            UserDefaults.standard.set(newValue, for: Self.paypalReaderTippingKey)
+        }
+    }
+
+    var paypalReaderPredefinedTips: [UInt]? {
+        get {
+            UserDefaults.standard.extract(type: [UInt].self, fromKey: Self.paypalReaderPredefinedTipsKey)
+        }
+        set {
+            UserDefaults.standard.set(newValue, for: Self.paypalReaderPredefinedTipsKey)
+        }
+    }
+}
diff --git a/Example/iZettleSDKSample/ViewController/CardPaymentViewController.h b/Example/iZettleSDKSample/ViewController/CardPaymentViewController.h
deleted file mode 100644
index 67e83d17..00000000
--- a/Example/iZettleSDKSample/ViewController/CardPaymentViewController.h
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-//  ViewController.h
-//  iZettle SDK Sample
-//
-//  Copyright © 2015 PayPal Inc. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface CardPaymentViewController : UIViewController
-@end
-
diff --git a/Example/iZettleSDKSample/ViewController/CardPaymentViewController.m b/Example/iZettleSDKSample/ViewController/CardPaymentViewController.m
deleted file mode 100644
index 36451f5d..00000000
--- a/Example/iZettleSDKSample/ViewController/CardPaymentViewController.m
+++ /dev/null
@@ -1,175 +0,0 @@
-//
-//  ViewController.m
-//  iZettle SDK Sample
-//
-//  Copyright © 2015 PayPal Inc. All rights reserved.
-//
-
-#import "CardPaymentViewController.h"
-#import "ConsoleViewController.h"
-
-@import iZettleSDK;
-
-@interface CardPaymentViewController ()
-@property (weak, nonatomic) IBOutlet UILabel *amountLabel;
-@property (weak, nonatomic) IBOutlet UIStepper *stepper;
-@property (weak, nonatomic) IBOutlet UIToolbar *lastPaymentInfoToolBar;
-@property (weak, nonatomic) IBOutlet UISwitch *tippingSwitch;
-@property (weak, nonatomic) IBOutlet UILabel *selectedTippingStyleLabel;
-@property (assign) IZSDKTippingStyle selectedTippingStyle;
-@end
-
-@implementation CardPaymentViewController {
-    iZettleSDKPaymentInfo *_lastPaymentInfo;
-    NSString *_lastReference;
-    NSDate *_timestamp;
-    NSError *_lastError;
-}
-
-#pragma mark - View lifecycle
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    self.amountLabel.text = @"10.0";
-    self.stepper.value = self.amountLabel.text.doubleValue;
-    self.selectedTippingStyle = IZSDKTippingStyleMarketDefault;
-    [self _updateTippingStyleLabelFromStyle:self.selectedTippingStyle];
-}
-
-- (IBAction)tippingStyleValueChanged:(id)sender {
-    
-    if (self.tippingSwitch.isOn) {
-        __weak __auto_type wself = self;
-        
-        UIAlertController *tippingStyleSelectionSheet = [UIAlertController alertControllerWithTitle:@"Tipping style" message:@"Select prefered tipping style" preferredStyle:UIAlertControllerStyleActionSheet];
-        
-        UIAlertAction *marketDefaultAction = [UIAlertAction actionWithTitle:@"Market default" style:UIAlertActionStyleDefault handler:^(id _) {
-            wself.selectedTippingStyle = IZSDKTippingStyleMarketDefault;
-            [wself _updateTippingStyleLabelFromStyle:IZSDKTippingStyleMarketDefault];
-        }];
-        
-        UIAlertAction *amountAction = [UIAlertAction actionWithTitle:@"Amount" style:UIAlertActionStyleDefault handler:^(id _) {
-            wself.selectedTippingStyle = IZSDKTippingStyleAmount;
-            [wself _updateTippingStyleLabelFromStyle:IZSDKTippingStyleAmount];
-        }];
-        
-        UIAlertAction *percentageAction = [UIAlertAction actionWithTitle:@"Percentage" style:UIAlertActionStyleDefault handler:^(id _) {
-            wself.selectedTippingStyle = IZSDKTippingStylePercentage;
-            [wself _updateTippingStyleLabelFromStyle:IZSDKTippingStylePercentage];
-        }];
-        
-        UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:^(id _) {
-            [tippingStyleSelectionSheet dismissViewControllerAnimated:YES completion:nil];
-            
-            if (wself.selectedTippingStyle == IZSDKTippingStyleNone) {
-                [wself.tippingSwitch setOn:NO];
-            }
-        }];
-        
-        [tippingStyleSelectionSheet addAction:marketDefaultAction];
-        [tippingStyleSelectionSheet addAction:amountAction];
-        [tippingStyleSelectionSheet addAction:percentageAction];
-        [tippingStyleSelectionSheet addAction:cancelAction];
-        
-        [self presentViewController:tippingStyleSelectionSheet animated:YES completion:nil];
-    } else {
-        self.selectedTippingStyle = IZSDKTippingStyleNone;
-        
-        [self _updateTippingStyleLabelFromStyle:self.selectedTippingStyle];
-    }
-}
-
-#pragma mark - User interaction
-
-- (IBAction)stepperValueChanged:(UIStepper *)sender {
-    _amountLabel.text = [NSString stringWithFormat: @"%.1f", sender.value];
-}
-
-- (IBAction)charge:(id)sender {
-    // Note! Replace this reference with your own if you want to be able to query iZettle about payment info and perform refunds.
-    _lastReference = [self _uniqueReference];
-    NSDecimalNumber *amount = [NSDecimalNumber decimalNumberWithString: _amountLabel.text];
-    
-    [[iZettleSDK shared] chargeAmount:amount
-                         tippingStyle:self->_selectedTippingStyle
-                            reference:_lastReference
-            presentFromViewController:self
-                           completion:^(iZettleSDKPaymentInfo *paymentInfo, NSError *error) {
-        self->_lastPaymentInfo = paymentInfo;
-        self->_lastError = error;
-        self->_timestamp = [NSDate date];
-        
-        [self _updateLastPaymentToolbar];
-        [self _showConsole];
-    }];
-}
-
-- (IBAction)lastPaymentInfo:(id)sender {
-    [[iZettleSDK shared] retrievePaymentInfoForReference:_lastReference presentFromViewController:self completion:^(iZettleSDKPaymentInfo *paymentInfo, NSError *error) {
-        self->_lastPaymentInfo = paymentInfo;
-        self->_lastError = error;
-        [self _showConsole];
-    }];
-}
-
-- (IBAction)refundLastPayment:(id)sender {
-    NSString *paymentReference = _lastReference;
-    _lastReference = [self _uniqueReference];
-    
-    [[iZettleSDK shared] refundAmount:nil ofPaymentWithReference:paymentReference refundReference:_lastReference presentFromViewController:self completion:^(iZettleSDKPaymentInfo * _Nullable paymentInfo, NSError * _Nullable error) {
-        self->_lastPaymentInfo = paymentInfo;
-        self->_lastError = error;
-        [self _showConsole];
-    }];
-}
-
-#pragma mark - Segue handling
-
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    if ([[segue identifier] isEqualToString: @"showConsole"] && sender == self) {
-        ConsoleViewController *console = segue.destinationViewController;
-        if (_lastError) {
-            [console addToLog:_lastError];
-        } else {
-            [console addToLog:_lastPaymentInfo];
-        }
-    }
-}
-
-#pragma mark - Helpers
-
-- (void)_updateLastPaymentToolbar {
-    _lastPaymentInfoToolBar.hidden = !(_lastPaymentInfo && _lastPaymentInfo.description);
-    if (!_lastPaymentInfoToolBar.hidden) {
-        UIBarButtonItem *lastPaymentButton = [_lastPaymentInfoToolBar.items firstObject];
-        NSDateFormatter *dateFormatter = [NSDateFormatter new];
-        dateFormatter.dateStyle = NSDateFormatterNoStyle;
-        dateFormatter.timeStyle = NSDateFormatterMediumStyle;
-        lastPaymentButton.title = [NSString stringWithFormat:@"Last payment, %@", [dateFormatter stringFromDate:_timestamp]];
-    }
-}
-
-- (void)_showConsole {
-    [self performSegueWithIdentifier:@"showConsole" sender:self];
-}
-
-- (NSString *)_uniqueReference {
-    return [[NSUUID UUID] UUIDString];
-}
-
-- (void)_updateTippingStyleLabelFromStyle:(IZSDKTippingStyle)style {
-    NSString *name = [self _tippingStyleNameFromStyle:style];
-    
-    [self.selectedTippingStyleLabel setText:name];
-}
-
-- (NSString *)_tippingStyleNameFromStyle:(IZSDKTippingStyle)style {
-    switch (style) {
-        case IZSDKTippingStyleNone: return @"None";
-        case IZSDKTippingStyleMarketDefault: return @"Market default style";
-        case IZSDKTippingStyleAmount: return @"Amount style";
-        case IZSDKTippingStylePercentage: return @"Percentage style";
-    }
-}
-
-@end
diff --git a/Example/iZettleSDKSample/ViewController/CardPaymentViewController.swift b/Example/iZettleSDKSample/ViewController/CardPaymentViewController.swift
new file mode 100644
index 00000000..c8d760b5
--- /dev/null
+++ b/Example/iZettleSDKSample/ViewController/CardPaymentViewController.swift
@@ -0,0 +1,158 @@
+//
+//  CardPaymentViewController.swift
+//  iZettle SDK Sample
+//
+//  Copyright © 2024 PayPal Inc. All rights reserved.
+//
+
+import UIKit
+import iZettleSDK
+
+class CardPaymentViewController: UIViewController {
+    
+    @IBOutlet weak var amountLabel: UILabel!
+    @IBOutlet weak var stepper: UIStepper!
+    @IBOutlet weak var tippingSettingsButton: UIButton!
+    @IBOutlet weak var tippingSwitch: UISwitch!
+    @IBOutlet weak var lastPaymentInfoToolBar: UIToolbar!
+    
+    private var lastPaymentInfo: iZettleSDKPaymentInfo?
+    private var lastReference: String?
+    private var timestamp: Date?
+    private var lastError: Error?
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        tippingSettingsButton.setTitle("", for: .normal)
+        amountLabel.text = "10.0"
+        stepper.value = Double(amountLabel.text ?? "0") ?? 0.0
+    }
+    
+    
+    // MARK: - User Interaction
+    
+    @IBAction func tippingStyleValueChanged(_ sender: UISwitch) {
+        
+        if tippingSwitch.isOn {
+            tippingSettingsButton.isEnabled = true
+        } else {
+            tippingSettingsButton.isEnabled = false
+        }
+    }
+    
+    
+    @IBAction func tippingSettingsButtonTapped(_ sender: UIButton) {
+        let tippingSettingsVC = UINavigationController(rootViewController: TippingSettingsViewController())
+        present(tippingSettingsVC, animated: true)
+    }
+    
+    @IBAction func stepperValueChanged(_ sender: UIStepper) {
+        amountLabel.text = String(format: "%.1f", sender.value)
+    }
+    
+    @IBAction func charge(_ sender: Any) {
+        lastReference = makeUniqueRefrence()
+        let amount = NSDecimalNumber(string: amountLabel.text)
+        
+        iZettleSDK.shared().charge(
+            amount: amount,
+            tippingConfiguration: getSelectedTippingConfiguration(),
+            reference: lastReference,
+            presentFrom: self
+        ) { [weak self] paymentInfo, error in
+            self?.lastPaymentInfo = paymentInfo
+            self?.lastError = error
+            self?.timestamp = Date()
+            
+            self?.updateLastPaymentToolbar()
+            self?.showConsole()
+        }
+    }
+    
+    @IBAction func lastPaymentInfo(_ sender: Any) {
+        if let lastReference {
+            iZettleSDK.shared().retrievePaymentInfo(for: lastReference, presentFrom: self) { [weak self] paymentInfo, error in
+                self?.lastPaymentInfo = paymentInfo
+                self?.lastError = error
+                self?.showConsole()
+            }
+        }
+    }
+    
+    @IBAction func refundLastPayment(_ sender: Any) {
+        let paymentReference = lastReference
+        lastReference = makeUniqueRefrence()
+        
+        if let paymentReference {
+            iZettleSDK.shared().refund(amount: nil, ofPayment: paymentReference, withRefundReference: lastReference, presentFrom: self) { [weak self] paymentInfo, error in
+                self?.lastPaymentInfo = paymentInfo
+                self?.lastError = error
+                self?.showConsole()
+            }
+        }
+        
+    }
+    
+    // MARK: - Segue
+    override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
+        if segue.identifier == "showConsole" && sender as? UIViewController ==  self {
+            if let console = segue.destination as? ConsoleViewController {
+                if let lastError = lastError {
+                    console.add(toLog: lastError)
+                } else {
+                    console.add(toLog: lastPaymentInfo)
+                }
+            }
+        }
+    }
+    
+    // MARK: - Helpers
+    private func makeUniqueRefrence() -> String {
+        return UUID().uuidString
+    }
+    
+    func getSelectedTippingConfiguration() -> IZSDKTippingConfiguration {
+
+        guard tippingSwitch.isOn else {
+            return .disabled()
+        }
+
+        let zettleReaderTippingStyle = IZZettleReaderTippingStyle(rawValue: TippingSettingsStorage.shared.zettleReaderTippingStyle) ?? .none
+        let paypalReaderTippingStyle = IZPayPalReaderTippingStyle(rawValue: TippingSettingsStorage.shared.paypalReaderTippingStyle) ?? .none
+
+        if let storedPaypalReaderPredefinedTips = TippingSettingsStorage.shared.paypalReaderPredefinedTips {
+            return IZSDKTippingConfiguration(
+                zettleReaderTippingStyle: zettleReaderTippingStyle,
+                paypalReaderTippingStyle: paypalReaderTippingStyle,
+                paypalReaderPredefinedTippingValues: IZSDKPredefinedTippingValues(
+                    option1: storedPaypalReaderPredefinedTips[0],
+                    option2: storedPaypalReaderPredefinedTips[1],
+                    option3: storedPaypalReaderPredefinedTips[2]
+                )
+            )
+        } else {
+            return IZSDKTippingConfiguration(
+                zettleReaderTippingStyle: zettleReaderTippingStyle,
+                paypalReaderTippingStyle: paypalReaderTippingStyle
+            )
+        }
+    }
+    
+    private func showConsole() {
+        performSegue(withIdentifier: "showConsole", sender: self)
+    }
+    
+    private func updateLastPaymentToolbar() {
+        lastPaymentInfoToolBar.isHidden = !((lastPaymentInfo != nil) && ((lastPaymentInfo?.description) != nil))
+        
+        if !(lastPaymentInfoToolBar.isHidden), let timestamp {
+            let lastPaymentBarButton = lastPaymentInfoToolBar.items?.first
+            let dateFormatter = DateFormatter()
+            dateFormatter.dateStyle = .none
+            dateFormatter.timeStyle = .medium
+            lastPaymentBarButton?.title = "Last payment, \(dateFormatter.string(from: timestamp))"
+        }
+    }
+    
+}
diff --git a/Example/iZettleSDKSample/ViewController/ConsoleViewController.m b/Example/iZettleSDKSample/ViewController/ConsoleViewController.m
index e1310f09..4927452d 100644
--- a/Example/iZettleSDKSample/ViewController/ConsoleViewController.m
+++ b/Example/iZettleSDKSample/ViewController/ConsoleViewController.m
@@ -6,7 +6,6 @@
 //
 
 #import "ConsoleViewController.h"
-#import "CardPaymentViewController.h"
 
 @interface ConsoleViewController ()
 @property (weak, nonatomic) IBOutlet UITextView *logTextView;
diff --git a/Example/iZettleSDKSample/ViewController/ManualCardEntryViewController.swift b/Example/iZettleSDKSample/ViewController/ManualCardEntryViewController.swift
index 45bd76a5..fee07e2b 100644
--- a/Example/iZettleSDKSample/ViewController/ManualCardEntryViewController.swift
+++ b/Example/iZettleSDKSample/ViewController/ManualCardEntryViewController.swift
@@ -3,7 +3,7 @@
 //  iZettle SDK Sample
 //
 //  Created by Priyal Porwal on 22/06/23.
-//  Copyright © 2023 iZettle. All rights reserved.
+//  Copyright © 2023 PayPal Inc. All rights reserved.
 //
 
 import UIKit
diff --git a/Example/iZettleSDKSample/ViewController/SelectionTableViewController.swift b/Example/iZettleSDKSample/ViewController/SelectionTableViewController.swift
index afe2f7e5..2877b393 100644
--- a/Example/iZettleSDKSample/ViewController/SelectionTableViewController.swift
+++ b/Example/iZettleSDKSample/ViewController/SelectionTableViewController.swift
@@ -64,7 +64,7 @@ class SelectionTableViewController: UITableViewController {
         case 4:
             enforceAccount()
         case 5:
-            iZettleSDK.shared().presentSettings(from: self)
+            iZettleSDK.shared().presentSettings(from: self, configuration: IZSDKSettingsConfiguration(paypalReaderTippingSettingsEnabled: true))
         default: break
         }
         
diff --git a/Example/iZettleSDKSample/ViewController/TippingSettingsViewController.swift b/Example/iZettleSDKSample/ViewController/TippingSettingsViewController.swift
new file mode 100644
index 00000000..61c2d1e1
--- /dev/null
+++ b/Example/iZettleSDKSample/ViewController/TippingSettingsViewController.swift
@@ -0,0 +1,273 @@
+//
+//  TippingSettingsViewController.swift
+//  iZettle SDK Sample
+//
+//  Copyright © 2024 PayPal Inc. All rights reserved.
+//
+
+import UIKit
+import iZettleSDK
+
+final class TippingSettingsViewController: UITableViewController {
+    
+    private struct InteractiveSection {
+        let title: String?
+        let rows: [InteractiveRow]
+    }
+
+    private struct InteractiveRow {
+        let title: String
+        let subtitle: String?
+        let elementId: UInt
+        let isSelected: Bool
+        let action: (() -> Void)?
+        
+        init(tippingStyle: IZZettleReaderTippingStyle,
+             selectedTippingId: UInt) {
+            elementId = tippingStyle.rawValue
+            title = tippingStyle.title
+            self.isSelected = tippingStyle.rawValue == selectedTippingId
+            action = nil
+            subtitle = nil
+        }
+
+        init(tippingStyle: IZPayPalReaderTippingStyle,
+             selectedTippingId: UInt) {
+            elementId = tippingStyle.rawValue
+            title = tippingStyle.title
+            self.isSelected = tippingStyle.rawValue == selectedTippingId
+            action = nil
+            subtitle = nil
+        }
+
+        init(presetNumber: UInt,
+             value: UInt?,
+             action: @escaping () -> Void) {
+            elementId = presetNumber
+            title = "Option \(presetNumber)"
+            if let value {
+                subtitle = "\(value) %"
+            } else {
+                subtitle = "N/A"
+            }
+            self.action = action
+            isSelected = false
+        }
+
+        init(title: String,
+             action: @escaping () -> Void) {
+            self.title = title
+            self.action = action
+            subtitle = nil
+            isSelected = false
+            elementId = 0
+        }
+    }
+
+    private var dataSource: [InteractiveSection] = []
+
+    private var closeButton: UIBarButtonItem {
+        .init(
+            title: "Close",
+            style: .done,
+            target: self,
+            action: #selector(close)
+        )
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        title = "Tipping Settings"
+        navigationItem.leftBarButtonItem = closeButton
+        navigationItem.backBarButtonItem = UIBarButtonItem()
+        tableView.showsVerticalScrollIndicator = false
+        tableView.separatorStyle = .singleLine
+        tableView.tableFooterView = UIView()
+        dataSource = dataSourceWithSelectedOption()
+    }
+
+    @objc func close() {
+        self.dismiss(animated: true)
+    }
+
+    private func dataSourceWithSelectedOption() -> [InteractiveSection] {
+        let selectedZettleTipping = TippingSettingsStorage.shared.zettleReaderTippingStyle
+        let selectedPayPalTipping = TippingSettingsStorage.shared.paypalReaderTippingStyle
+        return [
+            InteractiveSection(
+                title: "Zettle Reader Tipping (V1/V2)",
+                rows: [
+                    InteractiveRow(
+                        tippingStyle: IZZettleReaderTippingStyle.none,
+                        selectedTippingId: selectedZettleTipping
+                    ),
+                    InteractiveRow(
+                        tippingStyle: IZZettleReaderTippingStyle.marketDefault,
+                        selectedTippingId: selectedZettleTipping
+                    ),
+                    InteractiveRow(
+                        tippingStyle: IZZettleReaderTippingStyle.amount,
+                        selectedTippingId: selectedZettleTipping
+                    ),
+                    InteractiveRow(
+                        tippingStyle: IZZettleReaderTippingStyle.percentage,
+                        selectedTippingId: selectedZettleTipping
+                    )
+                ]
+            ),
+            InteractiveSection(
+                title: "PayPal Reader",
+                rows: [
+                    InteractiveRow(
+                        tippingStyle: IZPayPalReaderTippingStyle.none,
+                        selectedTippingId: selectedPayPalTipping
+                    ),
+                    InteractiveRow(
+                        tippingStyle: IZPayPalReaderTippingStyle.marketDefault,
+                        selectedTippingId: selectedPayPalTipping
+                    ),
+                    InteractiveRow(
+                        tippingStyle: IZPayPalReaderTippingStyle.customAmount,
+                        selectedTippingId: selectedPayPalTipping
+                    ),
+                    InteractiveRow(
+                        tippingStyle: IZPayPalReaderTippingStyle.predefinedPercentage,
+                        selectedTippingId: selectedPayPalTipping
+                    ),
+                    InteractiveRow(
+                        tippingStyle: IZPayPalReaderTippingStyle.sdkConfigured,
+                        selectedTippingId: selectedPayPalTipping
+                    )
+                ]
+            ),
+            InteractiveSection(
+                title: "PayPal Reader Presets",
+                rows: [
+                    InteractiveRow(title: "Nullify presets", action: { TippingSettingsStorage.shared.paypalReaderPredefinedTips = nil }),
+                    InteractiveRow(title: "Use default presets", action: { TippingSettingsStorage.shared.paypalReaderPredefinedTips = [ 15, 20, 25 ] }),
+
+                    InteractiveRow(
+                        presetNumber: 1,
+                        value: TippingSettingsStorage.shared.paypalReaderPredefinedTips?[0],
+                        action: { [weak self] in self?.showPresetEditor(presetNumber: 1) }
+                    ),
+                    InteractiveRow(
+                        presetNumber: 2,
+                        value: TippingSettingsStorage.shared.paypalReaderPredefinedTips?[1],
+                        action: { [weak self] in self?.showPresetEditor(presetNumber: 2) }
+                    ),
+                    InteractiveRow(
+                        presetNumber: 3,
+                        value: TippingSettingsStorage.shared.paypalReaderPredefinedTips?[2],
+                        action: { [weak self] in self?.showPresetEditor(presetNumber: 3) }
+                    )
+                ]
+            )
+        ]
+    }
+
+    override func numberOfSections(in tableView: UITableView) -> Int {
+        dataSource.count
+    }
+
+    override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        dataSource[section].rows.count
+    }
+
+    override func tableView(_ tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
+        dataSource[section].title
+    }
+
+    override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let item = dataSource[indexPath.section].rows[indexPath.row]
+        let cell: UITableViewCell
+        switch indexPath.section {
+        case 0, 1:
+            cell = UITableViewCell(style: .default, reuseIdentifier: "TippingCell")
+            cell.textLabel?.text = item.title
+            cell.accessoryType = item.isSelected ? .checkmark : .none
+        case 2:
+            cell = UITableViewCell(style: .value1, reuseIdentifier: "TippingDetailsCell")
+            cell.textLabel?.text = item.title
+            cell.detailTextLabel?.text = item.subtitle
+        default:
+            cell = UITableViewCell(style: .default, reuseIdentifier: "N/A")
+            cell.textLabel?.text = "N/A"
+        }
+        return cell
+    }
+
+    override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        tableView.deselectRow(at: indexPath, animated: true)
+        let row = dataSource[indexPath.section].rows[indexPath.row]
+        switch indexPath.section {
+        case 0:
+            TippingSettingsStorage.shared.zettleReaderTippingStyle = row.elementId
+        case 1:
+            TippingSettingsStorage.shared.paypalReaderTippingStyle = row.elementId
+        case 2:
+            row.action?()
+        default:
+            break
+        }
+        dataSource = dataSourceWithSelectedOption()
+        tableView.reloadData()
+    }
+
+    private func showPresetEditor(presetNumber: UInt) {
+        let alertController = UIAlertController(
+            title: "Edit preset \(presetNumber)",
+            message: "Enter new preset value",
+            preferredStyle: .alert
+        )
+
+        alertController.addTextField { textField in
+            textField.keyboardType = .decimalPad
+            textField.font = UIFont.monospacedDigitSystemFont(ofSize: 20, weight: .regular)
+        }
+
+        alertController.addAction(UIAlertAction(title: "Cancel", style: .cancel))
+
+        alertController.addAction(UIAlertAction(title: "Save", style: .default, handler: { [weak self] _ in
+            guard let self else { return }
+            let presetString = alertController.textFields!.first!.text!
+            let presetValue = NSDecimalNumber(string: presetString, locale: Locale.current)
+
+            var currentPresets = TippingSettingsStorage.shared.paypalReaderPredefinedTips ?? [0, 0, 0]
+            currentPresets[Int(presetNumber) - 1] = presetValue.uintValue
+            TippingSettingsStorage.shared.paypalReaderPredefinedTips = currentPresets
+
+            self.dataSource = self.dataSourceWithSelectedOption()
+            self.tableView.reloadData()
+        }))
+
+        present(alertController, animated: true)
+    }
+}
+
+extension IZZettleReaderTippingStyle {
+
+    var title: String {
+        switch self {
+        case .none:          "None"
+        case .marketDefault: "Market default"
+        case .amount:        "Amount"
+        case .percentage:    "Percentage"
+        @unknown default:    "None"
+        }
+    }
+}
+
+extension IZPayPalReaderTippingStyle {
+
+    var title: String {
+        switch self {
+        case .none:                 "None"
+        case .marketDefault:        "Market default"
+        case .customAmount:         "Custom amount"
+        case .predefinedPercentage: "Predefined Percentage"
+        case .sdkConfigured:        "SDK configured"
+        @unknown default:           "None"
+        }
+    }
+}