Skip to content

Commit 179c692

Browse files
committed
Remove beta tag anotation
1 parent d2fe925 commit 179c692

File tree

2 files changed

+6
-47
lines changed

2 files changed

+6
-47
lines changed

WooCommerce/Classes/ViewRelated/Orders/Simple Payments/Method/SimplePaymentsMethod.swift

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -40,23 +40,23 @@ struct SimplePaymentsMethod: View {
4040
Divider()
4141

4242
Group {
43-
MethodRow(icon: .priceImage, title: Localization.cash, showBetaAnnotation: false) {
43+
MethodRow(icon: .priceImage, title: Localization.cash) {
4444
showingCashAlert = true
4545
viewModel.trackCollectByCash()
4646
}
4747

4848
if viewModel.showPayWithCardRow {
4949
Divider()
5050

51-
MethodRow(icon: .creditCardImage, title: Localization.card, showBetaAnnotation: false) {
51+
MethodRow(icon: .creditCardImage, title: Localization.card) {
5252
viewModel.collectPayment(on: rootViewController, onSuccess: dismiss)
5353
}
5454
}
5555

5656
if viewModel.showPaymentLinkRow {
5757
Divider()
5858

59-
MethodRow(icon: .linkImage, title: Localization.link, showBetaAnnotation: true) {
59+
MethodRow(icon: .linkImage, title: Localization.link) {
6060
sharingPaymentLink = true
6161
viewModel.trackCollectByPaymentLink()
6262
}
@@ -114,10 +114,6 @@ private struct MethodRow: View {
114114
///
115115
let title: String
116116

117-
/// Defines if the beta tag should be shown.
118-
///
119-
let showBetaAnnotation: Bool
120-
121117
/// Action when the row is selected
122118
///
123119
let action: () -> ()
@@ -141,14 +137,9 @@ private struct MethodRow: View {
141137
.foregroundColor(Color(.systemGray))
142138
.accessibility(hidden: true)
143139

144-
HStack {
145-
Text(title)
146-
.bodyStyle()
147-
148-
BetaTag()
149-
.renderedIf(showBetaAnnotation)
150-
}
151-
.frame(maxWidth: .infinity, alignment: .leading)
140+
Text(title)
141+
.bodyStyle()
142+
.frame(maxWidth: .infinity, alignment: .leading)
152143

153144
DisclosureIndicator()
154145
}
@@ -158,30 +149,6 @@ private struct MethodRow: View {
158149
}
159150
}
160151

161-
/// Represents a Beta annotation tag
162-
///
163-
private struct BetaTag: View {
164-
/// Constants
165-
///
166-
enum Localization {
167-
static let beta = NSLocalizedString("Beta", comment: "Beta annotation for sharing a payment link")
168-
}
169-
170-
enum Layout {
171-
static let padding: CGFloat = 5
172-
static let cornerRadius: CGFloat = 7
173-
}
174-
175-
var body: some View {
176-
Text(Localization.beta)
177-
.font(.caption)
178-
.foregroundColor(Color(.textInverted))
179-
.padding(Layout.padding)
180-
.background(Color(.accent))
181-
.cornerRadius(Layout.cornerRadius)
182-
}
183-
}
184-
185152
// MARK: Constants
186153
private extension SimplePaymentsMethod {
187154
enum Localization {

WooCommerce/WooCommerce.xcodeproj/project.pbxproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,6 @@
496496
2667BFE92530ECE4008099D4 /* RefundProductsTotalViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2667BFE82530ECE4008099D4 /* RefundProductsTotalViewModelTests.swift */; };
497497
2667BFEB2535FF09008099D4 /* RefundShippingCalculationUseCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2667BFEA2535FF09008099D4 /* RefundShippingCalculationUseCase.swift */; };
498498
2667BFED25360681008099D4 /* RefundShippingCalculationUseCaseTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2667BFEC25360681008099D4 /* RefundShippingCalculationUseCaseTests.swift */; };
499-
267066052773DAE6008E1F68 /* PaymentLinkBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267066042773DAE6008E1F68 /* PaymentLinkBuilder.swift */; };
500-
267066072773DC81008E1F68 /* PaymentLinkBuilderTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 267066062773DC81008E1F68 /* PaymentLinkBuilderTests.swift */; };
501499
26771A14256FFA8700EE030E /* IssueRefundCoordinatingController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 26771A13256FFA8700EE030E /* IssueRefundCoordinatingController.swift */; };
502500
2678897C270E6E8B00BD249E /* SimplePaymentsAmount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2678897B270E6E8B00BD249E /* SimplePaymentsAmount.swift */; };
503501
2687165524D21BC80042F6AE /* SurveySubmittedViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2687165324D21BC80042F6AE /* SurveySubmittedViewController.swift */; };
@@ -2192,8 +2190,6 @@
21922190
2667BFE82530ECE4008099D4 /* RefundProductsTotalViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefundProductsTotalViewModelTests.swift; sourceTree = "<group>"; };
21932191
2667BFEA2535FF09008099D4 /* RefundShippingCalculationUseCase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefundShippingCalculationUseCase.swift; sourceTree = "<group>"; };
21942192
2667BFEC25360681008099D4 /* RefundShippingCalculationUseCaseTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefundShippingCalculationUseCaseTests.swift; sourceTree = "<group>"; };
2195-
267066042773DAE6008E1F68 /* PaymentLinkBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentLinkBuilder.swift; sourceTree = "<group>"; };
2196-
267066062773DC81008E1F68 /* PaymentLinkBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentLinkBuilderTests.swift; sourceTree = "<group>"; };
21972193
26771A13256FFA8700EE030E /* IssueRefundCoordinatingController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IssueRefundCoordinatingController.swift; sourceTree = "<group>"; };
21982194
2678897B270E6E8B00BD249E /* SimplePaymentsAmount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SimplePaymentsAmount.swift; sourceTree = "<group>"; };
21992195
267CFE1824435A5500AF3A13 /* ProductCategoryViewModelBuilderTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProductCategoryViewModelBuilderTests.swift; sourceTree = "<group>"; };
@@ -5951,7 +5947,6 @@
59515947
0211252D25773FB00075AD2A /* MockAggregateOrderItem.swift */,
59525948
DE68B84226FAF17A00C86CFB /* DefaultConnectivityObserver.swift */,
59535949
4590B651261C8D1E00A6FCE0 /* WeightFormatterTests.swift */,
5954-
267066062773DC81008E1F68 /* PaymentLinkBuilderTests.swift */,
59555950
);
59565951
path = Tools;
59575952
sourceTree = "<group>";
@@ -6049,7 +6044,6 @@
60496044
45D685FD23D0FB25005F87D0 /* Throttler.swift */,
60506045
262C921E26EEF8B100011F92 /* Binding.swift */,
60516046
31579027273EE2B1008CA3AF /* VersionHelpers.swift */,
6052-
267066042773DAE6008E1F68 /* PaymentLinkBuilder.swift */,
60536047
174CA86D27DBFD2D00126524 /* ShareAppTextItemActivitySource.swift */,
60546048
);
60556049
path = Tools;
@@ -8860,7 +8854,6 @@
88608854
025B174A237AA49D00C780B4 /* Product+ProductForm.swift in Sources */,
88618855
B57C744720F55BC800EEFC87 /* UIView+Helpers.swift in Sources */,
88628856
45912FE32526642200982948 /* ProductFormViewController+Helpers.swift in Sources */,
8863-
267066052773DAE6008E1F68 /* PaymentLinkBuilder.swift in Sources */,
88648857
B55D4C0620B6027200D7A50F /* AuthenticationManager.swift in Sources */,
88658858
451A04F02386F7B500E368C9 /* ProductImageCollectionViewCell.swift in Sources */,
88668859
AEACCB6D2785FF4A000D01F0 /* NavigationRow.swift in Sources */,
@@ -9742,7 +9735,6 @@
97429735
DE001323279A793A00EB0350 /* CouponWooTests.swift in Sources */,
97439736
45B98E1F25DECC1C00A1232B /* ShippingLabelAddressFormViewModelTests.swift in Sources */,
97449737
02BC5AA424D27F8900C43326 /* ProductVariationFormViewModel+ObservablesTests.swift in Sources */,
9745-
267066072773DC81008E1F68 /* PaymentLinkBuilderTests.swift in Sources */,
97469738
CCCC5B1326CC2B9F0034FB63 /* ShippingLabelCustomPackageFormViewModelTests.swift in Sources */,
97479739
D41C9F3126D9A43200993558 /* WhatsNewViewModelTests.swift in Sources */,
97489740
02A275BE23FE57DC005C560F /* ProductUIImageLoaderTests.swift in Sources */,

0 commit comments

Comments
 (0)