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.

Sign up for GitHub

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

Deprecation of MTN PIN USSD #107

Merged
merged 13 commits into from
Mar 26, 2024
Merged

Deprecation of MTN PIN USSD #107

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9e792f0
Fix Builds
cedricbahirwe Dec 8, 2023
2d900c0
t:wq
cedricbahirwe Feb 2, 2024
c7c865c
Fix merge
cedricbahirwe Feb 2, 2024
d7bdfbb
Fix merge conflict
cedricbahirwe Feb 2, 2024
211257a
Disable warning for firebase duplicate libs
cedricbahirwe Mar 25, 2024
431d65d
Fixed Deprecated CodePin API
cedricbahirwe Mar 25, 2024
8139d48
Deprecation removed
cedricbahirwe Mar 25, 2024
867c8df
Fix PurchaseDetailView.swift
cedricbahirwe Mar 25, 2024
55663e1
Update Firebase SDKs
cedricbahirwe Mar 25, 2024
5a95588
Improve Logic and Remove CodePin Usage
cedricbahirwe Mar 26, 2024
416f239
Removed Pin from testS
cedricbahirwe Mar 26, 2024
2844bde
Cleaned tests and removed unused dependencies
cedricbahirwe Mar 26, 2024
65a78ac
Bump Version
cedricbahirwe Mar 26, 2024
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
Prev Previous commit
Next Next commit
Cleaned tests and removed unused dependencies
  • Loading branch information
@cedricbahirwe
cedricbahirwe committed Mar 26, 2024
commit 2844bdead6378dd7f0aa2dee6ebcaa5c8e76dae5
55 changes: 3 additions & 52 deletions Dialer/Dialer.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,16 +79,11 @@
CB56DDC62A4DB1F20007AF55 /* CircleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB56DDC52A4DB1F10007AF55 /* CircleView.swift */; };
CB582AEC29ABEB3100FAD610 /* FirebaseAnalyticsWithoutAdIdSupport in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AEB29ABEB3100FAD610 /* FirebaseAnalyticsWithoutAdIdSupport */; };
CB582AEE29ABEB3100FAD610 /* FirebaseDatabase in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AED29ABEB3100FAD610 /* FirebaseDatabase */; };
CB582AF029ABEB3100FAD610 /* FirebaseDatabaseSwift in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AEF29ABEB3100FAD610 /* FirebaseDatabaseSwift */; };
CB582AF229ABEB3100FAD610 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AF129ABEB3100FAD610 /* FirebaseFirestore */; };
CB582AF429ABEB3100FAD610 /* FirebaseFirestoreSwift in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AF329ABEB3100FAD610 /* FirebaseFirestoreSwift */; };
CB582AF629ABEB3100FAD610 /* FirebaseFunctions in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AF529ABEB3100FAD610 /* FirebaseFunctions */; };
CB582AF829ABEB3100FAD610 /* FirebaseFunctionsCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AF729ABEB3100FAD610 /* FirebaseFunctionsCombine-Community */; };
CB582AFA29ABEB3100FAD610 /* FirebaseMessaging in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AF929ABEB3100FAD610 /* FirebaseMessaging */; };
CB582AFC29ABEB3100FAD610 /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AFB29ABEB3100FAD610 /* FirebaseRemoteConfig */; };
CB582AFE29ABEB3100FAD610 /* FirebaseRemoteConfigSwift in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AFD29ABEB3100FAD610 /* FirebaseRemoteConfigSwift */; };
CB582B0029ABEB3100FAD610 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = CB582AFF29ABEB3100FAD610 /* FirebaseStorage */; };
CB582B0229ABEB3100FAD610 /* FirebaseStorageCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = CB582B0129ABEB3100FAD610 /* FirebaseStorageCombine-Community */; };
CB63E0E129E5838E00E1BF77 /* UserMerchantStore.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB63E0E029E5838E00E1BF77 /* UserMerchantStore.swift */; };
CB676C69279149B30050B3B9 /* AppReviewing.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB676C68279149B30050B3B9 /* AppReviewing.swift */; };
CB7426BF2A05C05D00BE76DF /* DeviceAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = CB7426BE2A05C05D00BE76DF /* DeviceAccount.swift */; };
Expand Down Expand Up @@ -242,15 +237,10 @@
files = (
CB582AFC29ABEB3100FAD610 /* FirebaseRemoteConfig in Frameworks */,
CB582AFA29ABEB3100FAD610 /* FirebaseMessaging in Frameworks */,
CB582AF829ABEB3100FAD610 /* FirebaseFunctionsCombine-Community in Frameworks */,
CB582AF429ABEB3100FAD610 /* FirebaseFirestoreSwift in Frameworks */,
CB582AF029ABEB3100FAD610 /* FirebaseDatabaseSwift in Frameworks */,
CB582AF229ABEB3100FAD610 /* FirebaseFirestore in Frameworks */,
CB582AF629ABEB3100FAD610 /* FirebaseFunctions in Frameworks */,
CB582AFE29ABEB3100FAD610 /* FirebaseRemoteConfigSwift in Frameworks */,
CB582B0029ABEB3100FAD610 /* FirebaseStorage in Frameworks */,
CB582AEE29ABEB3100FAD610 /* FirebaseDatabase in Frameworks */,
CB582B0229ABEB3100FAD610 /* FirebaseStorageCombine-Community in Frameworks */,
CB582AEC29ABEB3100FAD610 /* FirebaseAnalyticsWithoutAdIdSupport in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -596,16 +586,11 @@
packageProductDependencies = (
CB582AEB29ABEB3100FAD610 /* FirebaseAnalyticsWithoutAdIdSupport */,
CB582AED29ABEB3100FAD610 /* FirebaseDatabase */,
CB582AEF29ABEB3100FAD610 /* FirebaseDatabaseSwift */,
CB582AF129ABEB3100FAD610 /* FirebaseFirestore */,
CB582AF329ABEB3100FAD610 /* FirebaseFirestoreSwift */,
CB582AF529ABEB3100FAD610 /* FirebaseFunctions */,
CB582AF729ABEB3100FAD610 /* FirebaseFunctionsCombine-Community */,
CB582AF929ABEB3100FAD610 /* FirebaseMessaging */,
CB582AFB29ABEB3100FAD610 /* FirebaseRemoteConfig */,
CB582AFD29ABEB3100FAD610 /* FirebaseRemoteConfigSwift */,
CB582AFF29ABEB3100FAD610 /* FirebaseStorage */,
CB582B0129ABEB3100FAD610 /* FirebaseStorageCombine-Community */,
);
productName = Dialer;
productReference = 82D41FB325D1C1FE00551D22 /* Dialer.app */;
Expand Down Expand Up @@ -1023,10 +1008,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.0;
OTHER_LDFLAGS = (
"-Xlinker",
"-no_warn_duplicate_libraries",
);
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.abc.incs.cedricbahirwe.Dialit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1054,10 +1036,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.0;
OTHER_LDFLAGS = (
"-Xlinker",
"-no_warn_duplicate_libraries",
);
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.abc.incs.cedricbahirwe.Dialit;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1326,10 +1305,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.5.0;
OTHER_LDFLAGS = (
"-Xlinker",
"-no_warn_duplicate_libraries",
);
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.abc.incs.cedricbahirwe.Dialit.dev;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -1487,31 +1463,16 @@
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseDatabase;
};
CB582AEF29ABEB3100FAD610 /* FirebaseDatabaseSwift */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseDatabaseSwift;
};
CB582AF129ABEB3100FAD610 /* FirebaseFirestore */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestore;
};
CB582AF329ABEB3100FAD610 /* FirebaseFirestoreSwift */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFirestoreSwift;
};
CB582AF529ABEB3100FAD610 /* FirebaseFunctions */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseFunctions;
};
CB582AF729ABEB3100FAD610 /* FirebaseFunctionsCombine-Community */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = "FirebaseFunctionsCombine-Community";
};
CB582AF929ABEB3100FAD610 /* FirebaseMessaging */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
Expand All @@ -1522,21 +1483,11 @@
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseRemoteConfig;
};
CB582AFD29ABEB3100FAD610 /* FirebaseRemoteConfigSwift */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseRemoteConfigSwift;
};
CB582AFF29ABEB3100FAD610 /* FirebaseStorage */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = FirebaseStorage;
};
CB582B0129ABEB3100FAD610 /* FirebaseStorageCombine-Community */ = {
isa = XCSwiftPackageProductDependency;
package = CB582AEA29ABEB3100FAD610 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
productName = "FirebaseStorageCombine-Community";
};
/* End XCSwiftPackageProductDependency section */
};
rootObject = 82D41FAB25D1C1FE00551D22 /* Project object */;
Expand Down
2 changes: 1 addition & 1 deletion Dialer/Dialer/Models/DeviceAccount.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Foundation
import FirebaseFirestoreSwift
import FirebaseFirestore

