🚀[Release v3.10.1] Merge into Main (#160)

* 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * Create sync-mirror.yml * Changed the clone sig * Update sync-mirror.yml - added sync branches and tags * Update sync-mirror.yml refactor * Update sync-mirror.yml fixed uname * Update sync-mirror.yml * Update sync-mirror.yml * Create PubtoPrivate.yml * Update sync-mirror.yml * 🚀[Release v3.10.0] Merge into Develop (#135) * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * build bump * build bump again * Clean up background * build bump * 🚧[Techdebt] Firebase polish 121 (#139) * 🚀[Release v3.10.0] Merge into Main (#136) * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * build bump * build bump again * Clean up background * build bump * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * Create sync-mirror.yml * Changed the clone sig * Update sync-mirror.yml - added sync branches and tags * Update sync-mirror.yml refactor * Update sync-mirror.yml fixed uname * Update sync-mirror.yml * Update sync-mirror.yml * Create PubtoPrivate.yml * Update sync-mirror.yml * 🚀[Release v3.10.0] Merge into Develop (#135) * 🦺[Techdebt] fix firebase (#115) * Update firebase config auto clean up strings - version bump - Commented out debug FB file * Checked the version is sending FB data - bump build number * 🥳[Techdebt] relayout address view controller (#120) * Successfully placed in UIHosting Address Updated the strings file * Added event * added delay - used for animating U Domain * Added function of subviews in SendViewController Layout is updated * Adding the function to the send Cleaned up and wired up Cells - UD View/Model - Send Address View/Model Reset the amount Label in SendViewController * Refactored SendButton - Using UIHostingViewController * Successfully send LTC -WIP: fix white space * Refactored the layout of the send button * buiid bump (#125) * [Techdebt] ci cd refactor (#132) * Removed flaky tests * build bump * build bump * removed unused file - build bump * build bump * fixed scan QR (#130) * fixed scan QR * update gitignore * Feature/add bitrefill new (#134) * Added llocalView - added bitrefill - basic function is available - build bump * bump * added basic web widget * updated logo * build bump * changed the Bitrefill link - build bump * pre-bump version - to get a binary to TestFlight * build bump * build bump again * Clean up background * build bump * build bump -clean up strings file - Udpated to iOS 14.0 as a target https://www.statista.com/statistics/1118925/mobile-apple-ios-version-share-worldwide/ * Removed cruft * Updated the Firebase constants - changed it to lowercase * updated links * fixed constants -build bump * reemvoed conflict tags * Mark unused code (#147) * Added and modified a ruby script that shows a warining if a class, function or variable is not used * Fixed static function partnersDataArray * Updated build number * changed the urtl - change the deployment target * removed staging server url normalizing to the prod server only * aded small test - build bump * Retired old https server code (#154) * #148 Fixed a crash that appeared when the users wallet was aout of sync and a prompt neaded to appear * Removed dispatchqueue.async that was used for testing * build bump Co-authored-by: Iferencak <[email protected]>
litecoin-foundation · Nov 27, 2022 · deebdbe · deebdbe
1 parent c0eec99
commit deebdbe
Show file tree

Hide file tree

Showing 25 changed files with 413 additions and 3,028 deletions.
diff --git a/.github/workflows/PubtoPrivate.yml b/.github/workflows/PubtoPrivate.yml
@@ -0,0 +1,39 @@
+name: Sync Pub with Private (Mirror)
+
+on:
+  workflow_dispatch:
+  schedule:
+  - cron: "0 23 * * *"
+
+jobs:
+  sync:
+   runs-on: ubuntu-latest
+
+   steps: 
+    - name: Sync Fork with Upstream
+	  # You may pin to the exact commit or the version.
+	  uses: yesolutions/[email protected]
+	  on: [push]
+	  with:
+	    # The remote ref name to use. 'mirror' by default. Useful to avoid conflicts with existing remotes.
+	    REMOTE_NAME: ci-cd-litewallet-ios
+	    # The remote repository e.g. https://github.com/octocat/foo.git or [email protected]:octocat/foo.git
+	    REMOTE: https://github.com/litecoin-foundation/ci-cd-litewallet-ios.git
+	    # Username for remote repository
+	    GIT_USERNAME: kcw-grunt
+	    # The git https password or token for the remote repository
+	    GIT_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
+	    # The ssh private key for writing to the remote repository, if using ssh
+	    GIT_SSH_PRIVATE_KEY: # optional
+	    # The ssh public key for writing to the remote repository. Normally, not required at all
+	    GIT_SSH_PUBLIC_KEY: # optional
+	    # The contents of a SSH known_hosts file for host key verification
+	    GIT_SSH_KNOWN_HOSTS: # optional
+	    # if true, skips host key verification. Mutually exclusive with GIT_SSH_KNOWN_HOSTS
+	    GIT_SSH_NO_VERIFY_HOST: # optional, default is false
+	    # Push all refs instead of just the current branch
+	    PUSH_ALL_REFS: # optional, default is true
+	    # The arugments to use when pushing the repository
+	    GIT_PUSH_ARGS: # optional, default is --tags --force --prune
+	    # set to "true" to enable debug mode
+	    DEBUG: # optional, default is false
diff --git a/.github/workflows/sync-mirror.yml b/.github/workflows/sync-mirror.yml
@@ -0,0 +1,24 @@
+on: push
+jobs:
+  git-sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: git-sync-ci-cd
+        uses: wei/git-sync@v3
+        with:
+
+          # Private Keys
+          ssh_private_key: ${{ secrets.GITHUB_TOKEN }} # optional
+          source_ssh_private_key: ${{ secrets.GITHUB_TOKEN }} # optional, will override `SSH_PRIVATE_KEY`
+          destination_ssh_private_key: ${{ secrets.GITHUB_TOKEN }} # optional, will override `SSH_PRIVATE_KEY`
+
+
+
+          source_repo: "https://kcw-grunt:[email protected]/litecoin-foundation/litewallet-ios.git"  
+          destination_repo: "https://kcw-grunt:[email protected]/litecoin-foundation/ci-cd-litewallet-ios.git"
+
+
+          source_branch: "refs/remotes/source/*"
+          destination_branch: "refs/heads/*"
+
+
diff --git a/TodayExtension/BRTodayViewController.m b/TodayExtension/BRTodayViewController.m
@@ -47,14 +47,7 @@ @interface BRTodayViewController () <NCWidgetProviding>
 @implementation BRTodayViewController
 - (void)viewDidLoad
 {
-    [super viewDidLoad];
-   //TODO: TO REFACTOR TO SWIFT to add Firebase event test points
-   // Mixpanel.mainInstance().track(event: K.MixpanelEvents._20191105_VSC.rawValue)
-   // Mixpanel *mixpanel = [Mixpanel sharedInstance];
-   // [mixpanel track:@"Plan selected"
-   // properties:@{ @"Plan": @"Premium" }];
-   // Mixpanel
-   //  _ = LWAnalytics.init(itemName: ._20191105_VSC, properties: nil)
+    [super viewDidLoad]; 
 
     if ([[self.extensionContext class] instancesRespondToSelector:@selector(widgetLargestAvailableDisplayMode)]) {
         self.extensionContext.widgetLargestAvailableDisplayMode = NCWidgetDisplayModeExpanded;

diff --git a/loafwallet.xcodeproj/project.pbxproj b/loafwallet.xcodeproj/project.pbxproj
diff --git a/loafwallet.xcworkspace/xcshareddata/swiftpm/Package.resolved b/loafwallet.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/loafwallet/BuyTableViewController.swift b/loafwallet/BuyTableViewController.swift
@@ -111,6 +111,8 @@ class BuyTableViewController: UITableViewController, SFSafariViewControllerDeleg
         simplexCurrencySegmentedControl.setTitleTextAttributes([NSAttributedString.Key.foregroundColor : UIColor.liteWalletBlue], for: .selected)
 
         setupWkVCData()
+
+        LWAnalytics.logEventWithParameters(itemName: ._20191105_DTBT)
     }
 
     private func setupWkVCData() { 

diff --git a/loafwallet/PartnerData.swift b/loafwallet/PartnerData.swift
@@ -27,9 +27,8 @@ struct Partner {
         let bitrefill = Partner(logo: UIImage(named: "bitrefillLogo")!, headerTitle: S.BuyCenter.Cells.bitrefillTitle, details: S.BuyCenter.Cells.bitrefillFinancialDetails)
         let moonpay = Partner(logo: UIImage(named: "moonpay-logo")!, headerTitle: S.BuyCenter.Cells.moonpayTitle, details: S.BuyCenter.Cells.moonpayFinancialDetails)
         let simplex = Partner(logo: UIImage(named: "simplexLogo")!, headerTitle: S.BuyCenter.Cells.simplexTitle, details: S.BuyCenter.Cells.simplexFinancialDetails)
+
         return [bitrefill, moonpay, simplex]
-    }
-
-
+    } 
 }
 
diff --git a/loafwallet/SupportSafariView.swift b/loafwallet/SupportSafariView.swift
diff --git a/loafwallet/TransactionsViewController.swift b/loafwallet/TransactionsViewController.swift
@@ -44,7 +44,7 @@ class TransactionsViewController: UIViewController, UITableViewDelegate, UITable
         didSet {
             if currentPromptType != nil && oldValue == nil {
                 tableView.beginUpdates()
-                tableView.insertSections(IndexSet(integer: 0), with: .automatic)
+                tableView.reloadSections(IndexSet(integer: 0), with: .automatic)
                 tableView.endUpdates()
             }
         }

diff --git a/loafwallet/src/Constants/Constants.swift b/loafwallet/src/Constants/Constants.swift
@@ -47,130 +47,117 @@ enum WalletType: String {
 /// Custom Event Enum: Events related to different user based actions
 enum CustomEvent: String {
     /// App Launched
-    case _20191105_AL = "APP_LAUNCHED"
+    case _20191105_AL = "app_launched"
+
+    /// Visit Receive Controller
+    case _20202116_VRC = "visited_received_controller"
 
-    /// App Visit Send Controller
-    case _20191105_VSC = "VISIT_SEND_CONTROLLER"
+    /// Visit Send Controller
+    case _20191105_VSC = "visited_send_controller"
 
-    /// Visit Receive Controller
-    case _20202116_VRC = "VISIT_RECEIVE_CONTROLLER"
+    /// Did Tap Buy Tab Controller
+    case _20191105_DTBT = "did_tap_buy_tab"
 
     /// Did Send LTC
-    case _20191105_DSL = "DID_SEND_LTC"
+    case _20191105_DSL = "did_send_ltc"
 
-    /// Updated LTC price
-    case _20191105_DULP = "DID_UPDATE_LTC_PRICE"
-
-    /// User tapped Buy tab
-    case _20191105_DTBT = "DID_TAP_BUY_TAB"
+    /// Did Tap Support
+    case _20201118_DTS = "did_tap_support"
 
     /// Entered dispatch group
-    case _20200111_DEDG = "DID_ENTER_DISPATCH_GROUP"
-    
+    case _20200111_DEDG = "did_enter_dispatch_group"
+
     /// Left dispatch group
-    case _20200111_DLDG = "DID_LEAVE_DISPATCH_GROUP"
-    
+    case _20200111_DLDG = "did_leave_dispatch_group"
+
     /// Rate not initialized
-    case _20200111_RNI = "RATE_NOT_INITIALIZED"
+    case _20200111_RNI = "rate_not_initialized"
 
     /// Fee per kb not initialized
-    case _20200111_FNI = "FEEPERKB_NOT_INITIALIZED"
+    case _20200111_FNI = "feeperkb_not_initialized"
 
     /// Transaction not initialized
-    case _20200111_TNI = "TRANSACTION_NOT_INITIALIZED"
+    case _20200111_TNI = "transaction_not_initialized"
 
     /// Wallet not initialized
-    case _20200111_WNI = "WALLET_NOT_INITIALIZED"
+    case _20200111_WNI = "wallet_not_initialized"
 
     /// Phrase not initialized
-    case _20200111_PNI = "PHRASE_NOT_INITIALIZED"
+    case _20200111_PNI = "phrase_not_initialized"
 
     /// Unable to sign transaction
-    case _20200111_UTST = "UNABLE_TO_SIGN_TRANSACTION"
-    
+    case _20200111_UTST = "unable_to_sign_transaction"
+
     /// Generalized Error
-    case _20200112_ERR = "ERROR"
+    case _20200112_ERR = "error"
 
     /// Keychain Lookup
-    case _20210804_ERR_KLF = "ERROR_KEY_LOOKUP_FAILURE"
+    case _20210804_ERR_KLF = "error_key_lookup_failure"
 
     /// Started resync
-    case _20200112_DSR = "DID_START_RESYNC"
+    case _20200112_DSR = "did_start_resync"
 
     /// Showed review request
-    case _20200125_DSRR = "DID_SHOW_REVIEW_REQUEST"
-    
+    case _20200125_DSRR = "did_show_review_request"
+
     /// Unlocked in with PIN
-    case _20200217_DUWP = "DID_UNLOCK_WITH_PIN"
-
+    case _20200217_DUWP = "did_unlock_with_pin"
+     
     /// App Launched
-    case _20200217_DUWB = "DID_UNLOCK_WITH_BIOMETRICS"
-
-    /// Did donate
-    case _20200223_DD = "DID_DONATE"
-
-    /// Did cancel donation
-    case _20200225_DCD = "DID_CANCEL_DONATE"
+    case _20200217_DUWB = "did_unlock_with_biometrics"
 
     /// Did use default fee per kb
-    case _20200301_DUDFPK = "DID_USE_DEFAULT_FEE_PER_KB"
-    
+    case _20200301_DUDFPK = "did_use_default_fee_per_kb"
+
     /// User tapped support LF
-    case _20201118_DTS = "DID_TAP_SUPPORT_LF"
+    case _20201118_DTGS = "did_tap_get_support"
 
     /// Started IFPS Lookup
-    case _20201121_SIL = "STARTED_IFPS_LOOKUP"
+    case _20201121_SIL = "started_IFPS_lookup"
 
     /// Resolved IPFS Address
-    case _20201121_DRIA = "DID_RESOLVE_IPFS_ADDRESS"
+    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"
+    case _20200207_DTHB = "did_tap_header_balance"
 
     /// Ternio API Wallet details failure
-    case _20210405_TAWDF = "TERNIO_API_WALLET_DETAILS_FAILURE"
-      
+    case _20210405_TAWDF = "ternio_api_wallet_details_failure"
+
     /// Ternio API Authenticate Enable 2FA change
-    case _20210804_TAA2FAC = "TERNIO_API_AUTH_2FA_CHANGE"
+    case _20210804_TAA2FAC = "ternio_API_auth_2FA_change"
 
     /// Ternio API Wallet details success
-    case _20210804_TAWDS = "TERNIO_API_WALLET_DETAILS_SUCCESS"
+    case _20210804_TAWDS = "ternio_API_wallet_details_success"
 
     /// Ternio API Login
-    case _20210804_TAULI = "TERNIO_API_USER_LOG_IN"
+    case _20210804_TAULI = "ternio_API_user_log_in"
 
     /// Ternio API Logout
-    case _20210804_TAULO = "TERNIO_API_USER_LOG_OUT"
-
-    /// Ternio API withdrawal to Litewallet
-    case _20210804_TAWTL = "TERNIO_API_WITHDRAWAL_TO_LITEWALLET"
-
+    case _20210804_TAULO = "ternio_API_user_log_out"
+
     /// Heartbeat check If event even happens
-    case _20210427_HCIEEH = "HEARTBEAT_CHECK_IF_EVENT_EVEN_HAPPENS"
+    case _20210427_HCIEEH = "heartbeat_check_if_event_even_happens"
 
     /// User Tapped on  UD Image
-    case _20220822_UTOU = "USER_TAPPED_ON_UD"
+    case _20220822_UTOU = "user_tapped_on_ud"
+
 }
 
 struct FoundationSupport {
 
-    static let url = URL(string: "https://lite-wallet.org/support_address.html")!
+    static let dashboard = "https://litecoinfoundation.zendesk.com/"
 
     /// Litecoin Foundation main donation address: MVZj7gBRwcVpa9AAWdJm8A3HqTst112eJe
     /// As of Nov 14th, 2020
-    static let supportLTCAddress = "MVZj7gBRwcVpa9AAWdJm8A3HqTst112eJe"
+    static let donationLTCAddress = "MVZj7gBRwcVpa9AAWdJm8A3HqTst112eJe"
 } 
 
 struct APIServer {
-
-    #if DEBUG
-    static let baseUrl = "https://api-stage.lite-wallet.org/"
-    #else
     static let baseUrl = "https://api-prod.lite-wallet.org/"
-    #endif
 } 
 
 struct Padding {

diff --git a/loafwallet/src/ModalPresenter.swift b/loafwallet/src/ModalPresenter.swift
@@ -363,10 +363,12 @@ class ModalPresenter : Subscriber, Trackable {
         menu.didTapSupport = { [weak self, weak menu] in
             menu?.dismiss(animated: true, completion: {
 
-                let urlString = "https://support.litewallet.io"
+                let urlString = FoundationSupport.dashboard
 
                 guard let url = URL(string: urlString) else { return }
 
+                LWAnalytics.logEventWithParameters(itemName: ._20201118_DTS)
+
                 let vc = SFSafariViewController(url: url)
                 self?.topViewController?.present(vc, animated: true, completion: nil)
             })