Remove unused and confusing location properties

nimiq · Sep 7, 2023 · 510b65f · 510b65f
1 parent ab3fa80
commit 510b65f
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 14 deletions.
diff --git a/src/assets-dev/provider-assets.ts b/src/assets-dev/provider-assets.ts
@@ -17,21 +17,18 @@ const i18nKeyPassThrough = {
 // for providerLabel is happening in i18n-t in ProviderBanner, and providerTooltip is defined as a getter to not be
 // constant but re-computed on language changes. providerLabel can include a {provider} placeholder which gets handled
 // in i18n-t in ProviderBanner.
-export const providersAssets: Record<Provider, Pick<Location, 'bg' | 'bgFullCard' | 'theme' | 'providerLabel' | 'providerTooltip' | 'providerTooltipCta'>> = {
+export const providersAssets: Record<Provider, Pick<Location, 'bg' | 'theme' | 'providerLabel' | 'providerTooltip' | 'providerTooltipCta'>> = {
   [Provider.DefaultShop]: {
     bg: 'white',
-    bgFullCard: false,
     theme: Theme.Light,
 
   },
   [Provider.DefaultAtm]: {
     theme: Theme.Dark,
-    bgFullCard: true,
     bg: 'radial-gradient(100% 100% at 100% 100%, #4D4C96 0%, #5F4B8B 100%)',
   },
   [Provider.GoCrypto]: {
     theme: Theme.Light,
-    bgFullCard: false,
     bg: '#F0BF4C',
     get providerLabel() {
       const i18n = i18nKeyPassThrough
@@ -44,7 +41,6 @@ export const providersAssets: Record<Provider, Pick<Location, 'bg' | 'bgFullCard
   },
   [Provider.Kurant]: {
     theme: Theme.Dark,
-    bgFullCard: true,
     bg: '#A92E19',
     get providerLabel() {
       const i18n = i18nKeyPassThrough
@@ -57,7 +53,6 @@ export const providersAssets: Record<Provider, Pick<Location, 'bg' | 'bgFullCard
   },
   [Provider.Bluecode]: {
     bg: '#004899',
-    bgFullCard: false,
     theme: Theme.Dark,
     get providerLabel() {
       const i18n = i18nKeyPassThrough
@@ -71,7 +66,6 @@ export const providersAssets: Record<Provider, Pick<Location, 'bg' | 'bgFullCard
   [Provider.CryptopaymentLink]: {
     bg: '#5C6CFF',
     theme: Theme.Dark,
-    bgFullCard: false,
     get providerLabel() {
       const i18n = i18nKeyPassThrough
       return i18n.t('Powered by {provider}')
@@ -84,7 +78,6 @@ export const providersAssets: Record<Provider, Pick<Location, 'bg' | 'bgFullCard
   [Provider.Edenia]: {
     bg: '#00B2B0',
     theme: Theme.Dark,
-    bgFullCard: true,
     get providerLabel() {
       const i18n = i18nKeyPassThrough
       return i18n.t('Register with {provider}')

diff --git a/src/assets-dev/stories/locations.ts b/src/assets-dev/stories/locations.ts
@@ -3,7 +3,7 @@ import { Category, Currency, type Location, LocationLink, Provider } from 'types
 import { providersAssets } from '../provider-assets'
 import { translateCategory } from '@/translations'
 
-type ExtraFields = Pick<Location, 'isAtm' | 'isShop' | 'isDark' | 'isLight' | 'provider' | 'category' | 'category_label' | 'providerLabel' | 'providerTooltip' | 'theme' | 'bg' | 'bgFullCard' | 'hasBottomBanner' | 'sells' | 'url' | 'linkTo'>
+type ExtraFields = Pick<Location, 'isAtm' | 'isDark' | 'isLight' | 'provider' | 'category' | 'category_label' | 'providerLabel' | 'providerTooltip' | 'theme' | 'bg' | 'hasBottomBanner' | 'sells' | 'url' | 'linkTo'>
 export function getExtra(provider: Provider, sells: Currency[] = [], linkTo: LocationLink = LocationLink.GMaps): ExtraFields {
   const assets = providersAssets[provider]
   if (!assets)
@@ -23,7 +23,6 @@ export function getExtra(provider: Provider, sells: Currency[] = [], linkTo: Loc
 
   return {
     isAtm,
-    isShop: !isAtm,
     isDark: assets.theme === 'dark',
     isLight: assets.theme === 'light',
     ...assets,

diff --git a/src/shared.ts b/src/shared.ts
@@ -1,6 +1,6 @@
 import { PROVIDERS } from 'database'
 import type { DatabaseArgs, Location } from 'types'
-import { Category, LocationLink, Provider, Theme } from 'types'
+import { LocationLink, Provider, Theme } from 'types'
 import { providersAssets } from './assets-dev/provider-assets'
 import { translateCategory } from './translations'
 
@@ -41,7 +41,6 @@ export function parseLocation(location: Location) {
   Object.assign(location, providersAssets[location.provider]) // Assing all the keys from the asset to the location
 
   location.isAtm = isAtm
-  location.isShop = location.category === Category.Shop
   location.isDark = location.theme === Theme.Dark
   location.isLight = location.theme === Theme.Light
   location.hasBottomBanner = location.provider !== Provider.DefaultShop && location.provider !== Provider.DefaultAtm

diff --git a/types/location.ts b/types/location.ts
@@ -48,7 +48,6 @@ export interface Location {
 
   // UI Options
   theme: Theme
-  bgFullCard: boolean
   bg: string
 
   // Provider text
@@ -58,7 +57,6 @@ export interface Location {
 
   // Quick getters
   isAtm: boolean
-  isShop: boolean
   isDark: boolean
   isLight: boolean
   hasBottomBanner: boolean