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

🚀[Release v3.5.0] Merge into Develop #54

Merged
merged 18 commits into from
Jun 10, 2021
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
43 changes: 43 additions & 0 deletions .github/workflows/github-actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: Send release email
on:
push:
branches:
- release
jobs:
send_email:
runs-on: ubuntu-latest
name: send_email
steps:
- name: Send email
# You may pin to the exact commit or the version.
# uses: dawidd6/action-send-mail@98b61f505d216dafd844f3bfca5b2972df822dab
uses: dawidd6/[email protected]
with:
# Required mail server address:
server_address: smtp.gmail.com
# Required mail server port:
server_port: 465
# Required mail server username:
username: ${{secrets.MAIL_AGENT_USERNAME}}
# Required mail server password:
password: ${{secrets.MAIL_AGENT_PASSWORD}}
# Required mail subject:
subject: Litewallet iOS Release almost ready
# Required recipients' addresses:
to: ${{secrets.MAIL_ORI}},${{secrets.MAIL_KERRY}}
# Required sender full name (address can be skipped):
from: <[email protected]> # <[email protected]> Litewallet iOS Github Repo
# Optional whether this connection use TLS (default is true if server_port is 465)
secure: true
# Optional plain body:
body: Build job of ${{github.repository}} completed successfully!
# Optional HTML body read from file:
html_body: file://README.html
# Optional carbon copy recipients:
cc: [email protected]
# Optional recipient of the email response:
reply_to: [email protected]
# Optional unsigned/invalid certificates allowance:
ignore_cert: true
# Optional converting Markdown to HTML (set content_type to text/html too):
convert_markdown: true
6 changes: 6 additions & 0 deletions README.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<!DOCTYPE html>
<html>
<body>
<h1>TEST GH Action</h1>
</body>
</html>
24 changes: 12 additions & 12 deletions loafwallet.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -4758,7 +4758,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 7;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ZV7987N2ZC;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
Expand All @@ -4773,7 +4773,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.4.0;
MARKETING_VERSION = 3.5.0;
OTHER_SWIFT_FLAGS = "-DDebug $(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet;
PRODUCT_MODULE_NAME = loafwallet;
Expand Down Expand Up @@ -4866,7 +4866,7 @@
CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 7;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ZV7987N2ZC;
INFOPLIST_FILE = TodayExtension/Info.plist;
Expand All @@ -4876,7 +4876,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.4.0;
MARKETING_VERSION = 3.5.0;
PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -5177,7 +5177,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = ZV7987N2ZC;
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -5191,7 +5191,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.4.0;
MARKETING_VERSION = 3.5.0;
OTHER_SWIFT_FLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet;
PRODUCT_MODULE_NAME = loafwallet;
Expand All @@ -5208,7 +5208,7 @@
CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 7;
DEVELOPMENT_TEAM = ZV7987N2ZC;
INFOPLIST_FILE = TodayExtension/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
Expand All @@ -5217,7 +5217,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.4.0;
MARKETING_VERSION = 3.5.0;
PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -5308,7 +5308,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = loafwallet/loafwallet.entitlements;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 7;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ZV7987N2ZC;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -5322,7 +5322,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 3.4.0;
MARKETING_VERSION = 3.5.0;
OTHER_SWIFT_FLAGS = "-DDebug -DTestnet $(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet;
PRODUCT_MODULE_NAME = loafwallet;
Expand All @@ -5340,7 +5340,7 @@
CODE_SIGN_ENTITLEMENTS = TodayExtension/TodayExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 3;
CURRENT_PROJECT_VERSION = 7;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = ZV7987N2ZC;
INFOPLIST_FILE = TodayExtension/Info.plist;
Expand All @@ -5350,7 +5350,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 3.4.0;
MARKETING_VERSION = 3.5.0;
PRODUCT_BUNDLE_IDENTIFIER = com.litecoin.loafwallet.TodayExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
7 changes: 2 additions & 5 deletions loafwallet/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
applicationController.launch(application: application, window: thisWindow, options: launchOptions)

LWAnalytics.logEventWithParameters(itemName:._20191105_AL)
return true
}

Expand Down Expand Up @@ -99,7 +99,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Load a Firebase debug config file.
let filePath = Bundle.main.path(forResource: "Debug-GoogleService-Info", ofType: "plist")
guard let fileOpts = FirebaseOptions(contentsOfFile: filePath!)
else { assert(false, "Couldn't load Firebase config file") }
else { return assert(false, "Couldn't load Firebase config file") }
FirebaseApp.configure(options: fileOpts)
#endif
}
Expand All @@ -116,6 +116,3 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
}
}
}



1 change: 1 addition & 0 deletions loafwallet/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ The list of changes are below:
* Added Moonpay
---


## Release v3.3.0

