Merge branch 'develop' into audit-target

# Conflicts:
#	Kukai Mobile.xcodeproj/project.pbxproj
#	Kukai Mobile/Info.plist
#	Kukai MobileTests/Info.plist
#	Kukai MobileUITests/Info.plist

Author: simonmcl

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

@@ -12,7 +12,7 @@ jobs:
     runs-on: macos-13
     steps:
       - name: Select Xcode version
-        run: sudo xcode-select -s '/Applications/Xcode_14.3.1.app/Contents/Developer'
+        run: sudo xcode-select -s '/Applications/Xcode_15.0.1.app/Contents/Developer'
 
       - name: Checkout repository
         uses: actions/checkout@v4.1.1
@@ -41,6 +41,13 @@ jobs:
       # Upload Base64 copies of apple certs to github following these instructions: 
       # Note: Use app store distribution certs
       # https://docs.github.com/en/actions/guides/installing-an-apple-certificate-on-macos-runners-for-xcode-development
+      # 
+      # Every time we update certs / profiles or they expire, we need to update the following github actions secrets
+      # BUILD_CERTIFICATE_BASE64              = exported distribution cert from inside Xcode account settings, copied with `base64 -i <file-path> | pbcopy`
+      # P12_PASSWORD                          = whatever new password created for previous file
+      # BUILD_PROVISION_PROFILE_BASE64        = download "Kukai Mobile Prov Dist App Store" from app store connect, copied with `base64 -i <file-path> | pbcopy`
+      # BUILD_PROVISION_PROFILE_BETA_BASE64   = download "Kukai Mobile Beta Prov Dist App Store" from app store connect, copied with `base64 -i <file-path> | pbcopy`
+      #
       - name: Install the Apple certificate and provisioning profile
         run: |
           # create variables

Kukai Mobile.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 53;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -19,6 +19,7 @@
 		C001D5AE2A027ED60089EC7A /* CollectiblesRecentsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C001D5AD2A027ED60089EC7A /* CollectiblesRecentsViewModel.swift */; };
 		C001D5B02A027F330089EC7A /* CollectionDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C001D5AF2A027F330089EC7A /* CollectionDetailsViewController.swift */; };
 		C001D5B22A027F410089EC7A /* CollectionDetailsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C001D5B12A027F410089EC7A /* CollectionDetailsViewModel.swift */; };
+		C003AEB42B470D6E00AEC4A8 /* SendAbstractConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C003AEB32B470D6E00AEC4A8 /* SendAbstractConfirmViewController.swift */; };
 		C003CECB27FDE9C900F64B4C /* CloudKitService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C003CECA27FDE9C900F64B4C /* CloudKitService.swift */; };
 		C003CECD27FDED5D00F64B4C /* CKRecord+extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C003CECC27FDED5D00F64B4C /* CKRecord+extensions.swift */; };
 		C005BA322822D3DC00D8369D /* AddWalletViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C005BA312822D3DC00D8369D /* AddWalletViewController.swift */; };
@@ -191,6 +192,7 @@
 		C06EA1A626A56C6E006029CF /* OnboardingPageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C06EA1A526A56C6E006029CF /* OnboardingPageViewController.swift */; };
 		C06F28222A0E811D00543E31 /* AccountsContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C06F28212A0E811D00543E31 /* AccountsContainerViewController.swift */; };
 		C0717B1E2A697D3D007F9419 /* EnterCustomBakerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0717B1D2A697D3D007F9419 /* EnterCustomBakerViewController.swift */; };
+		C073938D2B50053500344DBC /* SendGenericConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C073938C2B50053500344DBC /* SendGenericConfirmViewController.swift */; };
 		C073C0DE29E6CADC0064FBEF /* LoadingContainerCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C073C0DD29E6CADC0064FBEF /* LoadingContainerCell.swift */; };
 		C0742C53297ADC8E005D6DB0 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0742C52297ADC8E005D6DB0 /* MenuViewController.swift */; };
 		C074EC632AF50CBA008B2F56 /* Test_10_ConnectedApps.swift in Sources */ = {isa = PBXBuildFile; fileRef = C074EC622AF50CBA008B2F56 /* Test_10_ConnectedApps.swift */; };
