Merge pull request #5223 from HSLdevcom/navifixes6

DT-6613, DT-6661 transfer cards, stable alerts and and misc fixes

Author: Antiik91

app/component/itinerary/MobileTicketPurchaseInformation.js

@@ -3,7 +3,7 @@ import React from 'react';
 import { intlShape, FormattedMessage } from 'react-intl';
 import { configShape, fareShape } from '../../util/shapes';
 import { renderZoneTicket } from './ZoneTicket';
-import { getAlternativeFares } from '../../util/fareUtils';
+import { getAlternativeFares, formatFare } from '../../util/fareUtils';
 import { addAnalyticsEvent } from '../../util/analyticsUtils';
 
 export default function MobileTicketPurchaseInformation(
@@ -20,9 +20,7 @@ export default function MobileTicketPurchaseInformation(
     config.availableTickets,
   );
   const price =
-    config.showTicketPrice && fare.price > 0
-      ? `${fare.price.toFixed(2)} €`.replace('.', ',')
-      : '';
+    config.showTicketPrice && fare.price > 0 ? formatFare(fare) : '';
 
   const faresInfo = () => {
     const header = `${intl.formatMessage({

app/component/itinerary/TicketInformation.js

@@ -6,7 +6,7 @@ import { v4 as uuid } from 'uuid';
 import { configShape, fareShape, legShape } from '../../util/shapes';
 import { renderZoneTicket } from './ZoneTicket';
 import Icon from '../Icon';
-import { getAlternativeFares } from '../../util/fareUtils';
+import { getAlternativeFares, formatFare } from '../../util/fareUtils';
 
 export default function TicketInformation(
   { fares, zones, legs },
@@ -66,9 +66,7 @@ export default function TicketInformation(
                     : fare.ticketName}
                 </div>
                 {config.showTicketPrice && (
-                  <div className="ticket-description">
-                    {`${fare.price.toFixed(2)} €`}
-                  </div>
+                  <div className="ticket-description">{formatFare(fare)}</div>
                 )}
                 <Icon img="icon-icon_arrow-collapse--right" />
               </a>

app/component/itinerary/navigator/NaviCardContainer.js

@@ -132,7 +132,11 @@ function NaviCardContainer(
       ),
     );
 
-    if (match.location.query?.debug !== undefined && position) {
+    if (
+      match.location.query?.debug !== undefined &&
+      position &&
+      !messages.get('debug')?.closed
+    ) {
       const info1 = `lat: ${position.lat} lon: ${position.lon}`;
       const info2 = `status: ${position.status}`;
       const info3 = `locations: ${position.locationCount} watchId: ${position.watchId}`;

app/component/itinerary/navigator/NaviContainer.js

@@ -1,8 +1,7 @@
 import distance from '@digitransit-search-util/digitransit-search-util-distance';
 import { routerShape } from 'found';
 import PropTypes from 'prop-types';
-import React, { useEffect, useState } from 'react';
-import { checkPositioningPermission } from '../../../action/PositionActions';
+import React, { useEffect, useRef } from 'react';
 import { legTime } from '../../../util/legUtils';
 import { legShape, relayShape } from '../../../util/shapes';
 import NaviBottom from './NaviBottom';
@@ -26,11 +25,13 @@ function NaviContainer(
   },
   { getStore, router },
 ) {
-  const [isPositioningAllowed, setPositioningAllowed] = useState(false);
+  const hasPosition = useRef(false);
 
   let position = getStore('PositionStore').getLocationState();
   if (!position.hasLocation) {
     position = null;
+  } else {
+    hasPosition.current = true;
   }
 
   const {
@@ -45,18 +46,8 @@ function NaviContainer(
   } = useRealtimeLegs(relayEnvironment, legs);
 
   useEffect(() => {
-    if (position) {
-      mapRef?.enableMapTracking();
-      setPositioningAllowed(true);
-    } else {
-      checkPositioningPermission().then(permission => {
-        if (permission.state === 'granted') {
-          mapRef?.enableMapTracking();
-          setPositioningAllowed(true);
-        }
-      });
-    }
-  }, [mapRef]);
+    mapRef?.enableMapTracking(); // try always, shows annoying notifier
+  }, [mapRef, hasPosition.current]);
 
   if (!realTimeLegs?.length) {
     return null;
@@ -80,9 +71,7 @@ function NaviContainer(
     <>
       <NaviCardContainer
         legs={realTimeLegs}
-        focusToLeg={
-          mapRef?.state.mapTracking || isPositioningAllowed ? null : focusToLeg
-        }
+        focusToLeg={position ? null : focusToLeg}
         time={time}
         position={position}
         mapLayerRef={mapLayerRef}