From e36c8c3ead17d03bfd568a7d95985c617b1fa17f Mon Sep 17 00:00:00 2001
From: Kevin G Christiano <kevin.christiano@verizonwireless.com>
Date: Wed, 8 Jul 2020 17:14:52 -0400
Subject: [PATCH] changes made

---
 .../Order Tracker/OrderTracker.swift                         | 4 ++--
 .../VerticalCombinationViews/Order Tracker/Step.swift        | 5 +++--
 .../VerticalCombinationViews/Order Tracker/StepModel.swift   | 5 +----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift
index 9b5dcb7c..716a3968 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift	
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/OrderTracker.swift	
@@ -89,7 +89,7 @@ open class OrderTracker: View {
         context.setLineWidth(1)
         let firstRect = convert(firstStep.stateImage.frame, from: firstStep.stateImage)
         let imageDimension = firstStep.stateImage.bounds.height
-        let startPoint = CGPoint(x: imageDimension / 2, y: firstRect.size.height - 1)
+        let startPoint = CGPoint(x: imageDimension / 2, y: firstRect.size.height - imageDimension / 2)
         context.move(to: startPoint)
         
         var lineColor = (firstStep.state?.color() ?? .mvmCoolGray3).cgColor
@@ -98,7 +98,7 @@ open class OrderTracker: View {
             
             context.setStrokeColor(lineColor)
             let relativeOrigin = convert(step.stateImage.frame, from: step.stateImage)
-            let point = CGPoint(x: imageDimension / 2, y: relativeOrigin.origin.y + 1)
+            let point = CGPoint(x: imageDimension / 2, y: relativeOrigin.origin.y + imageDimension / 2)
             
             context.addLine(to: point)
             context.strokePath()
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift
index 3f6db73b..0304129d 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift	
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/Step.swift	
@@ -49,7 +49,8 @@ open class Step: View {
         addSubview(bodyTop)
         addSubview(bodyBottom)
         
-        stateImage.contentMode = .scaleToFill
+        stateImage.contentMode = .scaleAspectFit
+        stateImage.layer.backgroundColor = UIColor.white.cgColor
         stateImage.topAnchor.constraint(equalTo: topAnchor).isActive = true
         stateImage.leadingAnchor.constraint(equalTo: leadingAnchor).isActive = true
         stateImage.heightAnchor.constraint(equalToConstant: 18).isActive = true
@@ -57,7 +58,7 @@ open class Step: View {
         imageBottomConstraint = bottomAnchor.constraint(greaterThanOrEqualTo: stateImage.bottomAnchor, constant: Padding.Ten)
         imageBottomConstraint?.isActive = true
         
-        headline.topAnchor.constraint(equalTo: topAnchor).isActive = true
+        headline.topAnchor.constraint(equalTo: topAnchor, constant: 2).isActive = true
         headline.leadingAnchor.constraint(equalTo: stateImage.trailingAnchor, constant: Padding.Four).isActive = true
         trailingAnchor.constraint(equalTo: headline.trailingAnchor).isActive = true
         
diff --git a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/StepModel.swift b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/StepModel.swift
index 3af0f49d..915e860a 100644
--- a/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/StepModel.swift	
+++ b/MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/Order Tracker/StepModel.swift	
@@ -51,10 +51,7 @@ open class StepModel: MoleculeModelProtocol {
             case .complete:
                 return .mvmGreen
                 
-            case .incomplete:
-                return .mvmOrangeAA
-                
-            case .invalid:
+            case .incomplete,.invalid:
                 return .mvmCoolGray3
             }
         }