diff --git a/android/app/build.gradle b/android/app/build.gradle index d740c575..4d9dec3d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "com.compassconnections.app" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 111 - versionName "1.26.0" + versionCode 112 + versionName "1.27.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. diff --git a/web/components/filters/filters.tsx b/web/components/filters/filters.tsx index 99f4cead..4f8fa962 100644 --- a/web/components/filters/filters.tsx +++ b/web/components/filters/filters.tsx @@ -24,6 +24,7 @@ import {IncompleteProfilesToggle} from 'web/components/filters/incomplete-profil import {InterestFilter, InterestFilterText} from 'web/components/filters/interest-filter' import {LanguageFilter, LanguageFilterText} from 'web/components/filters/language-filter' import {MbtiFilter, MbtiFilterText} from 'web/components/filters/mbti-filter' +import {OrientationFilter, OrientationFilterText} from 'web/components/filters/orientation-filter' import {PoliticalFilter, PoliticalFilterText} from 'web/components/filters/political-filter' import { RelationshipStatusFilter, @@ -50,7 +51,6 @@ import {HasKidsFilter, HasKidsLabel} from './has-kids-filter' import {LastActiveFilter, LastActiveFilterText} from './last-active-filter' import {LocationFilter, LocationFilterProps, LocationFilterText} from './location-filter' import {MyMatchesToggle} from './my-matches-toggle' -import {OrientationFilter, OrientationFilterText} from './orientation-filter' import {PsychedelicsFilter, PsychedelicsFilterText} from './psychedelics-filter' import {RelationshipFilter, RelationshipFilterText} from './relationship-filter' import {SmokerFilter, SmokerFilterText} from './smoker-filter' @@ -329,24 +329,6 @@ function Filters(props: { - {/* ORIENTATION - Always visible */} - - } - > - - - {/* ACCORDION GROUPS */} {/* Relationship Group */} @@ -366,7 +348,7 @@ function Filters(props: { selection={ + + } + > + + + {/* Romantic Style */} {label} diff --git a/web/components/filters/romantic-filter.tsx b/web/components/filters/romantic-filter.tsx index a44626bc..0181117d 100644 --- a/web/components/filters/romantic-filter.tsx +++ b/web/components/filters/romantic-filter.tsx @@ -18,7 +18,7 @@ export function RomanticFilterText(props: { if (!relationship || length < 1) { return ( - {t('filter.any_relationship', 'Any relationship')} + {t('filter.any_relationship', 'Any relationship style')} ) } diff --git a/web/components/optional-profile-form.tsx b/web/components/optional-profile-form.tsx index da578f8c..c7e279ed 100644 --- a/web/components/optional-profile-form.tsx +++ b/web/components/optional-profile-form.tsx @@ -463,55 +463,6 @@ export const OptionalProfileUserForm = (props: { - - - - - showAllOrientations || - DEFAULT_ORIENTATIONS.includes(v as any) || - (profile['orientation'] ?? []).includes(v), - ), - ) as any - } - selected={profile['orientation'] ?? []} - translationPrefix={'profile.orientation'} - onChange={(selected) => setProfile('orientation', selected)} - /> - {!showAllOrientations && ( - - )} - {showAllOrientations && ( - <> -

{t('profile.optional.details', 'Details')}

- ) => - setProfile('orientation_details', e.target.value) - } - className={'w-full sm:w-[700px]'} - value={(profile as any)['orientation_details'] ?? undefined} - placeholder={t( - 'profile.orientation.details_placeholder', - 'Any details about your sexual orientation…', - )} - /> - - )} - -
- + + + + + showAllOrientations || + DEFAULT_ORIENTATIONS.includes(v as any) || + (profile['orientation'] ?? []).includes(v), + ), + ) as any + } + selected={profile['orientation'] ?? []} + translationPrefix={'profile.orientation'} + onChange={(selected) => setProfile('orientation', selected)} + /> + {!showAllOrientations && ( + + )} + {showAllOrientations && ( + <> +

{t('profile.optional.details', 'Details')}

+ ) => + setProfile('orientation_details', e.target.value) + } + className={'w-full sm:w-[700px]'} + value={(profile as any)['orientation_details'] ?? undefined} + placeholder={t( + 'profile.orientation.details_placeholder', + 'Any details about your sexual orientation…', + )} + /> + + )} + +
+