diff --git a/Podfile b/Podfile index ca55afd1d..5262ed2e7 100644 --- a/Podfile +++ b/Podfile @@ -4,7 +4,8 @@ project 'decred_wallet' target 'Decred Wallet' do # Comment the next line if you're not using Swift and don't want to use dynamic frameworks use_frameworks! - pod 'SlideMenuControllerSwift' + # use swift5 branch pending when cocoapods gets updated with official support for swift 5 + pod 'SlideMenuControllerSwift', :git => 'https://github.com/itswisdomagain/SlideMenuControllerSwift.git', :branch => 'swift5' pod 'JGProgressHUD' pod 'QRCodeReader.swift' pod 'CryptoSwift' diff --git a/Podfile.lock b/Podfile.lock index 664086591..94e9da60b 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -5,7 +5,7 @@ PODS: - Fabric (1.9.0) - JGProgressHUD (2.0.3) - MBProgressHUD (1.1.0) - - QRCodeReader.swift (10.0.0) + - QRCodeReader.swift (10.1.0) - SlideMenuControllerSwift (4.0.0) DEPENDENCIES: @@ -15,7 +15,7 @@ DEPENDENCIES: - JGProgressHUD - MBProgressHUD - QRCodeReader.swift - - SlideMenuControllerSwift + - SlideMenuControllerSwift (from `https://github.com/itswisdomagain/SlideMenuControllerSwift.git`, branch `swift5`) SPEC REPOS: https://github.com/cocoapods/specs.git: @@ -25,7 +25,16 @@ SPEC REPOS: - JGProgressHUD - MBProgressHUD - QRCodeReader.swift - - SlideMenuControllerSwift + +EXTERNAL SOURCES: + SlideMenuControllerSwift: + :branch: swift5 + :git: https://github.com/itswisdomagain/SlideMenuControllerSwift.git + +CHECKOUT OPTIONS: + SlideMenuControllerSwift: + :commit: d61e2a3bfaf8b6c0727667add98e40571728503f + :git: https://github.com/itswisdomagain/SlideMenuControllerSwift.git SPEC CHECKSUMS: Crashlytics: 07fb167b1694128c1c9a5a5cc319b0e9c3ca0933 @@ -33,9 +42,9 @@ SPEC CHECKSUMS: Fabric: f988e33c97f08930a413e08123064d2e5f68d655 JGProgressHUD: 12b20a8f4ffe05258f8635c1ab92816e451f904d MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9 - QRCodeReader.swift: 74d0378eb0c7807828552b49626bbc8307495aee - SlideMenuControllerSwift: 021d6318201c53d4d4d3710517d43d6c556c7dd0 + QRCodeReader.swift: 373a389fe9a22d513c879a32a6f647c58f4ef572 + SlideMenuControllerSwift: f9ec1ad1a95d211324d25b15dcdbc94881596716 -PODFILE CHECKSUM: 38ee43f1a5d00148f409e43591d4f2db8be6285f +PODFILE CHECKSUM: 90a2a91513fab5bc604856282ff3a8dc619010bc COCOAPODS: 1.6.1 diff --git a/decred_wallet.xcodeproj/project.pbxproj b/decred_wallet.xcodeproj/project.pbxproj index 662ce36c9..b20374622 100644 --- a/decred_wallet.xcodeproj/project.pbxproj +++ b/decred_wallet.xcodeproj/project.pbxproj @@ -32,7 +32,6 @@ 2870338B20BC5E7D00BFD0B8 /* JsonEntities.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2870338A20BC5E7D00BFD0B8 /* JsonEntities.swift */; }; 2883CA702099D40F0053D9BB /* DropDownSearchField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2883CA6F2099D40F0053D9BB /* DropDownSearchField.swift */; }; 2883CA72209B52AE0053D9BB /* WaiterScreenViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2883CA71209B52AE0053D9BB /* WaiterScreenViewController.swift */; }; - 2883CA74209B5BA40053D9BB /* Modals.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2883CA73209B5BA40053D9BB /* Modals.storyboard */; }; 28D36C7C2180ADF5000C6572 /* ConfirmSeedViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28D36C7B2180ADF5000C6572 /* ConfirmSeedViewCell.swift */; }; 28EB91B820FCFD8F007A0906 /* CreateNewWalletViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28EB91B720FCFD8F007A0906 /* CreateNewWalletViewController.swift */; }; 28EB91C720FCFDBE007A0906 /* TransactionHistoryTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28EB91BE20FCFDBE007A0906 /* TransactionHistoryTableViewCell.swift */; }; @@ -47,6 +46,7 @@ 28F0CE7320888258003AC958 /* Utils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28F0CE7220888258003AC958 /* Utils.swift */; }; 28FEB26C21D263E7001B074B /* RecoverExistingWalletViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28FEB26B21D263E7001B074B /* RecoverExistingWalletViewController.swift */; }; 28FEB26E21D264D9001B074B /* RecoveryWalletSeedWordCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28FEB26D21D264D9001B074B /* RecoveryWalletSeedWordCell.swift */; }; + 7B9A3C2E9A00AE43F1C5A089 /* Pods_Decred_Wallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BB18428A6467205A88C5FD9 /* Pods_Decred_Wallet.framework */; }; 952C932720E2174B00A60E43 /* ConfirmToSendFundViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952C932620E2174B00A60E43 /* ConfirmToSendFundViewController.swift */; }; 952C932A20E247FE00A60E43 /* SendCompletedViewController.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 952C932920E247FE00A60E43 /* SendCompletedViewController.storyboard */; }; 952C932C20E2481500A60E43 /* SendCompletedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 952C932B20E2481500A60E43 /* SendCompletedViewController.swift */; }; @@ -66,14 +66,12 @@ 95877FE920B70CBB00CE53D2 /* TransactionHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95877FE720B70CBB00CE53D2 /* TransactionHistoryViewController.swift */; }; 95CC024420D3F15800DA73AF /* AccountsData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95CC024320D3F15800DA73AF /* AccountsData.swift */; }; 95E1C96E20FCD43E00D7F3EE /* TextFieldDoneButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95E1C96D20FCD43E00D7F3EE /* TextFieldDoneButton.swift */; }; - B34476FD227ACC1500D7AA63 /* Dcrlibwallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3879A102271F4970066CD0F /* Dcrlibwallet.framework */; }; + B313BFF62281585600593E62 /* Dcrlibwallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B3879A102271F4970066CD0F /* Dcrlibwallet.framework */; }; B35BF4632278923700018DBE /* PinPasswordStrength.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35BF4622278923700018DBE /* PinPasswordStrength.swift */; }; B35BF4682278A43F00018DBE /* Button.swift in Sources */ = {isa = PBXBuildFile; fileRef = B35BF4672278A43F00018DBE /* Button.swift */; }; B36225DF22725BC100D61D15 /* BaseViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B36225DE22725BC100D61D15 /* BaseViewController.swift */; }; B3BA850C22744C7400440D3A /* SpendingPinOrPassword.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA850B22744C7400440D3A /* SpendingPinOrPassword.swift */; }; B3BA850E22744C8800440D3A /* StartupPinOrPassword.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3BA850D22744C8800440D3A /* StartupPinOrPassword.swift */; }; - B78B5BA3316D898E906A3330 /* Pods_Decred_Wallet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 473D6D8B3E439D2605DF6847 /* Pods_Decred_Wallet.framework */; }; - CEBBAD09C06D0BD93BF6A7DA /* libPods-Decred WalletTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = AB64F6E90036FDC80B52AD22 /* libPods-Decred WalletTests.a */; }; DD0B356E218930B7000830C4 /* AddAcountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0B356D218930B7000830C4 /* AddAcountViewController.swift */; }; DD0C493E208A160900986C6B /* WalletSetupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD0C493D208A160900986C6B /* WalletSetupViewController.swift */; }; DD1D5C7C20AED828009789DD /* certificateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD1D5C7B20AED824009789DD /* certificateViewController.swift */; }; @@ -114,6 +112,7 @@ DDD2BA17224FED3800136C65 /* CurrencyOptionTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD2BA16224FED3800136C65 /* CurrencyOptionTableViewController.swift */; }; DDD967372204668500462238 /* ConfirmToSendFundViewPINController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDD967362204668400462238 /* ConfirmToSendFundViewPINController.swift */; }; DDE90C8A2162CCB20031CED7 /* HelpViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DDE90C892162CCB20031CED7 /* HelpViewController.swift */; }; + F1C7D32B4B6DE251498E6BC4 /* libPods-Decred WalletTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D041B416C87AEF5835443B41 /* libPods-Decred WalletTests.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -165,7 +164,6 @@ 2870338A20BC5E7D00BFD0B8 /* JsonEntities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JsonEntities.swift; sourceTree = ""; }; 2883CA6F2099D40F0053D9BB /* DropDownSearchField.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DropDownSearchField.swift; sourceTree = ""; }; 2883CA71209B52AE0053D9BB /* WaiterScreenViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WaiterScreenViewController.swift; sourceTree = ""; }; - 2883CA73209B5BA40053D9BB /* Modals.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Modals.storyboard; sourceTree = ""; }; 28D36C7B2180ADF5000C6572 /* ConfirmSeedViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmSeedViewCell.swift; sourceTree = ""; }; 28EB91B720FCFD8F007A0906 /* CreateNewWalletViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CreateNewWalletViewController.swift; sourceTree = ""; }; 28EB91BE20FCFDBE007A0906 /* TransactionHistoryTableViewCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionHistoryTableViewCell.swift; sourceTree = ""; }; @@ -180,17 +178,14 @@ 28F0CE7220888258003AC958 /* Utils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Utils.swift; sourceTree = ""; }; 28FEB26B21D263E7001B074B /* RecoverExistingWalletViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecoverExistingWalletViewController.swift; sourceTree = ""; }; 28FEB26D21D264D9001B074B /* RecoveryWalletSeedWordCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RecoveryWalletSeedWordCell.swift; sourceTree = ""; }; - 3D9E5A23196FF0AB222F1FAF /* Pods-Decred Wallet.mainnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred Wallet.mainnet.xcconfig"; path = "Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet.mainnet.xcconfig"; sourceTree = ""; }; - 42AAE56E62A79577998CA4DB /* Pods-Decred WalletTests.testnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred WalletTests.testnet.xcconfig"; path = "Target Support Files/Pods-Decred WalletTests/Pods-Decred WalletTests.testnet.xcconfig"; sourceTree = ""; }; - 473D6D8B3E439D2605DF6847 /* Pods_Decred_Wallet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Decred_Wallet.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 4DB99E83FC573EABDC8EA09A /* Pods-Decred WalletTests.mainnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred WalletTests.mainnet.xcconfig"; path = "Target Support Files/Pods-Decred WalletTests/Pods-Decred WalletTests.mainnet.xcconfig"; sourceTree = ""; }; - 5698C6A8D6B4A077229F9453 /* Pods-Decred Wallet.testnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred Wallet.testnet.xcconfig"; path = "Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet.testnet.xcconfig"; sourceTree = ""; }; - 6631A847BDB0EF38A836A859 /* Pods-Decred Wallet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred Wallet.release.xcconfig"; path = "Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet.release.xcconfig"; sourceTree = ""; }; + 59C0B78FBE22FDE12F72A4BD /* Pods-Decred Wallet.mainnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred Wallet.mainnet.xcconfig"; path = "Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet.mainnet.xcconfig"; sourceTree = ""; }; 746E19ED2213F0DF0073E0D6 /* decred_wallet-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "decred_wallet-Bridging-Header.h"; sourceTree = ""; }; 746E19EE2213F0F90073E0D6 /* ObserverProxy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ObserverProxy.h; sourceTree = ""; }; 74BA834F225ED7AA00D3359E /* testnet.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = testnet.xcconfig; sourceTree = ""; }; 74BA8353225EDDB900D3359E /* mainnet.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = mainnet.xcconfig; sourceTree = ""; }; - 76E6EA7035ED6B9E75430900 /* Pods-Decred WalletTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred WalletTests.release.xcconfig"; path = "Target Support Files/Pods-Decred WalletTests/Pods-Decred WalletTests.release.xcconfig"; sourceTree = ""; }; + 803CF6EF4883511AD6FBFEDA /* Pods-Decred WalletTests.testnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred WalletTests.testnet.xcconfig"; path = "Target Support Files/Pods-Decred WalletTests/Pods-Decred WalletTests.testnet.xcconfig"; sourceTree = ""; }; + 8189AACB6CA2D0A1D0BF64BB /* Pods-Decred Wallet.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred Wallet.release.xcconfig"; path = "Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet.release.xcconfig"; sourceTree = ""; }; + 86D9782F8EE06C89E05C3666 /* Pods-Decred Wallet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred Wallet.debug.xcconfig"; path = "Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet.debug.xcconfig"; sourceTree = ""; }; 952C932620E2174B00A60E43 /* ConfirmToSendFundViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfirmToSendFundViewController.swift; sourceTree = ""; }; 952C932920E247FE00A60E43 /* SendCompletedViewController.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = SendCompletedViewController.storyboard; sourceTree = ""; }; 952C932B20E2481500A60E43 /* SendCompletedViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SendCompletedViewController.swift; sourceTree = ""; }; @@ -210,7 +205,8 @@ 95877FE720B70CBB00CE53D2 /* TransactionHistoryViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TransactionHistoryViewController.swift; sourceTree = ""; }; 95CC024320D3F15800DA73AF /* AccountsData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsData.swift; sourceTree = ""; }; 95E1C96D20FCD43E00D7F3EE /* TextFieldDoneButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TextFieldDoneButton.swift; sourceTree = ""; }; - AB64F6E90036FDC80B52AD22 /* libPods-Decred WalletTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Decred WalletTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 97C93247BA63B908E0B4F262 /* Pods-Decred WalletTests.mainnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred WalletTests.mainnet.xcconfig"; path = "Target Support Files/Pods-Decred WalletTests/Pods-Decred WalletTests.mainnet.xcconfig"; sourceTree = ""; }; + 9BB18428A6467205A88C5FD9 /* Pods_Decred_Wallet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Decred_Wallet.framework; sourceTree = BUILT_PRODUCTS_DIR; }; B35BF4622278923700018DBE /* PinPasswordStrength.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PinPasswordStrength.swift; sourceTree = ""; }; B35BF4672278A43F00018DBE /* Button.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Button.swift; sourceTree = ""; }; B36225DE22725BC100D61D15 /* BaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseViewController.swift; sourceTree = ""; }; @@ -220,7 +216,8 @@ B3A32AA9227012BB00CDD53D /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Crashlytics.framework; path = Pods/Crashlytics/Crashlytics.framework; sourceTree = ""; }; B3BA850B22744C7400440D3A /* SpendingPinOrPassword.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpendingPinOrPassword.swift; sourceTree = ""; }; B3BA850D22744C8800440D3A /* StartupPinOrPassword.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartupPinOrPassword.swift; sourceTree = ""; }; - D3A91C65E016D7236CA41C7B /* Pods-Decred Wallet.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred Wallet.debug.xcconfig"; path = "Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet.debug.xcconfig"; sourceTree = ""; }; + D041B416C87AEF5835443B41 /* libPods-Decred WalletTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Decred WalletTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + D88FC8D6F04F2065EA91CDD0 /* Pods-Decred WalletTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred WalletTests.release.xcconfig"; path = "Target Support Files/Pods-Decred WalletTests/Pods-Decred WalletTests.release.xcconfig"; sourceTree = ""; }; DD0B356D218930B7000830C4 /* AddAcountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAcountViewController.swift; sourceTree = ""; }; DD0C493D208A160900986C6B /* WalletSetupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletSetupViewController.swift; sourceTree = ""; }; DD1D5C7B20AED824009789DD /* certificateViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = certificateViewController.swift; sourceTree = ""; }; @@ -264,9 +261,10 @@ DDBB74A72215B5C7003B172C /* inconsolata_regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = inconsolata_regular.ttf; sourceTree = ""; }; DDC51C9F2272076D00ED24B0 /* Dcrlibwallet.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Dcrlibwallet.framework; sourceTree = ""; }; DDD2BA16224FED3800136C65 /* CurrencyOptionTableViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = CurrencyOptionTableViewController.swift; path = decred_wallet/view_controller/CurrencyOptionTableViewController.swift; sourceTree = ""; }; + DDD37FB8138E4D4E83F64691 /* Pods-Decred WalletTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred WalletTests.debug.xcconfig"; path = "Target Support Files/Pods-Decred WalletTests/Pods-Decred WalletTests.debug.xcconfig"; sourceTree = ""; }; DDD967362204668400462238 /* ConfirmToSendFundViewPINController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConfirmToSendFundViewPINController.swift; sourceTree = ""; }; DDE90C892162CCB20031CED7 /* HelpViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HelpViewController.swift; sourceTree = ""; }; - EA832DCA147543980AAC7C7C /* Pods-Decred WalletTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred WalletTests.debug.xcconfig"; path = "Target Support Files/Pods-Decred WalletTests/Pods-Decred WalletTests.debug.xcconfig"; sourceTree = ""; }; + EEF206FAF87F1149B8A07A5E /* Pods-Decred Wallet.testnet.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Decred Wallet.testnet.xcconfig"; path = "Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet.testnet.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -274,8 +272,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - B34476FD227ACC1500D7AA63 /* Dcrlibwallet.framework in Frameworks */, - B78B5BA3316D898E906A3330 /* Pods_Decred_Wallet.framework in Frameworks */, + B313BFF62281585600593E62 /* Dcrlibwallet.framework in Frameworks */, + 7B9A3C2E9A00AE43F1C5A089 /* Pods_Decred_Wallet.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -283,7 +281,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - CEBBAD09C06D0BD93BF6A7DA /* libPods-Decred WalletTests.a in Frameworks */, + F1C7D32B4B6DE251498E6BC4 /* libPods-Decred WalletTests.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -370,8 +368,8 @@ DDC51C9F2272076D00ED24B0 /* Dcrlibwallet.framework */, B3879A102271F4970066CD0F /* Dcrlibwallet.framework */, B3A32AA9227012BB00CDD53D /* Crashlytics.framework */, - 473D6D8B3E439D2605DF6847 /* Pods_Decred_Wallet.framework */, - AB64F6E90036FDC80B52AD22 /* libPods-Decred WalletTests.a */, + 9BB18428A6467205A88C5FD9 /* Pods_Decred_Wallet.framework */, + D041B416C87AEF5835443B41 /* libPods-Decred WalletTests.a */, ); name = Frameworks; sourceTree = ""; @@ -476,14 +474,14 @@ DC51136384787171F3F2350F /* Pods */ = { isa = PBXGroup; children = ( - D3A91C65E016D7236CA41C7B /* Pods-Decred Wallet.debug.xcconfig */, - 5698C6A8D6B4A077229F9453 /* Pods-Decred Wallet.testnet.xcconfig */, - 6631A847BDB0EF38A836A859 /* Pods-Decred Wallet.release.xcconfig */, - 3D9E5A23196FF0AB222F1FAF /* Pods-Decred Wallet.mainnet.xcconfig */, - EA832DCA147543980AAC7C7C /* Pods-Decred WalletTests.debug.xcconfig */, - 42AAE56E62A79577998CA4DB /* Pods-Decred WalletTests.testnet.xcconfig */, - 76E6EA7035ED6B9E75430900 /* Pods-Decred WalletTests.release.xcconfig */, - 4DB99E83FC573EABDC8EA09A /* Pods-Decred WalletTests.mainnet.xcconfig */, + 86D9782F8EE06C89E05C3666 /* Pods-Decred Wallet.debug.xcconfig */, + EEF206FAF87F1149B8A07A5E /* Pods-Decred Wallet.testnet.xcconfig */, + 8189AACB6CA2D0A1D0BF64BB /* Pods-Decred Wallet.release.xcconfig */, + 59C0B78FBE22FDE12F72A4BD /* Pods-Decred Wallet.mainnet.xcconfig */, + DDD37FB8138E4D4E83F64691 /* Pods-Decred WalletTests.debug.xcconfig */, + 803CF6EF4883511AD6FBFEDA /* Pods-Decred WalletTests.testnet.xcconfig */, + D88FC8D6F04F2065EA91CDD0 /* Pods-Decred WalletTests.release.xcconfig */, + 97C93247BA63B908E0B4F262 /* Pods-Decred WalletTests.mainnet.xcconfig */, ); path = Pods; sourceTree = ""; @@ -586,7 +584,6 @@ DDA3E27620292EF900C83D18 /* LaunchScreen.storyboard */, DDA3E27120292EF900C83D18 /* Main.storyboard */, 74BA8353225EDDB900D3359E /* mainnet.xcconfig */, - 2883CA73209B5BA40053D9BB /* Modals.storyboard */, DD3A7E0D2152A7520009A0BE /* SingleInstance.swift */, DDAE8BBC223C181E005CDD9C /* splashLogo.gif */, 28EB91BD20FCFDBE007A0906 /* table_view_cell */, @@ -623,13 +620,13 @@ isa = PBXNativeTarget; buildConfigurationList = DDA3E28720292EF900C83D18 /* Build configuration list for PBXNativeTarget "Decred Wallet" */; buildPhases = ( - 20DE5B1FC86C1C8838A1CD9C /* [CP] Check Pods Manifest.lock */, + A02038BBAC31846BF60B2F8B /* [CP] Check Pods Manifest.lock */, DDA3E26620292EF900C83D18 /* Sources */, DDA3E26720292EF900C83D18 /* Frameworks */, DDA3E26820292EF900C83D18 /* Resources */, 28F0CE952088B1AF003AC958 /* Embed Frameworks */, DDBB749D22144335003B172C /* ShellScript */, - D7CA5ECDE31372032C9C6DA6 /* [CP] Embed Pods Frameworks */, + F9E47088DA5E1AF65A163C58 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -644,7 +641,7 @@ isa = PBXNativeTarget; buildConfigurationList = DDA3E28A20292EF900C83D18 /* Build configuration list for PBXNativeTarget "Decred WalletTests" */; buildPhases = ( - 1A9A17B9892BECEEFE7623E4 /* [CP] Check Pods Manifest.lock */, + 667226CFE620AC2403D4D2F6 /* [CP] Check Pods Manifest.lock */, DDA3E27A20292EF900C83D18 /* Sources */, DDA3E27B20292EF900C83D18 /* Frameworks */, DDA3E27C20292EF900C83D18 /* Resources */, @@ -730,7 +727,6 @@ 95473E7120E3A4C20023F50A /* TransactiontOutputDetailsCell.xib in Resources */, 2850E08D217612EE00171267 /* SourceSansPro-Regular.ttf in Resources */, 2850E08F217612EE00171267 /* SourceSansPro-LightItalic.ttf in Resources */, - 2883CA74209B5BA40053D9BB /* Modals.storyboard in Resources */, 2850E096217612EE00171267 /* SourceSansPro-Italic.ttf in Resources */, 28664E5E216F740000AA01E2 /* progress bar-1s-200px.gif in Resources */, 95404EBF20E113D700B34327 /* AccountsHeaderView.xib in Resources */, @@ -749,7 +745,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 1A9A17B9892BECEEFE7623E4 /* [CP] Check Pods Manifest.lock */ = { + 667226CFE620AC2403D4D2F6 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -771,7 +767,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - 20DE5B1FC86C1C8838A1CD9C /* [CP] Check Pods Manifest.lock */ = { + A02038BBAC31846BF60B2F8B /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -793,7 +789,7 @@ shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; showEnvVarsInLog = 0; }; - D7CA5ECDE31372032C9C6DA6 /* [CP] Embed Pods Frameworks */ = { + DDBB749D22144335003B172C /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -801,29 +797,16 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", - "${BUILT_PRODUCTS_DIR}/JGProgressHUD/JGProgressHUD.framework", - "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework", - "${BUILT_PRODUCTS_DIR}/QRCodeReader.swift/QRCodeReader.framework", - "${BUILT_PRODUCTS_DIR}/SlideMenuControllerSwift/SlideMenuControllerSwift.framework", ); - name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JGProgressHUD.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QRCodeReader.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SlideMenuControllerSwift.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet-frameworks.sh\"\n"; - showEnvVarsInLog = 0; + shellScript = "\"${PODS_ROOT}/Fabric/run\" 7e7665339b679dfd7ad19ebb8e859867ade8ca99 295d819cb24910fa414d5e1216b56f2a5730cb0d910f1d6739d0390346d0a69a\n"; }; - DDBB749D22144335003B172C /* ShellScript */ = { + F9E47088DA5E1AF65A163C58 /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -831,14 +814,27 @@ inputFileListPaths = ( ); inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework", + "${BUILT_PRODUCTS_DIR}/JGProgressHUD/JGProgressHUD.framework", + "${BUILT_PRODUCTS_DIR}/MBProgressHUD/MBProgressHUD.framework", + "${BUILT_PRODUCTS_DIR}/QRCodeReader.swift/QRCodeReader.framework", + "${BUILT_PRODUCTS_DIR}/SlideMenuControllerSwift/SlideMenuControllerSwift.framework", ); + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( ); outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/JGProgressHUD.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MBProgressHUD.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QRCodeReader.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SlideMenuControllerSwift.framework", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Fabric/run\" 7e7665339b679dfd7ad19ebb8e859867ade8ca99 295d819cb24910fa414d5e1216b56f2a5730cb0d910f1d6739d0390346d0a69a\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Decred Wallet/Pods-Decred Wallet-frameworks.sh\"\n"; + showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -1022,7 +1018,7 @@ }; 74BA834C225ED31D00D3359E /* testnet */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 5698C6A8D6B4A077229F9453 /* Pods-Decred Wallet.testnet.xcconfig */; + baseConfigurationReference = EEF206FAF87F1149B8A07A5E /* Pods-Decred Wallet.testnet.xcconfig */; buildSettings = { APP_NAME = "$(APP_NAME)"; ASSETCATALOG_COMPILER_APPICON_NAME = "${APP_ICON}"; @@ -1045,14 +1041,14 @@ SWIFT_ENFORCE_EXCLUSIVE_ACCESS = none; SWIFT_OBJC_BRIDGING_HEADER = "decred_wallet/DcrdConnection/decred_wallet-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = testnet; }; 74BA834D225ED31D00D3359E /* testnet */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 42AAE56E62A79577998CA4DB /* Pods-Decred WalletTests.testnet.xcconfig */; + baseConfigurationReference = 803CF6EF4883511AD6FBFEDA /* Pods-Decred WalletTests.testnet.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -1062,7 +1058,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.macsleven.Decred-WalletTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Decred Wallet.app/Decred Wallet"; }; @@ -1123,7 +1119,7 @@ }; 74BA8351225EDD0500D3359E /* mainnet */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D9E5A23196FF0AB222F1FAF /* Pods-Decred Wallet.mainnet.xcconfig */; + baseConfigurationReference = 59C0B78FBE22FDE12F72A4BD /* Pods-Decred Wallet.mainnet.xcconfig */; buildSettings = { APP_NAME = "$(APP_NAME)"; ASSETCATALOG_COMPILER_APPICON_NAME = "${APP_ICON}"; @@ -1145,14 +1141,14 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ENFORCE_EXCLUSIVE_ACCESS = none; SWIFT_OBJC_BRIDGING_HEADER = "decred_wallet/DcrdConnection/decred_wallet-Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = mainnet; }; 74BA8352225EDD0500D3359E /* mainnet */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4DB99E83FC573EABDC8EA09A /* Pods-Decred WalletTests.mainnet.xcconfig */; + baseConfigurationReference = 97C93247BA63B908E0B4F262 /* Pods-Decred WalletTests.mainnet.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -1162,7 +1158,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.macsleven.Decred-WalletTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Decred Wallet.app/Decred Wallet"; }; @@ -1281,7 +1277,7 @@ }; DDA3E28820292EF900C83D18 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D3A91C65E016D7236CA41C7B /* Pods-Decred Wallet.debug.xcconfig */; + baseConfigurationReference = 86D9782F8EE06C89E05C3666 /* Pods-Decred Wallet.debug.xcconfig */; buildSettings = { APP_NAME = "$(APP_NAME)"; ASSETCATALOG_COMPILER_APPICON_NAME = "${APP_ICON}"; @@ -1304,14 +1300,14 @@ SWIFT_ENFORCE_EXCLUSIVE_ACCESS = none; SWIFT_OBJC_BRIDGING_HEADER = "decred_wallet/DcrdConnection/decred_wallet-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Debug; }; DDA3E28920292EF900C83D18 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6631A847BDB0EF38A836A859 /* Pods-Decred Wallet.release.xcconfig */; + baseConfigurationReference = 8189AACB6CA2D0A1D0BF64BB /* Pods-Decred Wallet.release.xcconfig */; buildSettings = { APP_NAME = "$(APP_NAME)"; ASSETCATALOG_COMPILER_APPICON_NAME = "${APP_ICON}"; @@ -1333,14 +1329,14 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_ENFORCE_EXCLUSIVE_ACCESS = none; SWIFT_OBJC_BRIDGING_HEADER = "decred_wallet/DcrdConnection/decred_wallet-Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; DDA3E28B20292EF900C83D18 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EA832DCA147543980AAC7C7C /* Pods-Decred WalletTests.debug.xcconfig */; + baseConfigurationReference = DDD37FB8138E4D4E83F64691 /* Pods-Decred WalletTests.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -1350,7 +1346,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.macsleven.Decred-WalletTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Decred Wallet.app/Decred Wallet"; }; @@ -1358,7 +1354,7 @@ }; DDA3E28C20292EF900C83D18 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 76E6EA7035ED6B9E75430900 /* Pods-Decred WalletTests.release.xcconfig */; + baseConfigurationReference = D88FC8D6F04F2065EA91CDD0 /* Pods-Decred WalletTests.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; BUNDLE_LOADER = "$(TEST_HOST)"; @@ -1368,7 +1364,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = "com.macsleven.Decred-WalletTests"; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Decred Wallet.app/Decred Wallet"; }; diff --git a/decred_wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet Testnet.xcscheme b/decred_wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet Testnet.xcscheme index 038e5f682..35be5516b 100644 --- a/decred_wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet Testnet.xcscheme +++ b/decred_wallet.xcodeproj/xcshareddata/xcschemes/Decred Wallet Testnet.xcscheme @@ -1,6 +1,6 @@ Bool { - if extensionPointIdentifier == UIApplicationExtensionPointIdentifier.keyboard { + func application(_ application: UIApplication, shouldAllowExtensionPointIdentifier extensionPointIdentifier: UIApplication.ExtensionPointIdentifier) -> Bool { + if extensionPointIdentifier == UIApplication.ExtensionPointIdentifier.keyboard { return false } return true } - func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplicationLaunchOptionsKey: Any]?) -> Bool { + func application(_: UIApplication, didFinishLaunchingWithOptions _: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { // setup crash reporting for testnet build only let isTestnet = Bool(infoForKey(GlobalConstants.Strings.IS_TESTNET)!)! diff --git a/decred_wallet/Base.lproj/LaunchScreen.storyboard b/decred_wallet/Base.lproj/LaunchScreen.storyboard index 81171e230..b3bded810 100644 --- a/decred_wallet/Base.lproj/LaunchScreen.storyboard +++ b/decred_wallet/Base.lproj/LaunchScreen.storyboard @@ -1,11 +1,11 @@ - + - + @@ -24,7 +24,7 @@ - + diff --git a/decred_wallet/Base.lproj/Main.storyboard b/decred_wallet/Base.lproj/Main.storyboard index fc88921c3..73f4da0c8 100644 --- a/decred_wallet/Base.lproj/Main.storyboard +++ b/decred_wallet/Base.lproj/Main.storyboard @@ -1,11 +1,11 @@ - + - + @@ -123,11 +123,11 @@ - - + - @@ -2313,7 +2307,7 @@ -