diff --git a/app/views/competitions/_nav.html.erb b/app/views/competitions/_nav.html.erb index 4b683d4bcf..04e8f0bc52 100644 --- a/app/views/competitions/_nav.html.erb +++ b/app/views/competitions/_nav.html.erb @@ -280,21 +280,3 @@ - - diff --git a/app/views/competitions/show.html.erb b/app/views/competitions/show.html.erb index 944ebf4a81..862e6dc325 100644 --- a/app/views/competitions/show.html.erb +++ b/app/views/competitions/show.html.erb @@ -2,7 +2,7 @@ <%= render layout: 'nav' do %> <%= react_component("CompetitionTabs", { tabs: @competition.tabs.as_json, - competition: @competition.as_json({ methods: %w[city organizers delegates registration_open registration_close extra_registration_requirements has_fees? competition_events base_entry_fee using_payment_integrations? series_sibling_competitions main_event_id has_rounds? external_registration_page part_of_competition_series? contact use_wca_registration is_probably_over? registration_not_yet_opened? registration_past? competitor_limit competitor_limit_enabled venue_details external_website venue_address latitude_degrees longitude_degrees website has_schedule? country_iso2 events media number_of_bookmarks date_range information]}), + competition: @competition.as_json({ methods: %w[city organizers delegates base_entry_fee_lowest_denomination registration_open registration_close extra_registration_requirements has_fees? competition_events base_entry_fee using_payment_integrations? series_sibling_competitions main_event_id has_rounds? external_registration_page part_of_competition_series? contact use_wca_registration is_probably_over? registration_not_yet_opened? registration_past? competitor_limit competitor_limit_enabled venue_details external_website venue_address latitude_degrees longitude_degrees website has_schedule? country_iso2 events media number_of_bookmarks date_range information]}), wcifEvents: @competition.events_wcif, wcifSchedule: @competition.schedule_wcif, locale: I18n.locale, userInfo: current_user.as_json({ only: %w[wca_id unconfirmed_wca_id], diff --git a/app/webpacker/components/CompetitionTabs/RegistrationRequirements.jsx b/app/webpacker/components/CompetitionTabs/RegistrationRequirements.jsx index 44acb50b68..7c07c59786 100644 --- a/app/webpacker/components/CompetitionTabs/RegistrationRequirements.jsx +++ b/app/webpacker/components/CompetitionTabs/RegistrationRequirements.jsx @@ -93,7 +93,7 @@ export default function RegistrationRequirements({ competition, userInfo, showLi

{competition.base_entry_fee_lowest_denomination ? I18n.t('competitions.competition_info.entry_fee_is', { - base_entry_fee: formatMoney(competition.base_entry_fee), + base_entry_fee: formatMoney(competition.base_entry_fee_lowest_denomination), }) : I18n.t('competitions.competition_info.no_entry_fee')}

@@ -107,18 +107,14 @@ export default function RegistrationRequirements({ competition, userInfo, showLi )} {competition['using_payment_integrations?'] && ( -

${t( - 'common.here', - )}`, - }, - ), + ${I18n.t( + 'common.here', + )}`, }} /> )}