Merge branch 'develop'

# Conflicts:
#	Kukai Mobile.xcodeproj/project.pbxproj
#	Kukai Mobile/Info.plist
#	Kukai Mobile/Services/WalletConnectService.swift

.github/workflows/build-and-deploy.yml

@@ -8,10 +8,10 @@ on:
 jobs:
   deploy:
     name: Deploying to Testflight
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_15.4.app/Contents/Developer'
+        run: sudo xcode-select -s '/Applications/Xcode_16.app/Contents/Developer'
 
       - name: Checkout repository
         uses: actions/[email protected]
@@ -31,7 +31,7 @@ jobs:
           echo "BUILD_PROVISION_PROFILE_BASE64=${{ secrets.BUILD_PROVISION_PROFILE_BASE64 }}" >> $GITHUB_ENV
       
       - name: Setup env varibales for develop
-        if: github.ref == 'refs/heads/develop'
+        if: github.ref != 'refs/heads/main'
         run: |
           echo "BUILD_PROVISION_PROFILE_BASE64=${{ secrets.BUILD_PROVISION_PROFILE_BETA_BASE64 }}" >> $GITHUB_ENV
       
@@ -74,7 +74,7 @@ jobs:
 
       # Auto increment build number on Dev builds only to avoid mismatch between TestFlight setups
       - name: Auto update build number
-        if: github.ref == 'refs/heads/develop'
+        if: github.ref != 'refs/heads/main'
         run: agvtool next-version -all
 
       # Build and archive for main or develop
@@ -83,7 +83,7 @@ jobs:
         run: xcodebuild -scheme "Kukai Mobile Release" -sdk iphoneos -configuration Release -archivePath $PWD/build/Kukai-mobile.xcarchive clean archive
 
       - name: Build and Archive
-        if: github.ref == 'refs/heads/develop'
+        if: github.ref != 'refs/heads/main'
         run: xcodebuild -scheme "Kukai Mobile Beta" -sdk iphoneos -configuration Beta -archivePath $PWD/build/Kukai-mobile.xcarchive clean archive
 
       # Export .ipa for main or develop
@@ -92,7 +92,7 @@ jobs:
         run: xcodebuild -archivePath $PWD/build/Kukai-mobile.xcarchive -exportOptionsPlist "Kukai Mobile/ExportOptions.plist" -exportPath $PWD/build -allowProvisioningUpdates -exportArchive
 
       - name: Export .ipa
-        if: github.ref == 'refs/heads/develop'
+        if: github.ref != 'refs/heads/main'
         run: xcodebuild -archivePath $PWD/build/Kukai-mobile.xcarchive -exportOptionsPlist "Kukai Mobile/ExportOptions-Beta.plist" -exportPath $PWD/build -allowProvisioningUpdates -exportArchive
 
 
@@ -123,7 +123,7 @@ jobs:
           fi
         
       - name: Commit new version number
-        if: ${{ github.ref == 'refs/heads/develop' && success() }}
+        if: ${{ github.ref != 'refs/heads/main' && success() }}
         run: |
           git add .
           git commit -m "bump version"

.github/workflows/codeql.yml

@@ -10,10 +10,10 @@ on:
 jobs:
   deploy:
     name: Running unit tests
-    runs-on: macos-14
+    runs-on: macos-15
     steps:
       - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_15.4.app/Contents/Developer'
