Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: ios broken airgap flow #2161

Merged
merged 5 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions ios/PolkadotVault.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
6D042AF22901B3FB00B3F4F7 /* QRCodeImageGenerator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D042AF12901B3FB00B3F4F7 /* QRCodeImageGenerator.swift */; };
6D042AF42901B40400B3F4F7 /* ExportMultipleKeysModal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D042AF32901B40400B3F4F7 /* ExportMultipleKeysModal.swift */; };
6D0677AC29BB0C6000D76D90 /* AppLaunchMediator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D0677AB29BB0C6000D76D90 /* AppLaunchMediator.swift */; };
6D0677AE29BB0D0000D76D90 /* WarningStateMediator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D0677AD29BB0D0000D76D90 /* WarningStateMediator.swift */; };
6D07D370292B40D2001A0B79 /* TransactionSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D07D36F292B40D2001A0B79 /* TransactionSummaryView.swift */; };
6D09912A2A7AA10800DF75EC /* BlockiesIdenticonViewPreviews.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D0991292A7AA10800DF75EC /* BlockiesIdenticonViewPreviews.swift */; };
6D0BF95229F2BBF500F5B569 /* NetworkIconCapsuleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6D0BF95129F2BBF500F5B569 /* NetworkIconCapsuleView.swift */; };
Expand Down Expand Up @@ -210,7 +209,7 @@
6DA2ACAC2939E87600AAEADC /* Event+Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA2ACAB2939E87600AAEADC /* Event+Value.swift */; };
6DA2ACAE2939EAC300AAEADC /* Event+isImportant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA2ACAD2939EAC300AAEADC /* Event+isImportant.swift */; };
6DA2ACB0293A17DF00AAEADC /* Address+DisplayablePath.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA2ACAF293A17DF00AAEADC /* Address+DisplayablePath.swift */; };
6DA317C1299E3DDF005DD060 /* OnboardingAirgapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DD860E4299CAAA70000D81E /* OnboardingAirgapView.swift */; };
6DA317C1299E3DDF005DD060 /* NoAirgapView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DD860E4299CAAA70000D81E /* NoAirgapView.swift */; };
6DA317C3299F6FF1005DD060 /* AirgapMediatorAssembler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA317C2299F6FF1005DD060 /* AirgapMediatorAssembler.swift */; };
6DA501CC290A48190096DA4E /* KeyDetails+ViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA501CB290A48190096DA4E /* KeyDetails+ViewModel.swift */; };
6DA501D4290BC55A0096DA4E /* KeyDetailsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DA501D3290BC55A0096DA4E /* KeyDetailsService.swift */; };
Expand All @@ -221,8 +220,6 @@
6DAA6CB329BF7155002329A8 /* OnboardingMediator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DAA6CB229BF7155002329A8 /* OnboardingMediator.swift */; };
6DB39AA42A4579E0004B8FAA /* AddDerivedKeysView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB39AA32A4579E0004B8FAA /* AddDerivedKeysView.swift */; };
6DB39AA92A45C909004B8FAA /* TransparentHelpBox.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB39AA82A45C909004B8FAA /* TransparentHelpBox.swift */; };
6DB99035295C1080001101DC /* ConnectivityAlertButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB99034295C1080001101DC /* ConnectivityAlertButton.swift */; };
6DB99037295C160D001101DC /* ConnectivityAlertOverlay.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB99036295C160D001101DC /* ConnectivityAlertOverlay.swift */; };
6DB99039295E95E9001101DC /* NetworkCapsuleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB99038295E95E9001101DC /* NetworkCapsuleView.swift */; };
6DB9903B295EA7DE001101DC /* ActionableInfoBoxView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB9903A295EA7DE001101DC /* ActionableInfoBoxView.swift */; };
6DB9903D2962A619001101DC /* MTransaction+ImportDerivedKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6DB9903C2962A619001101DC /* MTransaction+ImportDerivedKeys.swift */; };
Expand Down Expand Up @@ -393,7 +390,6 @@
6D042AF12901B3FB00B3F4F7 /* QRCodeImageGenerator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = QRCodeImageGenerator.swift; sourceTree = "<group>"; };
6D042AF32901B40400B3F4F7 /* ExportMultipleKeysModal.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExportMultipleKeysModal.swift; sourceTree = "<group>"; };
6D0677AB29BB0C6000D76D90 /* AppLaunchMediator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppLaunchMediator.swift; sourceTree = "<group>"; };
6D0677AD29BB0D0000D76D90 /* WarningStateMediator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WarningStateMediator.swift; sourceTree = "<group>"; };
6D07D36F292B40D2001A0B79 /* TransactionSummaryView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionSummaryView.swift; sourceTree = "<group>"; };
6D0991292A7AA10800DF75EC /* BlockiesIdenticonViewPreviews.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlockiesIdenticonViewPreviews.swift; sourceTree = "<group>"; };
6D0AE5572A6129100042282A /* Blockies */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = Blockies; sourceTree = "<group>"; };
Expand Down Expand Up @@ -563,8 +559,6 @@
6DAA6CB229BF7155002329A8 /* OnboardingMediator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingMediator.swift; sourceTree = "<group>"; };
6DB39AA32A4579E0004B8FAA /* AddDerivedKeysView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddDerivedKeysView.swift; sourceTree = "<group>"; };
6DB39AA82A45C909004B8FAA /* TransparentHelpBox.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransparentHelpBox.swift; sourceTree = "<group>"; };
6DB99034295C1080001101DC /* ConnectivityAlertButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectivityAlertButton.swift; sourceTree = "<group>"; };
6DB99036295C160D001101DC /* ConnectivityAlertOverlay.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConnectivityAlertOverlay.swift; sourceTree = "<group>"; };
6DB99038295E95E9001101DC /* NetworkCapsuleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkCapsuleView.swift; sourceTree = "<group>"; };
6DB9903A295EA7DE001101DC /* ActionableInfoBoxView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ActionableInfoBoxView.swift; sourceTree = "<group>"; };
6DB9903C2962A619001101DC /* MTransaction+ImportDerivedKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "MTransaction+ImportDerivedKeys.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -600,7 +594,7 @@
6DD17CA32A77A3DD008442FD /* Error+RustDisplayError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Error+RustDisplayError.swift"; sourceTree = "<group>"; };
6DD4A6A329E9404200FA6746 /* CreateKeySetService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CreateKeySetService.swift; sourceTree = "<group>"; };
6DD4A6A529E9480700FA6746 /* KeyListService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KeyListService.swift; sourceTree = "<group>"; };
6DD860E4299CAAA70000D81E /* OnboardingAirgapView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OnboardingAirgapView.swift; sourceTree = "<group>"; };
6DD860E4299CAAA70000D81E /* NoAirgapView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoAirgapView.swift; sourceTree = "<group>"; };
6DD860E7299CAD140000D81E /* OnboadingAirgapView+Components.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OnboadingAirgapView+Components.swift"; sourceTree = "<group>"; };
6DD860E9299CED3F0000D81E /* AirgapMediator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AirgapMediator.swift; sourceTree = "<group>"; };
6DD9FF1528C8B85300FB6195 /* HorizontalActionsBottomModal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HorizontalActionsBottomModal.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1639,7 +1633,6 @@
isa = PBXGroup;
children = (
6DBF6E4A28EC51D600CC959F /* GenericError.swift */,
6DB99036295C160D001101DC /* ConnectivityAlertOverlay.swift */,
);
path = Errors;
sourceTree = "<group>";
Expand Down Expand Up @@ -1685,7 +1678,7 @@
isa = PBXGroup;
children = (
6DD860E7299CAD140000D81E /* OnboadingAirgapView+Components.swift */,
6DD860E4299CAAA70000D81E /* OnboardingAirgapView.swift */,
6DD860E4299CAAA70000D81E /* NoAirgapView.swift */,
6DD860E9299CED3F0000D81E /* AirgapMediator.swift */,
6DA317C2299F6FF1005DD060 /* AirgapMediatorAssembler.swift */,
);
Expand Down Expand Up @@ -1727,7 +1720,6 @@
6D2D244E28CE5C1B00862726 /* NavbarActionButton.swift */,
6D16687E28F86DE0008C664A /* CameraButton.swift */,
6DF8316628F9BA4A00CB2BCE /* CapsuleButton.swift */,
6DB99034295C1080001101DC /* ConnectivityAlertButton.swift */,
6D2A5D102AA607C7009E0C3A /* ActionSheetCircleButton.swift */,
6D699FB42AA9CC7A0043B23A /* QRCodeButton.swift */,
);
Expand Down Expand Up @@ -1837,7 +1829,6 @@
isa = PBXGroup;
children = (
6D0677AB29BB0C6000D76D90 /* AppLaunchMediator.swift */,
6D0677AD29BB0D0000D76D90 /* WarningStateMediator.swift */,
6DAA6CB029BF482E002329A8 /* AuthenticatedStateMediator.swift */,
6DAA6CB229BF7155002329A8 /* OnboardingMediator.swift */,
6D7DE0D32ACB178800BFAACA /* DatabaseVersionMediator.swift */,
Expand Down Expand Up @@ -2275,7 +2266,6 @@
6D019974289D183B00F4C317 /* UInt8+Formatting.swift in Sources */,
2D48F3D2277A0AB2004B27BE /* HistoryCardExtended.swift in Sources */,
6D34233A299615FD00F3BA27 /* MVerifier+Type.swift in Sources */,
6DB99035295C1080001101DC /* ConnectivityAlertButton.swift in Sources */,
6DA2ACA52939D24000AAEADC /* LogsListView.swift in Sources */,
6DEFB52F28FEDA9B00762219 /* AnimatedQRCodeView.swift in Sources */,
6D0677AC29BB0C6000D76D90 /* AppLaunchMediator.swift in Sources */,
Expand All @@ -2284,7 +2274,6 @@
6DA2ACAE2939EAC300AAEADC /* Event+isImportant.swift in Sources */,
6D8973A52A08E18C0046A2F3 /* ScanTabService.swift in Sources */,
2DA5F84327566BE300D8DD29 /* TransactionCardSelector.swift in Sources */,
6D0677AE29BB0D0000D76D90 /* WarningStateMediator.swift in Sources */,
6D699FB52AA9CC7A0043B23A /* QRCodeButton.swift in Sources */,
6DB99039295E95E9001101DC /* NetworkCapsuleView.swift in Sources */,
6DFE588B297A5F09002BFDBF /* ApplicationStatePublisher.swift in Sources */,
Expand All @@ -2294,7 +2283,6 @@
6D476A1929FC05ED00326F74 /* AddKeySetUpNetworksStepOneView.swift in Sources */,
2DAA82A927885FCF002917C0 /* TCTXSpecPlain.swift in Sources */,
6DD860EA299CED3F0000D81E /* AirgapMediator.swift in Sources */,
6DB99037295C160D001101DC /* ConnectivityAlertOverlay.swift in Sources */,
6DFAF36B28AF7F8A0048763B /* Spacing.swift in Sources */,
2DA5F87227566C3600D8DD29 /* TCFieldNumber.swift in Sources */,
2DA5F86D27566C3600D8DD29 /* TCAuthorPlain.swift in Sources */,
Expand Down Expand Up @@ -2356,7 +2344,7 @@
6D95E97528B500EE00E28A11 /* Heights.swift in Sources */,
6D8045DE28D087D400237F8C /* QRCodeRootFooterView.swift in Sources */,
6D09912A2A7AA10800DF75EC /* BlockiesIdenticonViewPreviews.swift in Sources */,
6DA317C1299E3DDF005DD060 /* OnboardingAirgapView.swift in Sources */,
6DA317C1299E3DDF005DD060 /* NoAirgapView.swift in Sources */,
6DFE588D297A72B1002BFDBF /* JailbreakDetectionPublisher.swift in Sources */,
6D42793728DB147800C141DC /* PrivateKeyQRCodeService.swift in Sources */,
6D77F323296D4D8900044C7C /* CreateDerivedKeyService.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@ final class ScanTabService {
func attemptPassword(_ password: String) -> ActionResult? {
navigation.performFake(navigation: .init(action: .goForward, details: password))
}

func onSuccessfullPasswordEntry() {
navigation.performFake(navigation: .init(action: .goBack))
}
}

private extension ScanTabService {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,18 +65,15 @@ enum ImportDerivedKeyError: Error {
}

final class CreateDerivedKeyService {
private let databaseMediator: DatabaseMediating
private let backendService: BackendService
private let seedsMediator: SeedsMediating
private let createKeyNameService: CreateDerivedKeyNameService

init(
databaseMediator: DatabaseMediating = DatabaseMediator(),
seedsMediator: SeedsMediating = ServiceLocator.seedsMediator,
backendService: BackendService = BackendService(),
createKeyNameService: CreateDerivedKeyNameService = CreateDerivedKeyNameService()
) {
self.databaseMediator = databaseMediator
self.seedsMediator = seedsMediator
self.backendService = backendService
self.createKeyNameService = createKeyNameService
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@
import Foundation

final class ExportPrivateKeyService {
private let databaseMediator: DatabaseMediating
private let seedsMediator: SeedsMediating
private let backendService: BackendService

init(
backendService: BackendService = BackendService(),
databaseMediator: DatabaseMediating = DatabaseMediator(),
seedsMediator: SeedsMediating = ServiceLocator.seedsMediator
) {
self.backendService = backendService
self.databaseMediator = databaseMediator
self.seedsMediator = seedsMediator
}

Expand Down
8 changes: 0 additions & 8 deletions ios/PolkadotVault/Components/Buttons/ActionButton.swift
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,6 @@ struct ActionButtonStyle: ButtonStyle {
isDisabled: isDisabled
)
}

static func white(isDisabled: Binding<Bool> = Binding<Bool>.constant(false)) -> ActionButtonStyle {
ActionButtonStyle(
backgroundColor: .accentForegroundText,
foregroundColor: .accentPink500,
isDisabled: isDisabled
)
}
}

struct ActionButton: View {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ struct ActionSheetCircleButtonStyle: ButtonStyle {
.font(PrimaryFont.titleS.font)
}

static let destructive = ActionSheetCircleButtonStyle(foregroundColor: .accentRed400)
static let `default` = ActionSheetCircleButtonStyle(foregroundColor: .textAndIconsSecondary)
static let hightlighted = ActionSheetCircleButtonStyle(foregroundColor: .textAndIconsPrimary)
}

struct ActionSheetCircleButton: View {
Expand Down

This file was deleted.

2 changes: 1 addition & 1 deletion ios/PolkadotVault/Components/Camera/CameraPreview.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct CameraPreview: UIViewRepresentable {
}

func makeUIView(context _: UIViewRepresentableContext<CameraPreview>) -> CameraPreview.UIViewType {
let uiView = CameraPreviewUIView(session: session)
let uiView = CameraPreviewUIView()
let previewLayer = AVCaptureVideoPreviewLayer(session: session)
previewLayer.videoGravity = .resizeAspectFill
uiView.layer.addSublayer(previewLayer)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ import UIKit
/// UIKit wrapper for `AVCaptureSession` camera layer
final class CameraPreviewUIView: UIView {
var videoPreviewLayer: AVCaptureVideoPreviewLayer?
let session: AVCaptureSession

init(session: AVCaptureSession) {
self.session = session
init() {
super.init(frame: .zero)
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ struct AnimatedQRCodeView: View {
static let qrCodeWidthForLargerDevices: CGFloat = 320
}

@EnvironmentObject var applicationStatePublisher: ApplicationStatePublisher
@Binding var viewModel: AnimatedQRCodeViewModel
private let qrCodesGenerator: QRCodeImageGenerator
@State private var images: [UIImage] = []
Expand Down
Loading