@@ -240,6 +242,7 @@
 		C08F6913273ABD7300CCB6E3 /* SwapTokenViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C08F6912273ABD7300CCB6E3 /* SwapTokenViewModel.swift */; };
 		C08FE23A2AD4343500327BF9 /* BackupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C08FE2392AD4343500327BF9 /* BackupViewController.swift */; };
 		C090A6732B0BA1C000F50C76 /* TokenDetailsHeaderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C090A6722B0BA1C000F50C76 /* TokenDetailsHeaderCell.swift */; };
+		C09392BF2B31BE4C0094DFC8 /* security.plist in Resources */ = {isa = PBXBuildFile; fileRef = C09392BE2B31BE4C0094DFC8 /* security.plist */; };
 		C095367D2A0A9284001B20C4 /* StorageService.swift in Sources */ = {isa = PBXBuildFile; fileRef = C095367C2A0A9284001B20C4 /* StorageService.swift */; };
 		C09536812A0A94E4001B20C4 /* LengthValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C09536802A0A94E4001B20C4 /* LengthValidator.swift */; };
 		C09536832A0A9587001B20C4 /* ConfirmationValidator.swift in Sources */ = {isa = PBXBuildFile; fileRef = C09536822A0A9587001B20C4 /* ConfirmationValidator.swift */; };
@@ -419,6 +422,7 @@
 		C001D5AD2A027ED60089EC7A /* CollectiblesRecentsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectiblesRecentsViewModel.swift; sourceTree = "<group>"; };
 		C001D5AF2A027F330089EC7A /* CollectionDetailsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionDetailsViewController.swift; sourceTree = "<group>"; };
 		C001D5B12A027F410089EC7A /* CollectionDetailsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CollectionDetailsViewModel.swift; sourceTree = "<group>"; };
+		C003AEB32B470D6E00AEC4A8 /* SendAbstractConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendAbstractConfirmViewController.swift; sourceTree = "<group>"; };
 		C003CECA27FDE9C900F64B4C /* CloudKitService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudKitService.swift; sourceTree = "<group>"; };
 		C003CECC27FDED5D00F64B4C /* CKRecord+extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "CKRecord+extensions.swift"; sourceTree = "<group>"; };
 		C005BA312822D3DC00D8369D /* AddWalletViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddWalletViewController.swift; sourceTree = "<group>"; };
@@ -593,6 +597,7 @@
 		C06EA1A526A56C6E006029CF /* OnboardingPageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingPageViewController.swift; sourceTree = "<group>"; };
 		C06F28212A0E811D00543E31 /* AccountsContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsContainerViewController.swift; sourceTree = "<group>"; };
 		C0717B1D2A697D3D007F9419 /* EnterCustomBakerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnterCustomBakerViewController.swift; sourceTree = "<group>"; };
+		C073938C2B50053500344DBC /* SendGenericConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendGenericConfirmViewController.swift; sourceTree = "<group>"; };
 		C073C0DD29E6CADC0064FBEF /* LoadingContainerCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingContainerCell.swift; sourceTree = "<group>"; };
 		C0742C52297ADC8E005D6DB0 /* MenuViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MenuViewController.swift; sourceTree = "<group>"; };
 		C074EC622AF50CBA008B2F56 /* Test_10_ConnectedApps.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Test_10_ConnectedApps.swift; sourceTree = "<group>"; };
@@ -642,6 +647,7 @@
 		C08F6912273ABD7300CCB6E3 /* SwapTokenViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwapTokenViewModel.swift; sourceTree = "<group>"; };
 		C08FE2392AD4343500327BF9 /* BackupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackupViewController.swift; sourceTree = "<group>"; };
 		C090A6722B0BA1C000F50C76 /* TokenDetailsHeaderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenDetailsHeaderCell.swift; sourceTree = "<group>"; };
+		C09392BE2B31BE4C0094DFC8 /* security.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = security.plist; sourceTree = "<group>"; };
 		C095367C2A0A9284001B20C4 /* StorageService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StorageService.swift; sourceTree = "<group>"; };
 		C09536802A0A94E4001B20C4 /* LengthValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LengthValidator.swift; sourceTree = "<group>"; };
 		C09536822A0A9587001B20C4 /* ConfirmationValidator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmationValidator.swift; sourceTree = "<group>"; };
@@ -1354,6 +1360,7 @@
 				C0B03650269EE2070071ACD0 /* Info.plist */,
 				C0B0367B269F37340071ACD0 /* ExportOptions-Beta.plist */,
 				C0B03679269F1E450071ACD0 /* ExportOptions.plist */,
