diff --git a/src/features/user/ManageProjects/index.tsx b/src/features/user/ManageProjects/index.tsx index e47776a9d7..9987a4aa20 100644 --- a/src/features/user/ManageProjects/index.tsx +++ b/src/features/user/ManageProjects/index.tsx @@ -21,7 +21,7 @@ import { handleError, APIError, ProjectExtended } from '@planet-sdk/common'; interface Props { GUID?: string | null; token: string | null; - project?: ProjectExtended | {}; + project?: ProjectExtended; } export default function ManageProjects({ GUID, token, project }: Props) { diff --git a/src/utils/countryCurrency/getCurrencySymbolByCode.ts b/src/utils/countryCurrency/getCurrencySymbolByCode.ts index a8762be3a1..b6539f61bc 100644 --- a/src/utils/countryCurrency/getCurrencySymbolByCode.ts +++ b/src/utils/countryCurrency/getCurrencySymbolByCode.ts @@ -1,14 +1,14 @@ /** - * Retrieves the currency symbol for a given number. + * Retrieves the appropriate currency symbol for a given currency and amount. * @param {string} langCode - The language code. * @param {string} currency - The currency code. - * @param {number} number - The number used to determine the currency symbol. + * @param {amount} number - The amount/value in the specified currency */ export default function getCurrencySymbolByCode( langCode: string, currency: string, - number: number + amount: number ) { const options = { // These options are needed to round to whole numbers if that's what you want. @@ -18,7 +18,7 @@ export default function getCurrencySymbolByCode( }; const formatter = new Intl.NumberFormat(langCode, options); const currencySymbol = formatter - .formatToParts(number) + .formatToParts(amount) .filter((part) => part.type == 'currency'); return Array.isArray(currencySymbol) && currencySymbol.length > 0 diff --git a/src/utils/countryCurrency/getStoredCurrency.ts b/src/utils/countryCurrency/getStoredCurrency.ts index 0ab585b58c..bbb97fbdcf 100644 --- a/src/utils/countryCurrency/getStoredCurrency.ts +++ b/src/utils/countryCurrency/getStoredCurrency.ts @@ -1,53 +1,6 @@ import tenantConfig from '../../../tenant.config'; -interface ConfigType { - tenantName: string; - tenantURL: string; - languages: string[]; - fallbackCurrency?: string; - tenantGoal?: number | null; - showUNDecadeLogo?: boolean; - font: { - primaryFontFamily: string; - secondaryFontFamily: string; - primaryFontURL?: string; - secondaryFontURL?: string; - }; - header: { - isSecondaryTenant: boolean; - tenantLogoURL: string; - mobileLogoURL?: string; - tenantLogoLink: string; - items: { - [key: string]: { - title: string; - loggedInTitle?: string; - onclick: string; - visible: boolean; - subMenu?: { - title: string; - onclick: string; - visible: boolean; - }[]; - }; - }; - }; - meta: { - title: string; - appTitle?: string; - description: string; - image: string; - twitterHandle: string; - locale: string; - }; - footerLinks: string[]; - manifest?: string; - home?: { - image: string; - }; -} - -const config: ConfigType = tenantConfig(); +const config = tenantConfig(); export default function getStoredCurrency() { let currencyCode; diff --git a/src/utils/maps/plantLocations.ts b/src/utils/maps/plantLocations.ts index 21d4f4b5fb..4b7d46a329 100644 --- a/src/utils/maps/plantLocations.ts +++ b/src/utils/maps/plantLocations.ts @@ -10,7 +10,7 @@ export function zoomToPlantLocation( coordinates: turf.Position[], viewport: ViewPort, isMobile: boolean, - setViewPort: Function, + setViewPort: SetState, duration = 1200 ) { if (viewport.width && viewport.height) { diff --git a/tenant.config.js b/tenant.config.ts similarity index 65% rename from tenant.config.js rename to tenant.config.ts index 2b039ef123..0402f05fcd 100644 --- a/tenant.config.js +++ b/tenant.config.ts @@ -16,7 +16,54 @@ import sitex from './public/tenants/sitex/config'; import T3pleset from './public/tenants/3pleset/config'; import weareams from './public/tenants/weareams/config'; -export default function tenantConfig() { +interface ConfigType { + tenantName: string; + tenantURL: string; + languages: string[]; + fallbackCurrency?: string; + tenantGoal?: number | null; + showUNDecadeLogo?: boolean; + font: { + primaryFontFamily: string; + secondaryFontFamily: string; + primaryFontURL?: string; + secondaryFontURL?: string; + }; + header: { + isSecondaryTenant: boolean; + tenantLogoURL: string; + mobileLogoURL?: string; + tenantLogoLink: string; + items: { + [key: string]: { + title: string; + loggedInTitle?: string; + onclick: string; + visible: boolean; + subMenu?: { + title: string; + onclick: string; + visible: boolean; + }[]; + }; + }; + }; + meta: { + title: string; + appTitle?: string; + description: string; + image: string; + twitterHandle: string; + locale: string; + }; + footerLinks: string[]; + manifest?: string; + home?: { + image: string; + }; +} + +export default function tenantConfig(): ConfigType { switch (process.env.TENANT) { case 'planet': return planetConfig; diff --git a/tsconfig.json b/tsconfig.json index 3722859e93..ccbfd42ce4 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,7 +22,7 @@ "**/*.ts", "**/*.tsx", "./src/**/*", - "tenant.config.js", + "tenant.config.ts", "public/assets" ] }