Fix little bugs and mark version 0.7

vergecurrency · Oct 7, 2018 · 47af551 · 47af551
1 parent 15802d9
commit 47af551
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 <p align="center">
   <a href="https://travis-ci.org/vergecurrency/vIOS" target="_blank"><img src="https://travis-ci.org/vergecurrency/vIOS.svg?branch=master"></a>
   <img src="https://img.shields.io/badge/status-development-red.svg">
-  <img src="https://img.shields.io/badge/latest build-0.6-lightgrey.svg">
+  <img src="https://img.shields.io/badge/latest build-0.7-lightgrey.svg">
   <img src="https://img.shields.io/badge/iOS-^11.4-green.svg">
   <img src="https://img.shields.io/badge/license-MIT-blue.svg">
 </p>

diff --git a/VergeiOS/Http/TorClient.swift b/VergeiOS/Http/TorClient.swift
@@ -84,7 +84,7 @@ class TorClient {
             // Make sure the controller connects.
             var interval: Timer!
             interval = setInterval(4) {
-                if !self.controller.isConnected {
+                if !self.controller.isConnected || !self.isOperational {
                     print("Retry tor controller connection")
                     self.connectController(completion: completion)
                 } else {

diff --git a/VergeiOS/Info.plist b/VergeiOS/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6</string>
+	<string>0.7</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.6</string>
+	<string>0.7</string>
 	<key>LSApplicationCategoryType</key>
 	<string></string>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/VergeiOS/Storyboards/Settings.storyboard b/VergeiOS/Storyboards/Settings.storyboard
@@ -370,7 +370,7 @@
                             <tableViewSection headerTitle="Use for" id="vvU-1b-nGZ">
                                 <string key="footerTitle">Instead of having the need of filling in your wallet PIN a prompt will provide you with the alternative way of authenticating yourself.</string>
                                 <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="IS2-8P-mFv" style="IBUITableViewCellStyleDefault" id="e9W-Ob-cpX">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" textLabel="IS2-8P-mFv" style="IBUITableViewCellStyleDefault" id="e9W-Ob-cpX">
                                         <rect key="frame" x="0.0" y="175.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="e9W-Ob-cpX" id="cbn-YP-Z25">
@@ -398,7 +398,7 @@
                                             <outlet property="accessoryView" destination="4P0-42-mbz" id="lFG-kQ-qSn"/>
                                         </connections>
                                     </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" textLabel="XOT-jY-PyN" style="IBUITableViewCellStyleDefault" id="k8t-uB-UsW">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" textLabel="XOT-jY-PyN" style="IBUITableViewCellStyleDefault" id="k8t-uB-UsW">
                                         <rect key="frame" x="0.0" y="219.5" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="k8t-uB-UsW" id="df5-3C-aNR">

diff --git a/VergeiOS/Views/Send/SendViewController.swift b/VergeiOS/Views/Send/SendViewController.swift
@@ -118,6 +118,10 @@ class SendViewController: UIViewController {
         // Change the text color of the amount label when the selected amount is
         // more then the wallet amount.
         DispatchQueue.main.async {
+            if self.walletAmount.doubleValue == 0.0 {
+                return
+            }
+
             if (self.currentAmount().doubleValue >= self.walletAmount.doubleValue) {
                 self.amountTextField.valueLabel?.textColor = UIColor.vergeRed()
 

diff --git a/VergeiOS/Views/Settings/CreditsTableViewController.swift b/VergeiOS/Views/Settings/CreditsTableViewController.swift
@@ -38,6 +38,10 @@ class CreditsTableViewController: EdgedTableViewController {
             "name": "Swen",
             "twitter": "SwenVanZanten"
         ],
+        [
+            "name": "Vadim",
+            "twitter": "grevcev_vadim"
+        ],
     ]
 
     var translators = [

diff --git a/VergeiOS/Views/Wallet/WalletSlides/TransactionsWalletSlideView.swift b/VergeiOS/Views/Wallet/WalletSlides/TransactionsWalletSlideView.swift
@@ -12,7 +12,6 @@ import HGPlaceholders
 class TransactionsWalletSlideView: WalletSlideView, UITableViewDataSource, UITableViewDelegate {
 
     @IBOutlet weak var tableView: TableView!
-    @IBOutlet weak var allTransactionsLabel: UILabel!
 
     let addressBookManager = AddressBookManager()
     var items: [Transaction] = []
@@ -22,12 +21,7 @@ class TransactionsWalletSlideView: WalletSlideView, UITableViewDataSource, UITab
 
         installTableViewPlaceholder()
         getTransactions()
-
-        let allTransactionsLabel = UIButton(type: .system)
-        allTransactionsLabel.frame = CGRect(x: 0, y: 0, width: tableView.frame.size.width, height: 30)
-        allTransactionsLabel.setTitle("Show all transactions", for: .normal)
-        allTransactionsLabel.titleLabel?.font = UIFont.avenir(size: 15).demiBold()
-        tableView.tableFooterView = allTransactionsLabel
+
         tableView.layer.cornerRadius = 5.0
         tableView.clipsToBounds = true
     }