struct DeviceAccount: Codable {
@DocumentID private var id: String?
Expand Down
1 change: 0 additions & 1 deletion Dialer/Dialer/Models/Merchant.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
//

import Foundation
import FirebaseFirestoreSwift
import FirebaseFirestore

struct Merchant: Codable, Identifiable {
Expand Down
2 changes: 1 addition & 1 deletion Dialer/Dialer/Services/Tracker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//

import Foundation
import FirebaseFirestoreSwift
import FirebaseFirestore

protocol AnalyticsEventType {
var stringValue: String { get }
Expand Down
16 changes: 0 additions & 16 deletions Dialer/DialerUITests/DialerUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,18 +32,13 @@ class DialerUITests: XCTestCase {
}

func testHomeComponentDisplay() throws {
// Use XCTAssert and related functions to verify your tests produce the correct results.

let element = app.buttons

debugMe(element)

try testHomeMenuItemsDisplay()

try testDialButtonDisplay()

try testNewDialViewComponents()

}

func testTransferViewMerchantState() throws {
Expand Down Expand Up @@ -99,17 +94,6 @@ class DialerUITests: XCTestCase {
XCTAssertTrue(app.staticTexts["History"].exists)
}

func testNewDialViewComponents() throws {
app.buttons["Quick Dial"].tap()
// Delete button is hidden on first view appearance
XCTAssertFalse(app.buttons["Backspace"].isEnabled)
}

func testDialButtonDisplay() throws {
XCTAssertTrue(app.staticTexts["Quick Dial"].exists)
XCTAssertTrue(app.buttons["Quick Dial"].exists)
}

private func debugMe(_ element: XCUIElementQuery) {
print("Here is:", element.debugDescription, "***")
}
Expand Down