This release is the interim to the v2 of the Litecoin Card and fixes mainly bugs.
Expand Down
4 changes: 1 addition & 3 deletions loafwallet/CardViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ class CardViewController: UIViewController {
var notificationToken: NSObjectProtocol?

private func updateLoginStatusFromViewModel() {

// Bugfix:

// Verifies the stack has only one VC and it is the UIHostingController

DispatchQueue.main.async {
if self.childViewControllers.count == 1,
((self.childViewControllers.first?.isKind(of: UIHostingController<AnyView>.self)) != nil) {
Expand Down
5 changes: 2 additions & 3 deletions loafwallet/Color+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ extension Color {
static var liteWalletBlue: Color { //345D9D
return Color(UIColor.liteWalletBlue)
}

static var liteWalletDarkBlue: Color { //163e7f
return Color(UIColor.liteWalletDarkBlue)
}

}
}
2 changes: 1 addition & 1 deletion loafwallet/FailedAlertView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ extension AlertFailureType : Equatable {}

func ==(lhs: AlertFailureType, rhs: AlertFailureType) -> Bool {
switch (lhs, rhs) {
case (.failedResolution, .failedResolution): return true
case (.failedResolution, .failedResolution): return true
}
}
6 changes: 3 additions & 3 deletions loafwallet/MainViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import UIKit
import BRCore
import MachO
import SwiftUI
import SwiftUI

class MainViewController : UIViewController, Subscriber, LoginViewControllerDelegate {

Expand Down Expand Up @@ -139,13 +139,13 @@ class MainViewController : UIViewController, Subscriber, LoginViewControllerDele
exUSAVC.view.alpha = 0
exUSAVC.view.layoutIfNeeded()
})

UIView.animate(withDuration: 0.3, delay: 0.1, options: .transitionCrossDissolve, animations: {
exUSAVC.view.alpha = 1
}) { (finished) in
NSLog("US MainView Controller presented")
}
}
}
}

private func addTemporaryStartupViews() {
Expand Down
5 changes: 2 additions & 3 deletions loafwallet/PartnerData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@
//

import Foundation
import UIKit

import UIKit

enum PartnerName {
case infura
case changeNow
}

struct Partner {

let logo: UIImage
Expand Down
1 change: 1 addition & 0 deletions loafwallet/Storyboards/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
<color key="backgroundColor" systemColor="systemPinkColor"/>
<constraints>
<constraint firstItem="BXb-8k-gBM" firstAttribute="top" secondItem="81g-U6-NOG" secondAttribute="top" constant="4" id="FgY-7a-fho"/>

<constraint firstAttribute="height" constant="60" id="iBk-qu-OG6"/>
<constraint firstItem="zmH-Ee-H6k" firstAttribute="centerY" secondItem="ZHZ-G5-6k8" secondAttribute="centerY" id="ksC-fB-keg"/>
<constraint firstAttribute="trailing" secondItem="zmH-Ee-H6k" secondAttribute="trailing" constant="10" id="vY4-OJ-KBs"/>
Expand Down
2 changes: 1 addition & 1 deletion loafwallet/TabBarViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

import UIKit
import Foundation

class TabBarViewController: UIViewController, Subscriber, Trackable, UITabBarDelegate {

let kInitialChildViewControllerIndex = 0 // TransactionsViewController
Expand Down
1 change: 0 additions & 1 deletion loafwallet/TransactionsViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ class TransactionsViewController: UIViewController, UITableViewDelegate, UITable

self.present(hostingController, animated: true) {


// Notes of bugfix:
// Refactored the class to have two section and make sure the row never extends outside the transaction count.

Expand Down
1 change: 1 addition & 0 deletions loafwallet/UnstoppableDomainView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ struct UnstoppableDomainView: View {

// Description: the minmum domain length is 4 e.g.; 'a.zil'
// Enabling the button when the domain string is at least 4 chars long

shouldDisableLookupButton = currentString.count < 4

})
Expand Down
11 changes: 3 additions & 8 deletions loafwallet/UnstoppableDomainViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ class UnstoppableDomainViewModel: ObservableObject {

//MARK: - Public Variables
var didResolveUDAddress: ((String) -> Void)?

var shouldClearAddressField: (() -> Void)?

var didFailToResolve: ((String) -> Void)?

//MARK: - Private Variables
private var ltcAddress = ""

private var dateFormatter: DateFormatter? {

didSet {
Expand Down Expand Up @@ -99,7 +98,7 @@ class UnstoppableDomainViewModel: ObservableObject {
self.didResolveUDAddress?(self.ltcAddress)
self.isDomainResolving = false
}
case .failure(let error):
print(error)
let errorMessage = DomainResolutionFailure().messageWith(error: error)
Expand All @@ -117,7 +116,6 @@ class UnstoppableDomainViewModel: ObservableObject {
execute: {

self.didFailToResolve?(error.localizedDescription)

self.didFailToResolve?(errorMessage)
self.isDomainResolving = false

Expand All @@ -127,7 +125,4 @@ class UnstoppableDomainViewModel: ObservableObject {
}
group.wait()
}

}


7 changes: 3 additions & 4 deletions loafwallet/src/Constants/Constants.swift
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,16 @@ enum CustomEvent: String {
case _20201121_DRIA = "DID_RESOLVE_IPFS_ADDRESS"

/// Failed to resolve IPFS Address
case _20201121_FRIA = "FAILED_RESOLVE_IPFS_ADDRESS"
case _20201121_FRIA = "FAILED_RESOLVE_IPFS_ADDRESS"
/// User tapped balance
case _20200207_DTHB = "DID_TAP_HEADER_BALANCE"

/// Ternio API Wallet details failure
case _20210405_TAWDF = "TERNIO_API_WALLET_DETAILS_FAILURE"

/// Heartbeat check If event even happens
case _20210427_HCIEEH = "HEARTBEAT_CHECK_IF_EVENT_EVEN_HAPPENS"

case _20210427_HCIEEH = "HEARTBEAT_CHECK_IF_EVENT_EVEN_HAPPENS"
}

struct FoundationSupport {
Expand Down
Loading