+        run: sudo xcode-select -s '/Applications/Xcode_16.app/Contents/Developer'
 
       - name: Checkout repository
         uses: actions/[email protected]

Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,5 +1,5 @@
 {
-  "originHash" : "63ef5bd7c3095926099787a921257da1d6e48bdf0726dfa82364568c233eb53a",
+  "originHash" : "0d18dce6a4b7a3b395728aab63bab5c0fe0fe3554008cf00a4d0f60083aae4dc",
   "pins" : [
     {
       "identity" : "anycodable",
@@ -33,8 +33,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/torusresearch/customauth-swift-sdk",
       "state" : {
-        "revision" : "60b48acb161fb4341c353c27bc6dd96af76887ff",
-        "version" : "10.0.1"
+        "revision" : "57d0bf90db2cd0f740726646569c614f352d7d29",
+        "version" : "10.0.2"
       }
     },
     {
@@ -70,7 +70,7 @@
       "location" : "https://github.com/kukai-wallet/kukai-core-swift",
       "state" : {
         "branch" : "develop",
-        "revision" : "ce9be84d54254ac954b36b4258481d83af0de496"
+        "revision" : "e7fe6e2e8d95feffbd8fd81bf4eeabef1b372a37"
       }
     },
     {
@@ -91,6 +91,15 @@
         "version" : "14.3.1"
       }
     },
+    {
+      "identity" : "reown-swift",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/reown-com/reown-swift",
+      "state" : {
+        "revision" : "de2a59434695985fcd541a94b3f635f537c09d97",
+        "version" : "1.0.5"
+      }
+    },
     {
       "identity" : "sdwebimage",
       "kind" : "remoteSourceControl",
@@ -114,8 +123,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/getsentry/sentry-cocoa",
       "state" : {
-        "revision" : "7fc7ca43967e2980d8691a8e017c118a84133aac",
-        "version" : "8.26.0"
+        "revision" : "0b8ba88f5fd70062887d55f87a970c59b1ceebcf",
+        "version" : "8.39.0"
       }
     },
     {
@@ -173,12 +182,12 @@
       }
     },
     {
-      "identity" : "walletconnectswiftv2",
+      "identity" : "wallet-mobile-sdk",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/simonmcl/WalletConnectSwiftV2",
+      "location" : "https://github.com/MobileWalletProtocol/wallet-mobile-sdk",
       "state" : {
-        "branch" : "1.19.3-with-manifest",
-        "revision" : "791d51fc22dc7f82b07896c98db5ecafa6c49b91"
+        "revision" : "4aa89e682f8d7ab1515d85d0797f0d25306bb56a",
+        "version" : "1.0.5"
       }
     }
   ],

Kukai Mobile.xcodeproj/xcshareddata/xcschemes/Kukai Mobile Beta.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Kukai Mobile.xcodeproj/xcshareddata/xcschemes/Kukai Mobile Debug.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Kukai Mobile.xcodeproj/xcshareddata/xcschemes/Kukai Mobile Release.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1540"
+   LastUpgradeVersion = "1600"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Kukai Mobile/AppDelegate.swift

@@ -33,6 +33,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 			SentrySDK.start { options in
 				options.dsn = "https://[email protected]/4505443257024512"
 				options.enableWatchdogTerminationTracking = false
+				options.enableSigtermReporting = false
 				options.beforeSend = { (event) -> Event? in
 
 					// Scrub any identifiable data to keep users anonymous

Kukai Mobile/Assets.xcassets/Icons/Masters/template/CustomPath.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "CustomPath.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Kukai Mobile/Assets.xcassets/Icons/Masters/template/WalletLedgerMenu.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "WalletLedger.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Kukai Mobile/Assets.xcassets/Icons/Masters/template/arrow-dashed-left.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "arrow-dashed-left.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Kukai Mobile/Assets.xcassets/Icons/Masters/template/arrow-dashed-right.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "arrow-dashed-right.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Kukai Mobile/Assets.xcassets/Icons/Masters/template/ledger-logo.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "ledger-logo.svg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "preserves-vector-representation" : true,
+    "template-rendering-intent" : "template"
+  }
+}

Kukai Mobile/Controls/BottomSheetMediumSegue.swift

@@ -14,7 +14,16 @@ public class BottomSheetMediumSegue: UIStoryboardSegue {
 			return
 		}
 
-		dest.detents = [.medium()]
+		let isTooSmallForMeidum = (UIScreen.main.bounds.height < 700)
+		var detents: [UISheetPresentationController.Detent] = []
+
+		if isTooSmallForMeidum {
+			detents = [.large()]
+		} else {
+			detents = [.medium()]
+		}
+
+		dest.detents = detents
 		dest.prefersGrabberVisible = true
 		dest.preferredCornerRadius = 30
 

Kukai Mobile/Controls/EnterAddressComponent/AddressTypeViewController.swift