+				C09392BE2B31BE4C0094DFC8 /* security.plist */,
 				C0BADFFE291554D200E78C26 /* Fonts */,
 				C0678DC0272056A900DEF1CB /* Localization */,
 				C049B59F26A0492600F1C5E0 /* Modules */,
@@ -1398,10 +1405,12 @@
 				C09860A927C3C24E00F888AF /* SendToViewController.swift */,
 				C07FC40C27C539A40056FA47 /* SendToViewModel.swift */,
 				C09860AD27C3C26B00F888AF /* SendTokenAmountViewController.swift */,
+				C003AEB32B470D6E00AEC4A8 /* SendAbstractConfirmViewController.swift */,
 				C0E2317C29897BB5007BC79D /* SendTokenConfirmViewController.swift */,
 				C0A9865629895A6A0092EA2F /* SendCollectibleAmountViewController.swift */,
 				C0FAD1D52992992500FB813B /* SendCollectibleConfirmViewController.swift */,
 				C0151B262A15256900C7F250 /* SendContractConfirmViewController.swift */,
+				C073938C2B50053500344DBC /* SendGenericConfirmViewController.swift */,
 			);
 			path = Send;
 			sourceTree = "<group>";
@@ -1664,7 +1673,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
 				LastSwiftUpdateCheck = 1250;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1500;
 				TargetAttributes = {
 					C0B0363E269EE2070071ACD0 = {
 						CreatedOnToolsVersion = 12.5;
@@ -1740,6 +1749,7 @@
 				C0503657271ED88700E7A664 /* Main.storyboard in Resources */,
 				C09860C127C3F7CB00F888AF /* EnterAddressComponent.xib in Resources */,
 				C0678DC3272056D400DEF1CB /* Localizable.strings in Resources */,
+				C09392BF2B31BE4C0094DFC8 /* security.plist in Resources */,
 				C0EA19CB29096DD200E6B40D /* CollectibleDetailNameCell.xib in Resources */,
 				C0C7DFB829BF34ED00F60E0C /* SideMenu.storyboard in Resources */,
 				C0EA19C129096D9400E6B40D /* CollectibleDetailImageCell.xib in Resources */,
@@ -1851,6 +1861,7 @@
 				C0A321D627C68C0100D7788B /* Validator.swift in Sources */,
 				C08462412919204800B7D62D /* UIView+gradients.swift in Sources */,
 				C04E2866293F94D700DC4171 /* TokenDetailsSendCell.swift in Sources */,
+				C003AEB42B470D6E00AEC4A8 /* SendAbstractConfirmViewController.swift in Sources */,
 				C0A321DC27C6943900D7788B /* TokenAmountValidator.swift in Sources */,
 				C0C7DFBF29BF70DD00F60E0C /* SideMenuViewModel.swift in Sources */,
 				C04E2860293F940E00DC4171 /* TokenDetailsChartCell.swift in Sources */,
@@ -1953,6 +1964,7 @@
 				C0FA74DC2A4B011200CA845B /* LoadingCollectibleCell.swift in Sources */,
 				C08694EC27BD5F8C000A4909 /* RequestIfService.swift in Sources */,
 				C07538152AAB65CA0041550F /* SideMenuAboutCell.swift in Sources */,
+				C073938D2B50053500344DBC /* SendGenericConfirmViewController.swift in Sources */,
 				C083E65B2A6EC7D600B3BEBE /* DiscoverHeadingCell.swift in Sources */,
 				C049E73A2881837F00887B64 /* AccountsViewController.swift in Sources */,
 				C044E1372AAF66F80085652F /* SideMenuSecurityViewModel.swift in Sources */,
@@ -2206,6 +2218,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2241,6 +2254,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -2259,6 +2273,7 @@
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
+				OTHER_LDFLAGS = "\"-Wl,-no_warn_duplicate_libraries\"";
 				PRODUCT_NAME = Kuaki;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos";
@@ -2272,6 +2287,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2307,6 +2323,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2318,6 +2335,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = "\"-Wl,-no_warn_duplicate_libraries\"";
 				PRODUCT_NAME = Kukai;
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -2336,7 +2354,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Kukai Mobile/Kukai Mobile.entitlements";
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 209;
+				CURRENT_PROJECT_VERSION = 231;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
@@ -2376,7 +2394,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 209;
+				CURRENT_PROJECT_VERSION = 231;
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
 				ENABLE_BITCODE = NO;
@@ -2494,6 +2512,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_ASSET_SYMBOLS = NO;
 				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
@@ -2529,6 +2548,7 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -2540,6 +2560,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 16.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
+				OTHER_LDFLAGS = "\"-Wl,-no_warn_duplicate_libraries\"";
 				PRODUCT_NAME = "Kukai Beta";
 				SDKROOT = iphoneos;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -2559,7 +2580,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 209;
+				CURRENT_PROJECT_VERSION = 231;
 				DEVELOPMENT_TEAM = TK7KK2VPJP;
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = TK7KK2VPJP;
 				ENABLE_BITCODE = NO;
@@ -2699,7 +2720,7 @@
 			repositoryURL = "https://github.com/WalletConnect/WalletConnectSwiftV2";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.9.1;
+				minimumVersion = 1.10.0;
 			};
 		};
 		C07A2DEE2AEA76BF00550E32 /* XCRemoteSwiftPackageReference "Starscream" */ = {

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

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

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1500"
    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 = "1430"
+   LastUpgradeVersion = "1500"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

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

@@ -16,6 +16,7 @@ class CustomAVPlayerViewController: AVPlayerViewController {
 
 	private var viewToMonitor: UIView? = nil
 	private var previousValue = true
+	private var hiddenObserver: NSKeyValueObservation? = nil
 
 	public weak var customDelegate: CustomAVPlayerViewControllerDelegate? = nil
 
@@ -27,18 +28,18 @@ class CustomAVPlayerViewController: AVPlayerViewController {
 		previousValue = viewToMonitor?.isHidden ?? true
 
 		viewToMonitor?.addObserver(self, forKeyPath: "hidden", context: nil)
+		
+		self.hiddenObserver = viewToMonitor?.observe(\.isHidden, changeHandler: { [weak self] view, change in
+			if self?.previousValue != view.isHidden {
+				self?.previousValue = view.isHidden
+				self?.customDelegate?.playbackControlsChanged(visible: !view.isHidden)
+			}
+		})
+		
 	}
 
 	deinit {
-		viewToMonitor?.removeObserver(self, forKeyPath: "hidden")
-	}
-	
-	override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
-		
-		// Check if its the correct element and avoid double trigger
-		if keyPath == "hidden", let v = viewToMonitor, previousValue != v.isHidden {
-			previousValue = v.isHidden
-			customDelegate?.playbackControlsChanged(visible: !v.isHidden)
-		}
+		hiddenObserver?.invalidate()
+		hiddenObserver = nil
 	}
 }

Kukai Mobile/Controls/CustomAVPlayerViewController.swift

@@ -195,7 +195,7 @@ public class ThemeManager {
 
 				// Gradient
 				"gradBgFull-1": UIColor("#FFFFFF"),
-				"gradBgFull-2": UIColor("#F5F6FF"),
+				"gradBgFull-2": UIColor("#E9EAF2"),
 				"gradBgFull-3": UIColor("#E9EAF2"),
 				"gradModal-1": UIColor("#FFFFFF"),
 				"gradModal-2": UIColor("#EEEFF7"),
@@ -408,7 +408,7 @@ public class ThemeManager {
 
 				// Gradient
 				"gradBgFull-1": UIColor("#1B1C2B"),
-				"gradBgFull-2": UIColor("#0E0F17"),
+				"gradBgFull-2": UIColor("#12121C"),
 				"gradBgFull-3": UIColor("#0A0A0F"),
 				"gradModal-1": UIColor("#1B1C2B"),
 				"gradModal-2": UIColor("#1B1C2B"),