This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
// | |
// ContentView.swift | |
// Updater | |
// | |
// Created by Jorge Bernal on 9/9/21. | |
// | |
import SwiftUI | |
struct Arrow: Shape { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift b/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
index afa5402e6..3d909b60e 100644 | |
--- a/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
+++ b/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
@@ -265,21 +265,16 @@ extension StripeCardReaderService: CardReaderService { | |
} | |
public func connect(_ reader: CardReader) -> Future <CardReader, Error> { | |
- return Future() { [weak self] promise in | |
- |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift b/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
index afa5402e6..5b870dd2f 100644 | |
--- a/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
+++ b/Hardware/Hardware/CardReader/StripeCardReader/StripeCardReaderService.swift | |
@@ -265,21 +265,16 @@ extension StripeCardReaderService: CardReaderService { | |
} | |
public func connect(_ reader: CardReader) -> Future <CardReader, Error> { | |
- return Future() { [weak self] promise in | |
- |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WooCommerce/Classes/ViewRelated/ReusableViews/LabeledTextViewTableViewCell.swift b/WooCommerce/Classes/ViewRelated/ReusableViews/LabeledTextViewTableViewCell.swift | |
index 924b17b86..a80e9230a 100644 | |
--- a/WooCommerce/Classes/ViewRelated/ReusableViews/LabeledTextViewTableViewCell.swift | |
+++ b/WooCommerce/Classes/ViewRelated/ReusableViews/LabeledTextViewTableViewCell.swift | |
@@ -15,9 +15,10 @@ final class LabeledTextViewTableViewCell: UITableViewCell { | |
var style: Style = .headline | |
} | |
- @IBOutlet weak var productLabelHolder: UIView! | |
@IBOutlet weak var productStatusLabel: UILabel! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import Foundation | |
import Down | |
extension NSAttributedString { | |
convenience init(markdown: String) throws { | |
self.init(attributedString: try Down(markdownString: markdown).toAttributedString()) | |
} | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import Foundation | |
struct TransitionalAttributedString { | |
let nsAttributedString: NSAttributedString | |
init(_ nsAttributedString: NSAttributedString) { | |
self.nsAttributedString = nsAttributedString | |
} | |
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsUnavailableView.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsUnavailableView.swift | |
index aa328c1d0..ee28b7d78 100644 | |
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsUnavailableView.swift | |
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/In-Person Payments/InPersonPaymentsUnavailableView.swift | |
@@ -1,6 +1,9 @@ | |
import SwiftUI | |
+import Yosemite | |
struct InPersonPaymentsUnavailableView: View { | |
+ let state: CardPresentPaymentOnboardingState |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
import SwiftUI | |
struct InPersonPaymentsAvailableView: View { | |
let showViewController: (UIViewController) -> Void | |
var body: some View { | |
Group { | |
List { | |
NavigationLink(Localization.manageCardReader, destination: CardReaderSettingsPresentingView()) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 6f0c7a7b7121538c616f5d1e5b40808d59147f9d | |
Merge: 818d5f031 730a3ab54 | |
Author: Jorge Bernal <[email protected]> | |
Date: Tue Jul 6 10:00:52 2021 +0200 | |
On develop: disable payment on zero-dollar amounts | |
diff --cc WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift | |
index 8a299a82e,8a299a82e..5b3389c28 | |
--- a/WooCommerce/Classes/ViewModels/Order Details/OrderDetailsDataSource.swift |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/CardReadersV2/CardReaderSettingsKnownReadersProvider.swift b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/CardReadersV2/CardReaderSettingsKnownReadersProvider.swift | |
index 7fe46af59..35dc38f80 100644 | |
--- a/WooCommerce/Classes/ViewRelated/Dashboard/Settings/CardReadersV2/CardReaderSettingsKnownReadersProvider.swift | |
+++ b/WooCommerce/Classes/ViewRelated/Dashboard/Settings/CardReadersV2/CardReaderSettingsKnownReadersProvider.swift | |
@@ -6,13 +6,7 @@ import Combine | |
/// Combine into the Storage layer | |
/// | |
protocol CardReaderSettingsKnownReadersProvider { | |
- | |
- /// We can't use a @Published wrapper for knownReaders as part of a protocol declaration, but we can |