Update release branch

KyberNetwork · Jan 9, 2020 · 6254530 · 6254530
1 parent 05b9f1d
commit 6254530
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/KyberNetwork/Info.plist b/KyberNetwork/Info.plist
@@ -136,9 +136,9 @@
 		</array>
 	</dict>
 	<key>FacebookAppID</key>
-	<string>407390806708717</string>
+	<string>2060737157475877</string>
 	<key>FacebookDisplayName</key>
-	<string>DevelopmentKyberSwap</string>
+	<string>KyberSwap</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

diff --git a/KyberNetwork/KyberNetwork/Configurations/Environments/Sources/KNEnvironment.swift b/KyberNetwork/KyberNetwork/Configurations/Environments/Sources/KNEnvironment.swift
@@ -42,7 +42,7 @@ enum KNEnvironment: Int {
   }()
 
   static var `default`: KNEnvironment {
-    return KNAppTracker.externalEnvironment()
+    return .production//KNAppTracker.externalEnvironment()
   }
 
   var isMainnet: Bool {

diff --git a/KyberNetwork/KyberNetwork/Screens/Splash/Controller/KNSplashScreenViewController.swift b/KyberNetwork/KyberNetwork/Screens/Splash/Controller/KNSplashScreenViewController.swift
@@ -13,7 +13,7 @@ class KNSplashScreenViewController: KNBaseViewController {
     super.viewDidLoad()
     self.view.applyGradient(with: UIColor.Kyber.backgroundColors)
     //TODO: Remove in prod build
-    //self.debugInfoView.isHidden = isDebug
+    self.debugInfoView.isHidden = true
     self.versionLabel.text = "Version: \(Bundle.main.versionNumber ?? "")"
     self.networkLabel.text = "Network: \(KNEnvironment.default.displayName)"
     self.splashLogoImageView.image = nil

diff --git a/...work/KyberNetwork/Screens/Wallet/LandingPage/Controller/KNLandingPageViewController.swift b/...work/KyberNetwork/Screens/Wallet/LandingPage/Controller/KNLandingPageViewController.swift
@@ -69,7 +69,7 @@ class KNLandingPageViewController: KNBaseViewController {
     )
     self.termAndConditionButton.setTitleColor(.white, for: .normal)
     self.termAndConditionButton.addTextSpacing()
-    self.debugButton.isHidden = false
+    self.debugButton.isHidden = true
   }
 
   override func viewDidLayoutSubviews() {

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
@@ -34,7 +34,7 @@ platform :ios do
 
   desc "Increase build number"
   lane :increase_build do
-    ensure_git_branch(branch: "develop")
+    ensure_git_branch(branch: "release")
     ensure_git_status_clean
     git_pull
     increment_build_number()
@@ -44,16 +44,16 @@ platform :ios do
     git_commit(path: ["./*.plist", "KyberNetwork.xcodeproj/project.pbxproj"], message: "Increase build number " + build_number + " version " + version_number)
     push_to_git_remote(
       remote: "origin",
-      local_branch: "develop",
-      remote_branch: "develop",
+      local_branch: "release",
+      remote_branch: "release",
       tags: false
     )
 
   end
 
   desc "Increase version and build number"
   lane :increase_version do
-    ensure_git_branch(branch: "develop")
+    ensure_git_branch(branch: "release")
     ensure_git_status_clean
     git_pull
     increment_build_number()
@@ -64,16 +64,16 @@ platform :ios do
     git_commit(path: ["./*.plist", "KyberNetwork.xcodeproj/project.pbxproj"], message: "Increase version and build number " + build_number + " version " + version_number)
     push_to_git_remote(
       remote: "origin",
-      local_branch: "develop",
-      remote_branch: "develop",
+      local_branch: "release",
+      remote_branch: "release",
       tags: false
     )
 
   end
 
   desc "TestFlight deployment to itunes connect"
   lane :beta do
-    ensure_git_branch(branch: "develop")
+    ensure_git_branch(branch: "release")
     ensure_git_status_clean
     git_pull
     cocoapods(use_bundle_exec: false)
@@ -101,15 +101,15 @@ platform :ios do
     git_commit(path: ["./*.plist", "KyberNetwork.xcodeproj/project.pbxproj"], message: "Increase build number " + build_number + " version " + version_number)
     push_to_git_remote(
       remote: "origin",
-      local_branch: "develop",
-      remote_branch: "develop",
+      local_branch: "release",
+      remote_branch: "release",
       tags: false
     )
   end
 
   desc "Upload current build to TestFlight"
   lane :upload_testflight do
-    ensure_git_branch(branch: "develop")
+    ensure_git_branch(branch: "release")
     ensure_git_status_clean
     old_build_number = get_build_number(xcodeproj: "KyberNetwork.xcodeproj")
     notification(subtitle: "Built Successfully!", message: "Start uploading build " + old_build_number + " to TestFlight.")
@@ -124,8 +124,8 @@ platform :ios do
     git_commit(path: ["./*.plist", "KyberNetwork.xcodeproj/project.pbxproj"], message: "Increase build number " + build_number + " version " + version_number)
     push_to_git_remote(
       remote: "origin",
-      local_branch: "develop",
-      remote_branch: "develop",
+      local_branch: "release",
+      remote_branch: "release",
       tags: false
     )
   end