style: fixing code format (prettier/eslint rules) and merge conflicts

App/Screens/About/About.tsx

@@ -229,7 +229,8 @@ export function About(props: AboutProps) {
  </Text>
  .{'\n'}
  {'\n'}
- Sh**t! I Smoke v{Constants.manifest.revisionId || Constants.manifest.version}.
+ Sh**t! I Smoke v
+ {Constants.manifest.revisionId || Constants.manifest.version}.
  </Text>
  {/* Add languages https://github.com/amaurymartiny/shoot-i-smoke/issues/73 */}
  </View>

App/Screens/Details/Distance/Distance.tsx

@@ -18,6 +18,7 @@ import React from 'react';
 import { StyleSheet, Text } from 'react-native';
 import { Banner } from '../../../components';
 import { i18n } from '../../../localization';
+import { useDistanceUnit } from '../../../stores/distanceUnit';
 import * as theme from '../../../util/theme';
 
 interface DistanceProps {
@@ -36,7 +37,8 @@ const styles = StyleSheet.create({
 });
 
 export function Distance(props: DistanceProps) {
- const distanceUnit = i18n.t('distance_unit');
+ const { localizedDistanceUnit } = useDistanceUnit();
+ const distanceUnit = localizedDistanceUnit('short');
 
  return (
  <Banner elevated shadowPosition="top" style={styles.banner}>

App/Screens/Home/Header/Header.tsx

@@ -26,11 +26,8 @@ import { scale } from 'react-native-size-matters';
 import alert from '../../../../assets/images/alert.png';
 import { ChangeLocation, CurrentLocation } from '../../../components';
 import { i18n } from '../../../localization';
-import {
- ApiContext,
- CurrentLocationContext,
- DistanceUnit
-} from '../../../stores';
+import { ApiContext, CurrentLocationContext } from '../../../stores';
+import { useDistanceUnit } from '../../../stores/distanceUnit';
 import { distanceToStation, isStationTooFar } from '../../../util/station';
 import * as theme from '../../../util/theme';
 
@@ -67,12 +64,10 @@ const styles = StyleSheet.create({
 export function Header(props: HeaderProps) {
  const { api } = useContext(ApiContext);
  const { currentLocation, isGps } = useContext(CurrentLocationContext);
+ const { distanceUnit, localizedDistanceUnit } = useDistanceUnit();
  const { onChangeLocationClick } = props;
 
- const distanceUnit = i18n.t('distance_unit');
- const haversineDistanceUnit = i18n.t(
- 'haversine_distance_unit'
- ) as DistanceUnit;
+ const shortDistanceUnit = localizedDistanceUnit('short');
 
  if (!currentLocation) {
  throw new Error(
@@ -84,12 +79,7 @@ export function Header(props: HeaderProps) {
  );
  }
 
- const distance = distanceToStation(
- currentLocation,
- api,
- haversineDistanceUnit
- );
-
+ const distance = distanceToStation(currentLocation, api, distanceUnit);
  const isTooFar = isStationTooFar(currentLocation, api);
 
  return (

App/util/amplitude.ts

@@ -53,6 +53,7 @@ export function setupAmplitude() {
  Amplitude.setUserProperties({
  sisReleaseChannel:
  Constants.manifest.releaseChannel || 'development',
+ sisRevisionId: Constants.manifest.revisionId || 'development',
  sisVersion: Constants.manifest.version
  });
  }