Separate pending travel from confirmed location

Author: web3blind

app/js/i18n/en.js

@@ -447,6 +447,8 @@ var LangEN = {
     map_tax: 'Tax',
     map_travel: 'Travel',
     map_travel_to: 'Travel to',
+    map_pending_travel_to: 'Travel pending confirmation to',
+    map_pending_travel_short: 'Travel pending confirmation',
     map_travel_cost: '1 Mana',
     map_traveled: 'You arrived at',
     map_level_too_low: 'Your level is too low for this region.',

app/js/i18n/ru.js

@@ -447,6 +447,8 @@ var LangRU = {
     map_tax: 'Налог',
     map_travel: 'Путешествовать',
     map_travel_to: 'Путешествовать в',
+    map_pending_travel_to: 'Переход ожидает подтверждения в',
+    map_pending_travel_short: 'Переход ожидает подтверждения',
     map_travel_cost: '1 Мана',
     map_traveled: 'Вы прибыли в',
     map_level_too_low: 'Ваш уровень слишком низок для этого региона.',

app/js/ui/screens/map.js

@@ -34,9 +34,7 @@ var MapScreen = (function() {
         if (pendingTravel && pendingTravel.account === user && pendingTravel.to === confirmedZone) {
             pendingTravel = null;
         }
-        var currentZone = (pendingTravel && pendingTravel.account === user)
-            ? pendingTravel.to
-            : confirmedZone;
+        var currentZone = confirmedZone;
         var myGuild = null;
         if (user && state.guilds) {
             myGuild = GuildSystem.findGuildByMember(state.guilds, user);
@@ -53,6 +51,11 @@ var MapScreen = (function() {
             var curRegion = GameRegions.getRegion(currentZone);
             var curName = curRegion ? curRegion.name : currentZone;
             html += '<p class="map-current-location">' + t('map_current') + ': <strong>' + curName + '</strong></p>';
+            if (pendingTravel && pendingTravel.account === user) {
+                var pendingRegion = GameRegions.getRegion(pendingTravel.to);
+                var pendingName = pendingRegion ? pendingRegion.name : pendingTravel.to;
+                html += '<p class="map-siege-alert" role="status">⏳ ' + t('map_pending_travel_to') + ' <strong>' + pendingName + '</strong></p>';
+            }
         }
 
         // Active sieges summary
@@ -148,7 +151,7 @@ var MapScreen = (function() {
                 html += '\uD83D\uDEB6 ' + t('map_travel') + ' (' + t('map_travel_cost') + ')';
                 html += '</button>';
             } else if (pendingTravel && pendingTravel.account === user && regionId === pendingTravel.to) {
-                html += '<div class="region-benefits">⏳ ' + t('loading') + '</div>';
+                html += '<div class="region-benefits">⏳ ' + t('map_pending_travel_short') + '</div>';
             }
 
             html += '</section>';