Skip to content
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
12 changes: 4 additions & 8 deletions NativeAppTemplate.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@
01E0A5B825BD0FCD00298D35 /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A5B325BD0FC700298D35 /* ErrorView.swift */; };
01E0A60125BD149200298D35 /* MainButtonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A5F925BD148800298D35 /* MainButtonView.swift */; };
01E0A60C25BD440300298D35 /* SignInEmailAndPasswordView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A60B25BD440300298D35 /* SignInEmailAndPasswordView.swift */; };
01E0A62225BD4A7800298D35 /* Shopkeeper+Backdoor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A62125BD4A7800298D35 /* Shopkeeper+Backdoor.swift */; };
01E0A63025BD53FD00298D35 /* Shop.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E0A62F25BD53FD00298D35 /* Shop.swift */; };
01E1CECC287787A700E724FC /* SignUpView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E1CECB287787A700E724FC /* SignUpView.swift */; };
01E2477029A570D300D4B00D /* SignUp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 01E2476F29A570D300D4B00D /* SignUp.swift */; };
Expand Down Expand Up @@ -338,7 +337,6 @@
01E0A5B525BD0FC700298D35 /* LoadingView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
01E0A5F925BD148800298D35 /* MainButtonView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainButtonView.swift; sourceTree = "<group>"; };
01E0A60B25BD440300298D35 /* SignInEmailAndPasswordView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInEmailAndPasswordView.swift; sourceTree = "<group>"; };
01E0A62125BD4A7800298D35 /* Shopkeeper+Backdoor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Shopkeeper+Backdoor.swift"; sourceTree = "<group>"; };
01E0A62F25BD53FD00298D35 /* Shop.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Shop.swift; sourceTree = "<group>"; };
01E1CECB287787A700E724FC /* SignUpView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpView.swift; sourceTree = "<group>"; };
01E2476F29A570D300D4B00D /* SignUp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUp.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -629,7 +627,6 @@
children = (
017203C725A9708A008FD63B /* SessionController.swift */,
0199CD3D2E075CBB00109DC6 /* SessionControllerProtocol.swift */,
01E0A62125BD4A7800298D35 /* Shopkeeper+Backdoor.swift */,
);
path = Sessions;
sourceTree = "<group>";
Expand Down Expand Up @@ -906,7 +903,7 @@
attributes = {
BuildIndependentTargetsInParallel = YES;
LastSwiftUpdateCheck = 1620;
LastUpgradeCheck = 1640;
LastUpgradeCheck = 2630;
TargetAttributes = {
011F6DEC259EF16400BED22E = {
CreatedOnToolsVersion = 12.3;
Expand Down Expand Up @@ -960,9 +957,6 @@
};
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
/* End PBXShellScriptBuildPhase section */

/* Begin PBXSourcesBuildPhase section */
011F6DE9259EF16400BED22E /* Sources */ = {
isa = PBXSourcesBuildPhase;
Expand Down Expand Up @@ -1040,7 +1034,6 @@
01ED197B2A037B9E00CD4735 /* AppTabView.swift in Sources */,
0110A1612AC81978003EDCBA /* ResendConfirmationInstructionsView.swift in Sources */,
01D85BA72E081C6D00A95798 /* ScanViewModel.swift in Sources */,
01E0A62225BD4A7800298D35 /* Shopkeeper+Backdoor.swift in Sources */,
0106413C29A9EDFF00B46FED /* AccountPasswordRequest.swift in Sources */,
0172035625A9642E008FD63B /* ShopAdapter.swift in Sources */,
0172788B2D7D936E00CE424F /* CompletedTag.swift in Sources */,
Expand Down Expand Up @@ -1200,6 +1193,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
Expand Down Expand Up @@ -1262,6 +1256,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-O";
Expand Down Expand Up @@ -1397,6 +1392,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_OPTIMIZATION_LEVEL = "-O";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1640"
LastUpgradeVersion = "2630"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
3 changes: 2 additions & 1 deletion NativeAppTemplate/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ extension String {
static let passwordUpdatedError = "There was a problem updating the password."

static let sentResetPasswordInstruction =
"An email has been sent the email containing instructions for resetting your password."
"If your email address exists in our database, you will receive a password recovery link " +
"at your email address in a few minutes."
static let sentResetPasswordInstructionError = "Unable to find user with the email."

static let sentConfirmationInstruction =
Expand Down
2 changes: 1 addition & 1 deletion NativeAppTemplate/Sessions/SessionController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ import Observation
init(loginRepository: LoginRepositoryProtocol) {
self.loginRepository = loginRepository

let shopkeeper = Shopkeeper.backdoor ?? loginRepository.currentShopkeeper
let shopkeeper = loginRepository.currentShopkeeper
let token = shopkeeper?.token ?? ""
let tokenClient = shopkeeper?.client ?? ""
let expiry = shopkeeper?.expiry ?? ""
Expand Down
24 changes: 0 additions & 24 deletions NativeAppTemplate/Sessions/Shopkeeper+Backdoor.swift

This file was deleted.

Loading