Skip to content

Commit a314800

Browse files
authored
Merge pull request #5845 from woocommerce/issue/5616-setup-path
[Mobile Payments] Update URL to wp-admin
2 parents 5524af8 + 630016b commit a314800

File tree

3 files changed

+5
-20
lines changed

3 files changed

+5
-20
lines changed

WooCommerce/Classes/Model/Site+Woo.swift

Lines changed: 0 additions & 11 deletions
This file was deleted.

WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/Onboarding Errors/InPersonPaymentsWCPayNotSetup.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ struct InPersonPaymentsWCPayNotSetup: View {
3737
}
3838

3939
var setupURL: URL? {
40-
ServiceLocator.stores.sessionManager.defaultSite?.adminURL(path: Constants.wcpaySetupPath)
41-
}
42-
}
40+
guard let adminURL = ServiceLocator.stores.sessionManager.defaultSite?.adminURL else {
41+
return nil
42+
}
4343

44-
private enum Constants {
45-
static let wcpaySetupPath = "wp-admin/admin.php?page=wc-admin&path=%2Fpayments%2Fconnect"
44+
return URL(string: adminURL)
45+
}
4646
}
4747

4848
private enum Localization {

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1518,7 +1518,6 @@
15181518
E1BE703A265E6F47006CA4D9 /* CardPresentModalScanningFailed.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1BE7039265E6F47006CA4D9 /* CardPresentModalScanningFailed.swift */; };
15191519
E1C47209267A1ECC00D06DA1 /* CrashLoggingStack.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C47208267A1ECC00D06DA1 /* CrashLoggingStack.swift */; };
15201520
E1C5E78226C2A971008D4C47 /* InPersonPaymentsWCPayNotSetup.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C5E78126C2A971008D4C47 /* InPersonPaymentsWCPayNotSetup.swift */; };
1521-
E1C5E78426C2B8E8008D4C47 /* Site+Woo.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1C5E78326C2B8E8008D4C47 /* Site+Woo.swift */; };
15221521
E1D4E84426776A6B00256B83 /* HeadlineTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1D4E84326776A6A00256B83 /* HeadlineTableViewCell.swift */; };
15231522
E1D4E84526776AD900256B83 /* HeadlineTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E1D4E84226776A6A00256B83 /* HeadlineTableViewCell.xib */; };
15241523
E1E125AA26EB42530068A9B0 /* CardPresentModalUpdateProgress.swift in Sources */ = {isa = PBXBuildFile; fileRef = E1E125A926EB42530068A9B0 /* CardPresentModalUpdateProgress.swift */; };
@@ -3120,7 +3119,6 @@
31203119
E1BE7039265E6F47006CA4D9 /* CardPresentModalScanningFailed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentModalScanningFailed.swift; sourceTree = "<group>"; };
31213120
E1C47208267A1ECC00D06DA1 /* CrashLoggingStack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CrashLoggingStack.swift; sourceTree = "<group>"; };
31223121
E1C5E78126C2A971008D4C47 /* InPersonPaymentsWCPayNotSetup.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InPersonPaymentsWCPayNotSetup.swift; sourceTree = "<group>"; };
3123-
E1C5E78326C2B8E8008D4C47 /* Site+Woo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Site+Woo.swift"; sourceTree = "<group>"; };
31243122
E1D4E84226776A6A00256B83 /* HeadlineTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HeadlineTableViewCell.xib; sourceTree = "<group>"; };
31253123
E1D4E84326776A6A00256B83 /* HeadlineTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeadlineTableViewCell.swift; sourceTree = "<group>"; };
31263124
E1E125A926EB42530068A9B0 /* CardPresentModalUpdateProgress.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CardPresentModalUpdateProgress.swift; sourceTree = "<group>"; };
@@ -5869,7 +5867,6 @@
58695867
743EDD9E214B05350039071B /* TopEarnerStatsItem+Woo.swift */,
58705868
D8EF1E552605121C00380EA4 /* OrderPaymentMethod.swift */,
58715869
FEDD70AE26A7223500194C3A /* StorageEligibilityErrorInfo+Woo.swift */,
5872-
E1C5E78326C2B8E8008D4C47 /* Site+Woo.swift */,
58735870
DEDB886A26E8531E00981595 /* ShippingLabelPackageAttributes.swift */,
58745871
DE77889926FD7EF0008DFF44 /* ShippingLabelPackageItem.swift */,
58755872
DEF3300B270444060073AE29 /* ShippingLabelSelectedRate.swift */,
@@ -8511,7 +8508,6 @@
85118508
B5D6DC54214802740003E48A /* SyncCoordinator.swift in Sources */,
85128509
B57C5C9421B80E4700FF82B2 /* Data+Woo.swift in Sources */,
85138510
453A907925EFB6D6006EE892 /* ButtonActivityIndicator.swift in Sources */,
8514-
E1C5E78426C2B8E8008D4C47 /* Site+Woo.swift in Sources */,
85158511
4546E09A271F0942003836F3 /* FilteredOrdersHeaderBar.swift in Sources */,
85168512
02312797277D4F650060E180 /* StoreStatsPeriodViewModel.swift in Sources */,
85178513
B554E17B2152F27200F31188 /* UILabel+Appearance.swift in Sources */,

0 commit comments

Comments
 (0)