1
0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-06 10:22:45 +03:00

Merge branch 'develop' into t3chguy/react18/update

This commit is contained in:
Michael Telatynski
2024-08-05 10:56:09 +01:00
committed by GitHub
13 changed files with 75 additions and 61 deletions

View File

@@ -76,15 +76,15 @@ exports[`<EmailAddresses /> should render email addresses 1`] = `
class="mx_SettingsSubsection_content mx_SettingsSubsection_contentStretch"
>
<div
class="mx_GeneralUserSettingsTab_section--discovery_existing"
class="mx_EmailAddressesPhoneNumbers_discovery_existing"
>
<span
class="mx_GeneralUserSettingsTab_section--discovery_existing_address"
class="mx_EmailAddressesPhoneNumbers_discovery_existing_address"
>
foo@bar.com
</span>
<div
class="mx_AccessibleButton mx_GeneralUserSettingsTab_section--discovery_existing_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_sm"
class="mx_AccessibleButton mx_EmailAddressesPhoneNumbers_discovery_existing_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_sm"
role="button"
tabindex="0"
>

View File

@@ -19,15 +19,15 @@ exports[`<PhoneNumbers /> should allow binding msisdn 1`] = `
class="mx_SettingsSubsection_content mx_SettingsSubsection_contentStretch"
>
<div
class="mx_GeneralUserSettingsTab_section--discovery_existing"
class="mx_EmailAddressesPhoneNumbers_discovery_existing"
>
<span
class="mx_GeneralUserSettingsTab_section--discovery_existing_address"
class="mx_EmailAddressesPhoneNumbers_discovery_existing_address"
>
+441111111111
</span>
<span
class="mx_GeneralUserSettingsTab_section--discovery_existing_verification"
class="mx_EmailAddressesPhoneNumbers_discovery_existing_verification"
>
<span>
Please enter verification code sent via text.
@@ -141,16 +141,16 @@ exports[`<PhoneNumbers /> should render phone numbers 1`] = `
class="mx_SettingsSubsection_content mx_SettingsSubsection_contentStretch"
>
<div
class="mx_GeneralUserSettingsTab_section--discovery_existing"
class="mx_EmailAddressesPhoneNumbers_discovery_existing"
>
<span
class="mx_GeneralUserSettingsTab_section--discovery_existing_address"
class="mx_EmailAddressesPhoneNumbers_discovery_existing_address"
>
+
441111111111
</span>
<div
class="mx_AccessibleButton mx_GeneralUserSettingsTab_section--discovery_existing_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_sm"
class="mx_AccessibleButton mx_EmailAddressesPhoneNumbers_discovery_existing_button mx_AccessibleButton_hasKind mx_AccessibleButton_kind_primary_sm"
role="button"
tabindex="0"
>

View File

@@ -18,10 +18,10 @@ exports[`<GeneralUserSettingsTab /> 3pids should display 3pid email addresses an
class="mx_SettingsSubsection_content mx_SettingsSubsection_contentStretch"
>
<div
class="mx_GeneralUserSettingsTab_section--discovery_existing"
class="mx_EmailAddressesPhoneNumbers_discovery_existing"
>
<span
class="mx_GeneralUserSettingsTab_section--discovery_existing_address"
class="mx_EmailAddressesPhoneNumbers_discovery_existing_address"
>
test@test.io
</span>
@@ -84,10 +84,10 @@ exports[`<GeneralUserSettingsTab /> 3pids should display 3pid email addresses an
class="mx_SettingsSubsection_content mx_SettingsSubsection_contentStretch"
>
<div
class="mx_GeneralUserSettingsTab_section--discovery_existing"
class="mx_EmailAddressesPhoneNumbers_discovery_existing"
>
<span
class="mx_GeneralUserSettingsTab_section--discovery_existing_address"
class="mx_EmailAddressesPhoneNumbers_discovery_existing_address"
>
+
123456789

View File

@@ -46,7 +46,7 @@ exports[`PreferencesUserSettingsTab should render 1`] = `
/>
</div>
<div
class="mx_GeneralUserSettingsTab_section_hint"
class="mx_PreferencesUserSettingsTab_section_hint"
>
The app will reload after selecting another language
</div>