@@ -56,27 +56,27 @@ class AddressTypeViewController: UIViewController, UITableViewDelegate, UITableV
 	}
 
 	static func imageFor(addressType: AddressType) -> UIImage {
-		var tempMetadata = WalletMetadata(address: "", hdWalletGroupName: nil, type: .regular, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
+		var tempMetadata = WalletMetadata(address: "", derivationPath: nil, hdWalletGroupName: nil, type: .regular, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
 
 		switch addressType {
 			case .tezosAddress:
-				tempMetadata = WalletMetadata(address: "", hdWalletGroupName: nil, type: .regular, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
+				tempMetadata = WalletMetadata(address: "", derivationPath: nil, hdWalletGroupName: nil, type: .regular, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
 
 			case .tezosDomain:
 				let fakeRecord = TezosDomainsReverseRecord(id: "123", address: "123", owner: "123", expiresAtUtc: "123", domain: TezosDomainsDomain(name: "123", address: "123"))
-				tempMetadata = WalletMetadata(address: "", hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, mainnetDomains: [fakeRecord], ghostnetDomains: [fakeRecord], type: .regular, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
+				tempMetadata = WalletMetadata(address: "", derivationPath: nil, hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, mainnetDomains: [fakeRecord], ghostnetDomains: [fakeRecord], type: .regular, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
 
 			case .gmail:
-				tempMetadata = WalletMetadata(address: "", hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, socialType: .google, type: .social, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
+				tempMetadata = WalletMetadata(address: "", derivationPath: nil, hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, socialType: .google, type: .social, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
 
 			case .reddit:
-				tempMetadata = WalletMetadata(address: "", hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, socialType: .reddit, type: .social, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
+				tempMetadata = WalletMetadata(address: "", derivationPath: nil, hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, socialType: .reddit, type: .social, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
 
 			case .twitter:
-				tempMetadata = WalletMetadata(address: "", hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, socialType: .twitter, type: .social, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
+				tempMetadata = WalletMetadata(address: "", derivationPath: nil, hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, socialType: .twitter, type: .social, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
 
 			case .email:
-				tempMetadata = WalletMetadata(address: "", hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, socialType: .email, type: .social, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
+				tempMetadata = WalletMetadata(address: "", derivationPath: nil, hdWalletGroupName: nil, walletNickname: nil, socialUsername: nil, socialType: .email, type: .social, children: [], isChild: false, isWatchOnly: false, bas58EncodedPublicKey: "", backedUp: false)
 		}
 
 		return TransactionService.walletMedia(forWalletMetadata: tempMetadata, ofSize: .size_22).image

Kukai Mobile/Controls/GradientView.swift

@@ -25,6 +25,7 @@ class GradientView: UIView {
 		case fullScreenBackground
 		case modalBackground
 		case tableViewCell
+		case tableViewCellNoRounding
 		case tableViewCellUnconfirmed
 		case tableViewCellFailed
 		case collectibleAttributes
@@ -112,6 +113,13 @@ class GradientView: UIView {
 				self.maskToBounds = true
 				self.borderWidth = 0
 
+			case .tableViewCellNoRounding:
+				self.locations = [0.26, 0.67]
+				self.degrees = cssDegreesToIOS(92.91)
+				self.customCornerRadius = 0
+				self.maskToBounds = true
+				self.borderWidth = 0
+
 			case .tableViewCellUnconfirmed:
 				self.locations = [0.01, 0.93]
 				self.degrees = cssDegreesToIOS(90.36)
@@ -145,7 +153,7 @@ class GradientView: UIView {
 			case .modalBackground:
 				self.colors = [UIColor.colorNamed("gradModal-1").cgColor, UIColor.colorNamed("gradModal-2").cgColor, UIColor.colorNamed("gradModal-3").cgColor]
 
-			case .tableViewCell:
+			case .tableViewCell, .tableViewCellNoRounding:
 				self.colors = [UIColor.colorNamed("gradPanelRows-1").cgColor, UIColor.colorNamed("gradPanelRows-2").cgColor]
 
 			case .tableViewCellUnconfirmed: