From afc71a5ac5090487961273f678a02b7363555cf8 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Thu, 25 Jan 2018 12:17:34 -0800
Subject: [PATCH] Fix Purchases sorting (again); Fix (i) icon loading

---
 .../hifi/commerce/common/SortableListModel.qml   | 16 +++++++++-------
 .../qml/hifi/commerce/purchases/Purchases.qml    |  8 ++++++--
 .../src/ui/overlays/ContextOverlayInterface.cpp  |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/interface/resources/qml/hifi/commerce/common/SortableListModel.qml b/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
index 0951d25950..cfdd4abe04 100644
--- a/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
+++ b/interface/resources/qml/hifi/commerce/common/SortableListModel.qml
@@ -22,7 +22,7 @@ ListModel {
     function swap(a, b) {
         if (a < b) {
             move(a, b, 1);
-            move (b - 1, a, 1);
+            move(b - 1, a, 1);
         } else if (a > b) {
             move(b, a, 1);
             move(a - 1, b, 1);
@@ -34,16 +34,17 @@ ListModel {
             var piv = get(pivot)[sortColumnName];
             swap(pivot, end - 1);
             var store = begin;
+            var i;
 
-            for (var i = begin; i < end - 1; ++i) {
+            for (i = begin; i < end - 1; ++i) {
                 var currentElement = get(i)[sortColumnName];
                 if (isSortingDescending) {
-                    if (currentElement < piv) {
+                    if (currentElement > piv) {
                         swap(store, i);
                         ++store;
                     }
                 } else {
-                    if (currentElement > piv) {
+                    if (currentElement < piv) {
                         swap(store, i);
                         ++store;
                     }
@@ -56,16 +57,17 @@ ListModel {
             var piv = get(pivot)[sortColumnName].toLowerCase();
             swap(pivot, end - 1);
             var store = begin;
+            var i;
 
-            for (var i = begin; i < end - 1; ++i) {
+            for (i = begin; i < end - 1; ++i) {
                 var currentElement = get(i)[sortColumnName].toLowerCase();
                 if (isSortingDescending) {
-                    if (currentElement < piv) {
+                    if (currentElement > piv) {
                         swap(store, i);
                         ++store;
                     }
                 } else {
-                    if (currentElement > piv) {
+                    if (currentElement < piv) {
                         swap(store, i);
                         ++store;
                     }
diff --git a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
index a9961dc17e..2743677683 100644
--- a/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
+++ b/interface/resources/qml/hifi/commerce/purchases/Purchases.qml
@@ -317,6 +317,7 @@ Rectangle {
 
             HifiControlsUit.TextField {
                 id: filterBar;
+                property string previousText: "";
                 colorScheme: hifi.colorSchemes.faintGray;
                 hasClearButton: true;
                 hasRoundedBorder: true;
@@ -329,6 +330,8 @@ Rectangle {
 
                 onTextChanged: {
                     buildFilteredPurchasesModel();
+                    purchasesContentsList.positionViewAtIndex(0, ListView.Beginning)
+                    filterBar.previousText = filterBar.text;
                 }
 
                 onAccepted: {
@@ -647,7 +650,8 @@ Rectangle {
 
     function sortByDate() {
         filteredPurchasesModel.sortColumnName = "purchase_date";
-        filteredPurchasesModel.isSortingDescending = false;
+        filteredPurchasesModel.isSortingDescending = true;
+        filteredPurchasesModel.valuesAreNumerical = true;
         filteredPurchasesModel.quickSort();
     }
 
@@ -677,7 +681,7 @@ Rectangle {
             }
         }
 
-        if (sameItemCount !== tempPurchasesModel.count || filterBar.text !== "") {
+        if (sameItemCount !== tempPurchasesModel.count || filterBar.text !== filterBar.previousText) {
             filteredPurchasesModel.clear();
             for (var i = 0; i < tempPurchasesModel.count; i++) {
                 filteredPurchasesModel.append(tempPurchasesModel.get(i));
diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp
index d690880f99..58a77883d8 100644
--- a/interface/src/ui/overlays/ContextOverlayInterface.cpp
+++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp
@@ -168,8 +168,8 @@ bool ContextOverlayInterface::createOrDestroyContextOverlay(const EntityItemID&
                 _contextOverlay->setColorPulse(CONTEXT_OVERLAY_UNHOVERED_COLORPULSE);
                 _contextOverlay->setIgnoreRayIntersection(false);
                 _contextOverlay->setDrawInFront(true);
-                _contextOverlay->setURL(PathUtils::resourcesPath() + "images/inspect-icon.png");
                 _contextOverlay->setIsFacingAvatar(true);
+                _contextOverlay->setURL(PathUtils::resourcesUrl() + "images/inspect-icon.png");
                 _contextOverlayID = qApp->getOverlays().addOverlay(_contextOverlay);
             }
             _contextOverlay->setWorldPosition(contextOverlayPosition);