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

Property to Hide Card Logos #423

Merged
merged 7 commits into from
Aug 10, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* Require Xcode 14.1+ and Swift 5.7.1+ (per [App Store requirements](https://developer.apple.com/news/?id=jd9wcyov#:~:text=Starting%20April%2025%2C%202023%2C%20iOS,on%20the%20Mac%20App%20Store))
* Add California Privacy Laws notice of collection to credit card form
* Fix bug where presenting the Drop-in from a modal screen without a `modalPresentationStyle` does not display the status bar when both device and Drop-in are in light mode (fixes #419)
* Add `BTDropInRequest.cardLogosDisabled` to hide card logos on the credit card form if desired

## 9.8.2 (2023-04-10)
* Silence UnionPay related deprecation warnings introduced in `braintree_ios` 5.21.0 and higher.
Expand Down
1 change: 1 addition & 0 deletions Demo/Application/DemoDropInViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class DemoDropInViewController: DemoBaseViewController, DemoDropInViewDelegate {

dropInRequest.paypalDisabled = DemoSettings.paypalDisabled
dropInRequest.cardDisabled = ProcessInfo.processInfo.arguments.contains("-CardDisabled")
dropInRequest.cardLogosDisabled = ProcessInfo.processInfo.arguments.contains("-CardLogosDisabled")
dropInRequest.shouldMaskSecurityCode = DemoSettings.maskSecurityCode
dropInRequest.cardholderNameSetting = DemoSettings.cardholderNameSetting
dropInRequest.vaultCard = DemoSettings.vaultCardSetting
Expand Down
55 changes: 55 additions & 0 deletions Demo/UITests/BraintreeDropIn_UITests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,61 @@ class BraintreeDropIn_CardDisabled_UITests: XCTestCase {
}
}

class BraintreeDropIn_CardLogosDisabled_UITests: XCTestCase {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is class for disabled and enabled because apparently the app.launchArguments need to be appended in setup instead of the test method. I guess that makes sense but would have been nice to have both tests in a single class, but that's not possible.


var app: XCUIApplication!

override func setUp() {
super.setUp()
continueAfterFailure = false
app = XCUIApplication()
app.launchArguments.append("-EnvironmentSandbox")
app.launchArguments.append("-TokenizationKey")
app.launchArguments.append("-CardLogosDisabled")
app.launch()
sleep(1)
waitForElementToBeHittable(app.buttons["Add Payment Method"])
app.buttons["Add Payment Method"].tap()
}

func testDropIn_cardLogosDisabledOption_hidesCardLogos() {
waitForElementToBeHittable(app.staticTexts["Credit or Debit Card"])
app.staticTexts["Credit or Debit Card"].tap()

let elementsQuery = app.scrollViews.otherElements
let cardLogoImages = elementsQuery.images.element.exists

XCTAssertFalse(cardLogoImages)
}
}

class BraintreeDropIn_CardLogosEnabled_UITests: XCTestCase {

var app: XCUIApplication!

override func setUp() {
super.setUp()
continueAfterFailure = false
app = XCUIApplication()
app.launchArguments.append("-EnvironmentSandbox")
app.launchArguments.append("-TokenizationKey")
app.launch()
sleep(1)
waitForElementToBeHittable(app.buttons["Add Payment Method"])
app.buttons["Add Payment Method"].tap()
}

func testDropIn_cardLogosEnabledOption_showsCardLogos() {
waitForElementToBeHittable(app.staticTexts["Credit or Debit Card"])
app.staticTexts["Credit or Debit Card"].tap()

let elementsQuery = app.scrollViews.otherElements
let cardLogoImages = elementsQuery.images.element.exists

XCTAssertTrue(cardLogoImages)
}
}

class BraintreeDropIn_CardForm_RequestOptions_UITests: XCTestCase {

var app: XCUIApplication!
Expand Down
15 changes: 9 additions & 6 deletions Sources/BraintreeDropIn/BTCardFormViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -234,12 +234,15 @@ - (void)setupForm {
self.cardNumberFooter.layoutMargins = UIEdgeInsetsMake(0, [BTUIKAppearance verticalFormSpace], 0, [BTUIKAppearance verticalFormSpace]);
self.cardNumberFooter.layoutMarginsRelativeArrangement = true;
[self.stackView addArrangedSubview:self.cardNumberFooter];
self.cardList = [BTUIKCardListLabel new];
self.cardList.translatesAutoresizingMaskIntoConstraints = NO;
self.cardList.availablePaymentOptions = self.supportedCardTypes;
[self.cardNumberFooter addArrangedSubview:self.cardList];
[BTDropInUIUtilities addSpacerToStackView:self.cardNumberFooter beforeView:self.cardList size: [BTUIKAppearance horizontalFormContentPadding]];


if (!self.dropInRequest.cardLogosDisabled) {
self.cardList = [BTUIKCardListLabel new];
self.cardList.translatesAutoresizingMaskIntoConstraints = NO;
self.cardList.availablePaymentOptions = self.supportedCardTypes;
[self.cardNumberFooter addArrangedSubview:self.cardList];
[BTDropInUIUtilities addSpacerToStackView:self.cardNumberFooter beforeView:self.cardList size: [BTUIKAppearance horizontalFormContentPadding]];
}

NSUInteger indexOfCardNumberField = [self.stackView.arrangedSubviews indexOfObject:self.cardNumberField];
[self.stackView insertArrangedSubview:self.cardNumberFooter atIndex:(indexOfCardNumberField + 1)];

Expand Down
1 change: 1 addition & 0 deletions Sources/BraintreeDropIn/Models/BTDropInRequest.m
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ - (id)copyWithZone:(__unused NSZone *)zone {
request.paypalDisabled = self.paypalDisabled;
request.venmoDisabled = self.venmoDisabled;
request.cardDisabled = self.cardDisabled;
request.cardLogosDisabled = self.cardLogosDisabled;
request.threeDSecureRequest = self.threeDSecureRequest;
request.cardholderNameSetting = self.cardholderNameSetting;
request.shouldMaskSecurityCode = self.shouldMaskSecurityCode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ typedef NS_ENUM(NSInteger, BTFormFieldSetting) {
/// Defaults to false. Set to true to hide the Card option even if enabled for your account.
@property (nonatomic, assign) BOOL cardDisabled;

/// Defaults to false. Set to true to hide all card logos for your account.
@property (nonatomic, assign) BOOL cardLogosDisabled;

/// Optional: Enable 3DS verification and specify options and additional information.
///
/// Note: To encourage 3DS 2.0 flows, set `billingAddress`, `amount`, `email`, `mobilePhone` for best results.
Expand Down
2 changes: 2 additions & 0 deletions UnitTests/BTDropInRequestTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ - (void)test_copyProperties {
originalRequest.paypalDisabled = YES;
originalRequest.venmoDisabled = YES;
originalRequest.cardDisabled = YES;
originalRequest.cardLogosDisabled = YES;
originalRequest.threeDSecureRequest = threeDSecureRequest;
originalRequest.cardholderNameSetting = BTFormFieldOptional;
originalRequest.shouldMaskSecurityCode = YES;
Expand All @@ -60,6 +61,7 @@ - (void)test_copyProperties {
XCTAssertEqual(originalRequest.paypalDisabled, copiedRequest.paypalDisabled);
XCTAssertEqual(originalRequest.venmoDisabled, copiedRequest.venmoDisabled);
XCTAssertEqual(originalRequest.cardDisabled, copiedRequest.cardDisabled);
XCTAssertEqual(originalRequest.cardLogosDisabled, copiedRequest.cardLogosDisabled);
XCTAssertEqual(originalRequest.cardholderNameSetting, copiedRequest.cardholderNameSetting);
XCTAssertEqual(originalRequest.shouldMaskSecurityCode, copiedRequest.shouldMaskSecurityCode);
XCTAssertEqual(originalRequest.vaultManager, copiedRequest.vaultManager);
Expand Down
Loading