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.

Sign up for GitHub

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

🥳[Feature] Add Two Factor Authentication for Litecoin Card #82

Merged
merged 12 commits into from
Aug 25, 2021
Merged

🥳[Feature] Add Two Factor Authentication for Litecoin Card #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
0e26b47
updated to the latest API library
kcw-grunt Aug 9, 2021
f811834
Remove (swiftch off) code coverage
kcw-grunt Aug 9, 2021
3683028
Added the basic localization
kcw-grunt Aug 15, 2021
a255167
Updated the CardViewController
kcw-grunt Aug 15, 2021
b99eae5
First version of 2FA working
kcw-grunt Aug 15, 2021
d97cb29
Cleaned up code formatting
kcw-grunt Aug 15, 2021
3f0871e
Polished the events and notes
kcw-grunt Aug 15, 2021
0696ff3
Added 2FA text
kcw-grunt Aug 15, 2021
93b8b3b
Added tests
kcw-grunt Aug 15, 2021
60365a2
Resolved per PR notes
kcw-grunt Aug 24, 2021
f7ae472
Restruct localizations (#83)
kcw-grunt Aug 24, 2021
ca14eff
🦺[Tech debt] Refactor send class (#80)
kcw-grunt Aug 24, 2021
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
10 changes: 5 additions & 5 deletions TodayExtension/tr.lproj/MainInterface.strings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
/* Class = "UIButton"; normalTitle = "setup wallet"; ObjectID = "fgE-Q8-uG8"; */
"fgE-Q8-uG8.normalTitle" = "**setup wallet**";
"fgE-Q8-uG8.normalTitle" = "setup wallet";

/* Class = "UILabel"; text = "Label"; ObjectID = "gQm-B2-ZXE"; */
"gQm-B2-ZXE.text" = "**Label**";
"gQm-B2-ZXE.text" = "Label";

/* Class = "UILabel"; text = "scan QR code"; ObjectID = "JgG-Ah-UZk"; */
"JgG-Ah-UZk.text" = "**scan QR code**";
"JgG-Ah-UZk.text" = "scan QR code";

/* Class = "UILabel"; text = "receive"; ObjectID = "KJN-zr-IQB"; */
"KJN-zr-IQB.text" = "**receive**";
"KJN-zr-IQB.text" = "receive";

/* Class = "UILabel"; text = "send"; ObjectID = "QMM-JV-cTG"; */
"QMM-JV-cTG.text" = "**send**";
"QMM-JV-cTG.text" = "send";
33 changes: 28 additions & 5 deletions loafwallet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,9 @@
C3D783A72565EA4B0004FF70 /* UnstoppableDomainView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D783A62565EA4A0004FF70 /* UnstoppableDomainView.swift */; };
C3D783B72565EA6B0004FF70 /* UnstoppableDomainViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D783B62565EA6B0004FF70 /* UnstoppableDomainViewModel.swift */; };
C3D783C02565ECF60004FF70 /* UnstoppableDomainViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3D783BF2565ECF60004FF70 /* UnstoppableDomainViewModelTests.swift */; };
C3DAAE2D26C9C19600D9E18C /* Enter2FACodeViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3DAAE2C26C9C19600D9E18C /* Enter2FACodeViewModelTests.swift */; };
C3E77C0926C2807200693E22 /* Enter2FACodeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3E77C0826C2807200693E22 /* Enter2FACodeViewModel.swift */; };
C3EB6C1B26C18DD500881841 /* Enter2FACodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3EB6C1A26C18DD500881841 /* Enter2FACodeView.swift */; };
C3EFA9A12650807B005C59B5 /* LockScreenHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3EFA9A02650807B005C59B5 /* LockScreenHeaderView.swift */; };
C3EFA9A3265080FF005C59B5 /* LockScreenHeaderViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3EFA9A2265080FF005C59B5 /* LockScreenHeaderViewModel.swift */; };
C3EFA9A62651A808005C59B5 /* LockScreenTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3EFA9A52651A808005C59B5 /* LockScreenTests.swift */; };
Expand Down Expand Up @@ -436,7 +439,6 @@
CECCE5B01E04AD7600D99448 /* DescriptionSendCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECCE5AF1E04AD7600D99448 /* DescriptionSendCell.swift */; };
CECCE5B21E04B00D00D99448 /* SendCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = CECCE5B11E04B00D00D99448 /* SendCell.swift */; };
CED341331EF5A5C00014912A /* InAppAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = CED341321EF5A5C00014912A /* InAppAlert.swift */; };
CED82D4E1E575A5500507A9B /* _main.swift in Sources */ = {isa = PBXBuildFile; fileRef = CED82D4D1E575A5500507A9B /* _main.swift */; };
CEE0EF521EBD14B60018DB36 /* PinTransitioningDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE0EF511EBD14B60018DB36 /* PinTransitioningDelegate.swift */; };
CEE1F5631DF13E5A00D733AD /* ModalHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE1F5621DF13E5A00D733AD /* ModalHeaderView.swift */; };
CEE20C2D1EA288FA0086F724 /* UpdatingLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = CEE20C2C1EA288FA0086F724 /* UpdatingLabel.swift */; };
Expand Down Expand Up @@ -1494,13 +1496,19 @@
C3BD4A492597542700D97079 /* LoginCardAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginCardAlertView.swift; sourceTree = "<group>"; };
C3BD4A5225975C6000D97079 /* View+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "View+Extension.swift"; sourceTree = "<group>"; };
C3BD4A692597E1E900D97079 /* CardLoggedInView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardLoggedInView.swift; sourceTree = "<group>"; };
C3BDB42626CC028F004DAE77 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = tr; path = tr.lproj/BIP39Words.plist; sourceTree = "<group>"; };
C3BDB42726CC028F004DAE77 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/MainInterface.strings; sourceTree = "<group>"; };
C3BDB42826CC0338004DAE77 /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/Localizable.strings; sourceTree = "<group>"; };
C3BF74D826114969001CE2BB /* CardWalletDetails.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardWalletDetails.swift; sourceTree = "<group>"; };
C3BFD348259E31C100136837 /* LoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoginViewModel.swift; sourceTree = "<group>"; };
C3C8973725CD6B9300241FBE /* HostingTransactionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HostingTransactionCell.swift; sourceTree = "<group>"; };
C3D4379E2566EA3E00F423E1 /* LWActivityIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LWActivityIndicator.swift; sourceTree = "<group>"; };
C3D783A62565EA4A0004FF70 /* UnstoppableDomainView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnstoppableDomainView.swift; sourceTree = "<group>"; };
C3D783B62565EA6B0004FF70 /* UnstoppableDomainViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnstoppableDomainViewModel.swift; sourceTree = "<group>"; };
C3D783BF2565ECF60004FF70 /* UnstoppableDomainViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnstoppableDomainViewModelTests.swift; sourceTree = "<group>"; };
C3DAAE2C26C9C19600D9E18C /* Enter2FACodeViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Enter2FACodeViewModelTests.swift; sourceTree = "<group>"; };
C3E77C0826C2807200693E22 /* Enter2FACodeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Enter2FACodeViewModel.swift; sourceTree = "<group>"; };
C3EB6C1A26C18DD500881841 /* Enter2FACodeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Enter2FACodeView.swift; sourceTree = "<group>"; };
C3EFA9A02650807B005C59B5 /* LockScreenHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockScreenHeaderView.swift; sourceTree = "<group>"; };
C3EFA9A2265080FF005C59B5 /* LockScreenHeaderViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockScreenHeaderViewModel.swift; sourceTree = "<group>"; };
C3EFA9A52651A808005C59B5 /* LockScreenTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LockScreenTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1639,7 +1647,6 @@
CECCE5AF1E04AD7600D99448 /* DescriptionSendCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = DescriptionSendCell.swift; path = src/Views/SendViewCells/DescriptionSendCell.swift; sourceTree = "<group>"; };
CECCE5B11E04B00D00D99448 /* SendCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SendCell.swift; path = src/Views/SendViewCells/SendCell.swift; sourceTree = "<group>"; };
CED341321EF5A5C00014912A /* InAppAlert.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = InAppAlert.swift; path = src/Views/InAppAlert.swift; sourceTree = "<group>"; };
CED82D4D1E575A5500507A9B /* _main.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = _main.swift; path = src/_main.swift; sourceTree = "<group>"; };
CEE0EF511EBD14B60018DB36 /* PinTransitioningDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = PinTransitioningDelegate.swift; path = src/ViewControllers/ViewControllerTransitions/PinTransitioningDelegate.swift; sourceTree = "<group>"; };
CEE1F5621DF13E5A00D733AD /* ModalHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = ModalHeaderView.swift; path = src/Views/ModalHeaderView.swift; sourceTree = "<group>"; };
CEE20C2C1EA288FA0086F724 /* UpdatingLabel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = UpdatingLabel.swift; path = src/Views/UpdatingLabel.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -2187,6 +2194,7 @@
2465873723A5AAD100A32E9E /* loafwalletTests */ = {
isa = PBXGroup;
children = (
C3DAAE2B26C9C15A00D9E18C /* Two Factor Auth Tests */,
C3EFA9A42651A7C4005C59B5 /* Lock Screen Tests */,
C32DB42B264847D500017D26 /* Card Tests */,
C3188E3126445E5E0008ADD1 /* File Tests */,
Expand Down Expand Up @@ -3002,7 +3010,6 @@
CE8CD8DC1E2D9EF200785E02 /* Sender.swift */,
CE74F58C1E3BA85600ED5FA9 /* ExchangeUpdater.swift */,
CE124CFB1E68932C00DFA146 /* FeeManager.swift */,
CED82D4D1E575A5500507A9B /* _main.swift */,
CE45C1FC1E7650F5002C3847 /* KVStoreCoordinator.swift */,
CEC6F8441E886723000795B8 /* PaymentRequest.swift */,
7528D2971ECF655500925DBC /* PaymentProtocol.swift */,
Expand Down Expand Up @@ -3208,6 +3215,14 @@
name = Unstoppable;
sourceTree = "<group>";
};
C3DAAE2B26C9C15A00D9E18C /* Two Factor Auth Tests */ = {
isa = PBXGroup;
children = (
C3DAAE2C26C9C19600D9E18C /* Enter2FACodeViewModelTests.swift */,
);
path = "Two Factor Auth Tests";
sourceTree = "<group>";
};
C3EFA9A42651A7C4005C59B5 /* Lock Screen Tests */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -3396,6 +3411,7 @@
CEBF292D1EF99E55005C330A /* LightWeightAlert.swift */,
2494037C23AE0C7100369261 /* SyncProgressHeaderView.swift */,
C32DC79B2593971500A7FDB4 /* CardView.swift */,
C3EB6C1A26C18DD500881841 /* Enter2FACodeView.swift */,
);
name = Views;
sourceTree = "<group>";
Expand Down Expand Up @@ -3498,6 +3514,7 @@
isa = PBXGroup;
children = (
C3B7C3B8255EABBF00E98A64 /* SupportSafariViewModel.swift */,
C3E77C0826C2807200693E22 /* Enter2FACodeViewModel.swift */,
C3BD49D125954A3200D97079 /* ForgotViewModel.swift */,
C3BD49B62595420A00D97079 /* RegistrationViewModel.swift */,
C32DC792259396AB00A7FDB4 /* CardViewModel.swift */,
Expand Down Expand Up @@ -3865,6 +3882,7 @@
sv,
id,
Base,
tr,
);
mainGroup = 75A2A7871DA5934300A983D8;
packageReferences = (
Expand Down Expand Up @@ -4085,6 +4103,7 @@
C3D783C02565ECF60004FF70 /* UnstoppableDomainViewModelTests.swift in Sources */,
C345D81525A8D52600657E30 /* LoginViewModelTests.swift in Sources */,
249C570523B51F9B009CB5A9 /* TransactionsViewControllerTests.swift in Sources */,
C3DAAE2D26C9C19600D9E18C /* Enter2FACodeViewModelTests.swift in Sources */,
24470E2523A5EF0D00ADDA27 /* BRAPIClientTests.swift in Sources */,
C31891C326733FD400ECE25C /* TabBarViewControllerTests.swift in Sources */,
24470E3C23A5FFD700ADDA27 /* TouchIdEnabledTests.swift in Sources */,
Expand Down Expand Up @@ -4273,6 +4292,7 @@
C35ABD232574070A002BB9BB /* PartnersView.swift in Sources */,
CE03EC741EF256AC0038E3A8 /* SimpleUTXO.swift in Sources */,
24016D9023F913C1006A6791 /* LWAnalytics.swift in Sources */,
C3E77C0926C2807200693E22 /* Enter2FACodeViewModel.swift in Sources */,
C3C8973825CD6B9300241FBE /* HostingTransactionCell.swift in Sources */,
CE124CFC1E68932C00DFA146 /* FeeManager.swift in Sources */,
CEE20C381EA5B4680086F724 /* Strings.swift in Sources */,
Expand Down Expand Up @@ -4335,7 +4355,6 @@
CEC4CF091F0C84AB00E5C82E /* UIViewController+Alerts.swift in Sources */,
CE27F9591E2C8EA300F7F7F2 /* Amount.swift in Sources */,
CE1280F61EEA855C00D27649 /* Date+Additions.swift in Sources */,
CED82D4E1E575A5500507A9B /* _main.swift in Sources */,
CEEC708E1E954AAB00EF788E /* AboutCell.swift in Sources */,
22A9A9461DF61945000F0016 /* BRAPIClient.swift in Sources */,
24313C7E23820C1900A83F69 /* TransactionsViewController.swift in Sources */,
Expand All @@ -4356,6 +4375,7 @@
C354C4632590059500675E0E /* TransactionsViewModel.swift in Sources */,
CEF3D2DB1E8B55C80070178E /* UISlider+Gradient.swift in Sources */,
C32DAE0725925B7E003FC978 /* Color+Extension.swift in Sources */,
C3EB6C1B26C18DD500881841 /* Enter2FACodeView.swift in Sources */,
CEC6AA4B1DEFD24C00EE5AFD /* MenuButtonType.swift in Sources */,
C3BD4A6A2597E1E900D97079 /* CardLoggedInView.swift in Sources */,
24313C752381E73200A83F69 /* TransactionManager.swift in Sources */,
Expand Down Expand Up @@ -4588,6 +4608,7 @@
24375314238AE09700E1B2AE /* pt */,
24375315238AE09900E1B2AE /* ru */,
24375316238AE09D00E1B2AE /* sv */,
C3BDB42626CC028F004DAE77 /* tr */,
);
name = BIP39Words.plist;
sourceTree = "<group>";
Expand Down Expand Up @@ -4619,6 +4640,7 @@
24B9621723BA66CC00ECD938 /* pt */,
24B9621923BA66CE00ECD938 /* zh-Hant */,
24B9621B23BA66CF00ECD938 /* en */,
C3BDB42726CC028F004DAE77 /* tr */,
);
name = MainInterface.storyboard;
sourceTree = "<group>";
Expand All @@ -4642,6 +4664,7 @@
CE0FC0F91F72417500E7C626 /* sv */,
24306799238F479500EBEA99 /* id */,
2430679B238F5A2900EBEA99 /* en */,
C3BDB42826CC0338004DAE77 /* tr */,
);
name = Localizable.strings;
path = src/Strings;
Expand Down Expand Up @@ -5572,7 +5595,7 @@
repositoryURL = "https://github.com/litecoin-foundation/LitewalletPartnerAPI.git";
requirement = {
kind = exactVersion;
version = 0.7.0;
version = 0.8.0;
};
};
/* End XCRemoteSwiftPackageReference section */
Expand Down
1 change: 0 additions & 1 deletion loafwallet.xcodeproj/xcshareddata/xcschemes/loafwallet.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
enableASanStackUseAfterReturn = "YES"
codeCoverageEnabled = "YES"
localizableStringsDataGatheringEnabled = "YES">
<AdditionalOptions>
<AdditionalOption
Expand Down
4 changes: 2 additions & 2 deletions loafwallet.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/litecoin-foundation/LitewalletPartnerAPI.git",
"state": {
"branch": null,
"revision": "945c891c9606c48de2266daf87e0303f8cf39ea8",
"version": "0.7.0"
"revision": "5a5d5c423e20b38dae43978cc7c3a731921a4bc1",
"version": "0.8.0"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion loafwallet/AppDelegate.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {

UIView.swizzleSetFrame()

applicationController.launch(application: application, window: thisWindow, options: launchOptions)
applicationController.launch(application: application, window: thisWindow)

LWAnalytics.logEventWithParameters(itemName:._20191105_AL)

Expand Down
2 changes: 0 additions & 2 deletions loafwallet/CardV1ToastView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,5 +82,3 @@ struct CardV1ToastView_Previews: PreviewProvider {
}
}
}


Loading