From cafd18a5ec195a1c9bb8034e1728bb74036fe025 Mon Sep 17 00:00:00 2001
From: Berkeley Martinez <Berkeley@robotie.com>
Date: Sat, 18 Jul 2015 23:12:38 -0700
Subject: [PATCH] return currentHike on load

---
 common/app/routes/Hikes/flux/Actions.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/app/routes/Hikes/flux/Actions.js b/common/app/routes/Hikes/flux/Actions.js
index 4c85a4d1f0..1aefca9fca 100644
--- a/common/app/routes/Hikes/flux/Actions.js
+++ b/common/app/routes/Hikes/flux/Actions.js
@@ -10,9 +10,14 @@ const service = new Fetchr({
 
 function getCurrentHike(hikes =[{}], dashedName, currentHike) {
   if (!dashedName) {
+    debug('no dashedName');
     return hikes[0];
   }
+
   const filterRegex = new RegExp(dashedName, 'i');
+  if (currentHike && filterRegex.test(currentHike.dashedName)) {
+    return currentHike;
+  }
 
   return hikes
     .filter(({ dashedName }) => {
@@ -37,11 +42,11 @@ export default Actions({
         if (isPrimed) {
           return instance.setHikes({
             transform: (oldState) => {
-              const { hikes, currentContext } = oldState;
+              const { hikes } = oldState;
               const currentHike = getCurrentHike(
                 hikes,
                 dashedName,
-                currentContext
+                oldState.currentHike
               );
               return assign({}, oldState, { currentHike });
             }