Skip to content

Commit

Permalink
Merge pull request #102 from Oceans-1876/main
Browse files Browse the repository at this point in the history
Merge main back to develop
  • Loading branch information
Rashmil-1999 authored Jun 17, 2024
2 parents 6916099 + ff18256 commit 006af3c
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.2] - 2024-06-10

### Fixed

- Typo in word 'Celsius' [#100](https://github.com/Oceans-1876/challenger-portal/issues/100)

## [1.0.1] - 2024-01-17

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "challenger-portal",
"version": "1.0.1",
"version": "1.0.2",
"description": "",
"repository": "https://github.com/Oceans-1876/challenger-portal",
"main": "src/app.tsx",
Expand Down
4 changes: 2 additions & 2 deletions src/components/UnitPreferencesDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ interface Map {

const possibleTempUnits = [
{ value: 'F', unit: 'Fahrenheit' },
{ value: 'C', unit: 'Celcius' }
{ value: 'C', unit: 'Celsius' }
];

export const tempUnitMap: Map = {
F: 'Fahrenheit',
C: 'Celcius'
C: 'Celsius'
};

const possibleDepthUnits = [
Expand Down
8 changes: 4 additions & 4 deletions src/utils/format.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ export const decimalFormat = (value: number, decimals = 2): string => {
return formatter.format(value);
};

export const convertFahrenheitToCelcius = (temp: number): string => {
const formattedCelciusTemp = decimalFormat((temp - 32) * (5 / 9));
return formattedCelciusTemp;
export const convertFahrenheitToCelsius = (temp: number): string => {
const formattedCelsiusTemp = decimalFormat((temp - 32) * (5 / 9));
return formattedCelsiusTemp;
};

export const convertCelciusToFahrenheit = (temp: number): string => {
export const convertCelsiusToFahrenheit = (temp: number): string => {
const formattedFahrenheitTemp = decimalFormat(temp * (9 / 5) + 32);
return formattedFahrenheitTemp;
};
Expand Down

0 comments on commit 006af3c

Please sign in to comment.