Merge branch 'ranking-order' of Viktoriia/nomadmania-app into dev

src/screens/InAppScreens/MapScreen/UsersListScreen/Profile/index.tsx

@@ -58,7 +58,7 @@ export const Profile: FC<Props> = ({
 }) => {
   const navigation = useNavigation();
 
-  const scoreNames = ['NM', 'DARE', 'UN', 'UN+', 'TCC', 'DEEP', 'YES', 'SLOW', 'WHS', 'KYE', 'TBT'];
+  const scoreNames = ['NM', 'UN', 'UN+', 'DARE', 'TCC', 'DEEP', 'SLOW', 'YES', 'KYE', 'WHS', 'TBT'];
   const netInfo = useConnection();
   const token = storage.get('token', StoreType.STRING);
   const [modalType, setModalType] = useState<string | null>(null);

src/screens/InAppScreens/MapScreen/UsersListScreen/index.tsx

@@ -333,15 +333,15 @@ const UsersListScreen: FC<Props> = ({ navigation, route }) => {
             homebase2_flag={item.flag2}
             score={[
               item.score_nm,
-              item.score_dare,
               item.score_un,
               item.score_unp,
+              item.score_dare,
               item.score_tcc,
               item.score_deep,
-              item.score_yes,
               item.score_slow,
-              item.score_whs,
+              item.score_yes,
               item.score_kye,
+              item.score_whs,
               item.score_tbt
             ]}
             active_score={

src/screens/InAppScreens/ProfileScreen/Components/PersonalInfo.tsx

@@ -105,15 +105,15 @@ export const PersonalInfo: FC<PersonalInfoProps> = ({
 
   const scores = [
     { name: 'score_nm', score: 'NM' },
-    { name: 'score_mqp', score: 'DARE' },
     { name: 'score_un', score: 'UN' },
     { name: 'score_unp', score: 'UN+' },
+    { name: 'score_mqp', score: 'DARE' },
     { name: 'score_tcc', score: 'TCC' },
     { name: 'score_deep', score: 'DEEP' },
-    { name: 'score_yes', score: 'YES' },
     { name: 'score_slow', score: 'SLOW' },
-    { name: 'score_whs', score: 'WHS' },
-    { name: 'score_kye', score: 'KYE' }
+    { name: 'score_yes', score: 'YES' },
+    { name: 'score_kye', score: 'KYE' },
+    { name: 'score_whs', score: 'WHS' }
   ];
 
   const handleOpenModal = (type: string) => {

src/screens/InAppScreens/ProfileScreen/MyFriendsScreen/FriendsProfile/index.tsx

@@ -63,7 +63,7 @@ export const FriendsProfile: FC<Props> = ({
 }) => {
   const navigation = useNavigation();
 
-  const scoreNames = ['NM', 'DARE', 'UN', 'UN+', 'TCC', 'DEEP', 'YES', 'SLOW', 'WHS', 'KYE', 'TBT'];
+  const scoreNames = ['NM', 'UN', 'UN+', 'DARE', 'TCC', 'DEEP', 'SLOW', 'YES', 'KYE', 'WHS', 'TBT'];
 
   const handlePress = () => {
     navigation.navigate(...([NAVIGATION_PAGES.PUBLIC_PROFILE_VIEW, { userId }] as never));

src/screens/InAppScreens/ProfileScreen/MyFriendsScreen/index.tsx

@@ -244,15 +244,15 @@ const MyFriendsScreen: FC<Props> = ({ navigation }) => {
                   homebase2_flag={item.flag2}
                   score={[
                     item.score_nm,
-                    item.score_dare,
                     item.score_un,
                     item.score_unp,
+                    item.score_dare,
                     item.score_tcc,
                     item.score_deep,
-                    item.score_yes,
                     item.score_slow,
-                    item.score_whs,
+                    item.score_yes,
                     item.score_kye,
+                    item.score_whs,
                     item.score_tbt
                   ]}
                   active_score={

src/screens/InAppScreens/TravellersScreen/Components/Profile.tsx

@@ -61,7 +61,8 @@ export const Profile: FC<Props> = ({
 }) => {
   const navigation = useNavigation();
 
-  const scoreNames = ['NM', 'DARE', 'UN', 'UN+', 'TCC', 'DEEP', 'YES', 'SLOW', 'WHS', 'KYE'];
+  const scoreNames = ['NM', 'UN', 'UN+', 'DARE', 'TCC', 'DEEP', 'SLOW', 'YES', 'KYE', 'WHS'];
+
   const netInfo = useConnection();
   const token = storage.get('token', StoreType.STRING);
   const [modalType, setModalType] = useState<string | null>(null);

src/screens/InAppScreens/TravellersScreen/InHistoryScreen/index.tsx

@@ -52,15 +52,15 @@ const InHistoryScreen = () => {
             homebase2_flag={item.flag2}
             score={[
               item.score_nm,
-              item.score_dare,
               item.score_un,
               item.score_unp,
+              item.score_dare,
               item.score_tcc,
               item.score_deep,
-              item.score_yes,
               item.score_slow,
-              item.score_whs,
-              item.score_kye
+              item.score_yes,
+              item.score_kye,
+              item.score_whs
             ]}
             active_score={dataRanking[0].value - 1}
             tbt_score={item.score_tbt}

src/screens/InAppScreens/TravellersScreen/InMemoriamScreen/index.tsx

@@ -75,15 +75,15 @@ const InMemoriamScreen = () => {
             homebase2_flag={item.flag2}
             score={[
               item.score_nm,
-              item.score_dare,
               item.score_un,
               item.score_unp,
+              item.score_dare,
               item.score_tcc,
               item.score_deep,
-              item.score_yes,
               item.score_slow,
-              item.score_whs,
-              item.score_kye
+              item.score_yes,
+              item.score_kye,
+              item.score_whs
             ]}
             active_score={
               confirmedValueRanking ? confirmedValueRanking.value - 1 : dataRanking[0].value - 1

src/screens/InAppScreens/TravellersScreen/LPIRankingScreen/index.tsx

@@ -74,15 +74,15 @@ const LPIRankingScreen = () => {
             homebase2_flag={item.flag2}
             score={[
               item.score_nm,
-              item.score_dare,
               item.score_un,
               item.score_unp,
+              item.score_dare,
               item.score_tcc,
               item.score_deep,
-              item.score_yes,
               item.score_slow,
-              item.score_whs,
-              item.score_kye
+              item.score_yes,
+              item.score_kye,
+              item.score_whs
             ]}
             active_score={
               confirmedValueRanking ? confirmedValueRanking.value - 1 : dataRanking[0].value - 1

src/screens/InAppScreens/TravellersScreen/MasterRankingScreen/index.tsx

@@ -99,15 +99,15 @@ const MasterRankingScreen = () => {
             homebase2_flag={item.flag2}
             score={[
               item.score_nm,
-              item.score_dare,
               item.score_un,
               item.score_unp,
+              item.score_dare,
               item.score_tcc,
               item.score_deep,
-              item.score_yes,
               item.score_slow,
-              item.score_whs,
-              item.score_kye
+              item.score_yes,
+              item.score_kye,
+              item.score_whs
             ]}
             active_score={
               confirmedValueRanking ? confirmedValueRanking.value - 1 : dataRanking[0].value - 1

src/screens/InAppScreens/TravellersScreen/utils/values.ts

@@ -10,14 +10,14 @@ export const dataAge = [
 
 export const dataRanking = [
   { label: 'NM', value: 1, name: 'nm' },
-  { label: 'DARE', value: 2, name: 'dare' },
-  { label: 'UN', value: 3, name: 'un' },
-  { label: 'UN+', value: 4, name: 'unp' },
+  { label: 'UN', value: 2, name: 'un' },
+  { label: 'UN+', value: 3, name: 'unp' },
+  { label: 'DARE', value: 4, name: 'dare' },
   { label: 'TCC', value: 5, name: 'tcc' },
   { label: 'DEEP', value: 6, name: 'deep' },
-  { label: 'YES', value: 7, name: 'yes' },
-  { label: 'SLOW', value: 8, name: 'slow' },
-  { label: 'WHS', value: 9, name: 'whs' },
-  { label: 'KYE', value: 10, name: 'kye' },
+  { label: 'SLOW', value: 7, name: 'slow' },
+  { label: 'YES', value: 8, name: 'yes' },
+  { label: 'KYE', value: 9, name: 'kye' },
+  { label: 'WHS', value: 10, name: 'whs' },
   { label: 'TBT', value: 11, name: 'tbt' }
 ];