feat: reorder buttons on profile (#6681)

Author: OtavioStasiak

.maestro/tests/assorted/profile.yaml

@@ -59,10 +59,6 @@ onFlowComplete:
 - assertVisible:
     id: 'profile-view-email'
 
-# should have new password
-- assertVisible:
-    id: 'profile-view-change-my-password-button'
-
 # should have submit button
 - scrollUntilVisible:
     element:
@@ -74,6 +70,10 @@ onFlowComplete:
     id: 'profile-view-submit'
     enabled: false
 
+# should have new password
+- assertVisible:
+    id: 'profile-view-change-my-password-button'
+
 # swipe back to top
 - swipe:
     from:

app/views/ProfileView/index.tsx

@@ -380,14 +380,6 @@ const ProfileView = ({ navigation }: IProfileViewProps): React.ReactElement => {
 							customFields={customFields}
 							onCustomFieldChange={value => setCustomFields(value)}
 						/>
-						{Accounts_AllowPasswordChange ? (
-							<Button
-								title={I18n.t('Change_my_password')}
-								type='secondary'
-								onPress={navigateToChangePasswordView}
-								testID='profile-view-change-my-password-button'
-							/>
-						) : null}
 					</View>
 
 					<Button
@@ -401,6 +393,14 @@ const ProfileView = ({ navigation }: IProfileViewProps): React.ReactElement => {
 					/>
 
 					<ListSeparator style={{ marginVertical: 12 }} />
+					{Accounts_AllowPasswordChange ? (
+						<Button
+							title={I18n.t('Change_my_password')}
+							type='secondary'
+							onPress={navigateToChangePasswordView}
+							testID='profile-view-change-my-password-button'
+						/>
+					) : null}
 					<Button
 						title={I18n.t('Logout_from_other_logged_in_locations')}
 						type='secondary'