Skip to content

Commit b064959

Browse files
dalkiadalkia
committed
Revert "feat: refactor nametags to UI Toolkit and add official badge (#5657)"
This reverts commit 3c92578.
1 parent 63bea6b commit b064959

File tree

81 files changed

+3082
-1942
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+3082
-1942
lines changed

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,11 @@ MonoBehaviour:
225225
m_ReadOnly: 0
226226
m_SerializedLabels: []
227227
FlaggedDuringContentUpdateRestriction: 0
228+
- m_GUID: d65049d6f7a244863b39c4dda5ba538e
229+
m_Address: NametagsData
230+
m_ReadOnly: 0
231+
m_SerializedLabels: []
232+
FlaggedDuringContentUpdateRestriction: 0
228233
- m_GUID: d9a7adc162dc338449107a4654a26d50
229234
m_Address: WorldAudioContainer
230235
m_ReadOnly: 0

‎Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,11 @@ MonoBehaviour:
9595
m_ReadOnly: 0
9696
m_SerializedLabels: []
9797
FlaggedDuringContentUpdateRestriction: 0
98+
- m_GUID: 1d026bc5d9fd448798b32a455c0f3978
99+
m_Address: Nametag
100+
m_ReadOnly: 0
101+
m_SerializedLabels: []
102+
FlaggedDuringContentUpdateRestriction: 0
98103
- m_GUID: 1f557ed079be146f9aeb090104c115c9
99104
m_Address: Assets/DCL/MapRenderer/Addressables/SceneOfInterest.prefab
100105
m_ReadOnly: 0
@@ -220,11 +225,6 @@ MonoBehaviour:
220225
m_ReadOnly: 0
221226
m_SerializedLabels: []
222227
FlaggedDuringContentUpdateRestriction: 0
223-
- m_GUID: 3df1198e2008a4f0abdf407103681813
224-
m_Address: Assets/DCL/NameTags/Assets/NametagUIDocument.prefab
225-
m_ReadOnly: 0
226-
m_SerializedLabels: []
227-
FlaggedDuringContentUpdateRestriction: 0
228228
- m_GUID: 3efe8a48fc3905f47a0648abd6859394
229229
m_Address: MapCameraObject
230230
m_ReadOnly: 0
@@ -595,6 +595,11 @@ MonoBehaviour:
595595
m_ReadOnly: 0
596596
m_SerializedLabels: []
597597
FlaggedDuringContentUpdateRestriction: 0
598+
- m_GUID: b028edf69a2c54c9194c4ce6524befff
599+
m_Address: ChatBubbleConfiguration
600+
m_ReadOnly: 0
601+
m_SerializedLabels: []
602+
FlaggedDuringContentUpdateRestriction: 0
598603
- m_GUID: b54d9d4189903c2438fa811308f14ceb
599604
m_Address: MapConfiguration
600605
m_ReadOnly: 0

‎Explorer/Assets/DCL/AuthenticationScreenFlow/AuthenticationScreenController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ private bool IsUserAllowedToAccessToBeta(IWeb3Identity storedIdentity)
294294

295295
FeatureFlagsConfiguration flags = FeatureFlagsConfiguration.Instance;
296296

297-
if (!flags.IsEnabled(FeatureFlagsStrings.USER_ALLOW_LIST, FeatureFlagsStrings.WALLET_VARIANT)) return true;
297+
if (!flags.IsEnabled(FeatureFlagsStrings.USER_ALLOW_LIST, FeatureFlagsStrings.WALLETS_VARIANT)) return true;
298298

299-
if (!flags.TryGetCsvPayload(FeatureFlagsStrings.USER_ALLOW_LIST, FeatureFlagsStrings.WALLET_VARIANT, out List<List<string>>? allowedUsersCsv))
299+
if (!flags.TryGetCsvPayload(FeatureFlagsStrings.USER_ALLOW_LIST, FeatureFlagsStrings.WALLETS_VARIANT, out List<List<string>>? allowedUsersCsv))
300300
return true;
301301

302302
bool isUserAllowed = allowedUsersCsv![0]

‎Explorer/Assets/DCL/Communities/CommunitiesFeatureAccess.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public async UniTask<bool> IsUserAllowedToUseTheFeatureAsync(CancellationToken c
5151
result = false;
5252
else
5353
{
54-
FeatureFlagsConfiguration.Instance.TryGetTextPayload(FeatureFlagsStrings.COMMUNITIES, FeatureFlagsStrings.WALLETS_VARIANT, out string? walletsAllowlist);
54+
FeatureFlagsConfiguration.Instance.TryGetTextPayload(FeatureFlagsStrings.COMMUNITIES, FeatureFlagsStrings.COMMUNITIES_WALLETS_VARIANT, out string? walletsAllowlist);
5555
result = string.IsNullOrEmpty(walletsAllowlist) || walletsAllowlist.Contains(ownWalletId, StringComparison.OrdinalIgnoreCase);
5656
}
5757
}

‎Explorer/Assets/DCL/FeatureFlags/CommunitiesFeatureProvider.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public async UniTask<bool> IsFeatureEnabledAsync(CancellationToken ct)
4141
result = false;
4242
else
4343
{
44-
FeatureFlagsConfiguration.Instance.TryGetTextPayload(FeatureFlagsStrings.COMMUNITIES, FeatureFlagsStrings.WALLETS_VARIANT, out string? walletsAllowlist);
44+
FeatureFlagsConfiguration.Instance.TryGetTextPayload(FeatureFlagsStrings.COMMUNITIES, FeatureFlagsStrings.COMMUNITIES_WALLETS_VARIANT, out string? walletsAllowlist);
4545
result = string.IsNullOrEmpty(walletsAllowlist) || walletsAllowlist.Contains(ownWalletId, StringComparison.OrdinalIgnoreCase);
4646
}
4747
}

‎Explorer/Assets/DCL/FeatureFlags/FeatureFlagsStrings.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public static class FeatureFlagsStrings
1515
public const string USER_ALLOW_LIST = "user-allow-list";
1616
public const string CSV_VARIANT = "csv-variant";
1717
public const string STRING_VARIANT = "string-variant";
18-
public const string WALLET_VARIANT = "wallet";
19-
public const string WALLETS_VARIANT = "wallets";
18+
public const string WALLETS_VARIANT = "wallet";
2019
public const string ONBOARDING = "onboarding";
2120
public const string GREETING_ONBOARDING = "greeting-onboarding";
2221
public const string ONBOARDING_ENABLED_VARIANT = "enabled";
@@ -27,7 +26,6 @@ public static class FeatureFlagsStrings
2726
public const string CHAT_HISTORY_LOCAL_STORAGE = "alfa-chat-history-local-storage";
2827
public const string VOICE_CHAT = "alfa-voice-chat";
2928
public const string COMMUNITY_VOICE_CHAT = "alfa-community-voice-chat";
30-
public const string OFFICIAL_WALLETS = "alfa-official-wallets";
3129
public const string CAMERA_REEL = "alfa-camera-reel";
3230
public const string FRIENDS = "alfa-friends";
3331
public const string FRIENDS_USER_BLOCKING = "alfa-friends-user-blocking";
@@ -36,7 +34,9 @@ public static class FeatureFlagsStrings
3634
public const string SCENE_MEMORY_LIMIT = "alfa-use-scene-memory-limit";
3735
public const string KTX2_CONVERSION = "ktx2-conversion";
3836
public const string MARKETPLACE_CREDITS = "alfa-marketplace-credits";
37+
public const string MARKETPLACE_CREDITS_WALLETS_VARIANT = "wallets";
3938
public const string COMMUNITIES = "alfa-communities";
39+
public const string COMMUNITIES_WALLETS_VARIANT = "wallets";
4040
public const string COMMUNITIES_MEMBERS_COUNTER = "alfa-communities-members-counter";
4141
public const string AUTH_CODE_VALIDATION = "number-validation";
4242
[Obsolete("GPU Instancer Pro terrain is no longer optional so the flag is not needed")]
@@ -100,7 +100,7 @@ public static string GetStringValue(this FeatureFlag flag)
100100
FeatureFlag.UserAllowList => FeatureFlagsStrings.USER_ALLOW_LIST,
101101
FeatureFlag.CsvVariant => FeatureFlagsStrings.CSV_VARIANT,
102102
FeatureFlag.StringVariant => FeatureFlagsStrings.STRING_VARIANT,
103-
FeatureFlag.WalletsVariant => FeatureFlagsStrings.WALLET_VARIANT,
103+
FeatureFlag.WalletsVariant => FeatureFlagsStrings.WALLETS_VARIANT,
104104
FeatureFlag.Onboarding => FeatureFlagsStrings.ONBOARDING,
105105
FeatureFlag.GreetingOnboarding => FeatureFlagsStrings.GREETING_ONBOARDING,
106106
FeatureFlag.OnboardingEnabledVariant => FeatureFlagsStrings.ONBOARDING_ENABLED_VARIANT,
@@ -119,7 +119,7 @@ public static string GetStringValue(this FeatureFlag flag)
119119
FeatureFlag.SceneMemoryLimit => FeatureFlagsStrings.SCENE_MEMORY_LIMIT,
120120
FeatureFlag.Ktx2Conversion => FeatureFlagsStrings.KTX2_CONVERSION,
121121
FeatureFlag.MarketplaceCredits => FeatureFlagsStrings.MARKETPLACE_CREDITS,
122-
FeatureFlag.MarketplaceCreditsWalletsVariant => FeatureFlagsStrings.WALLETS_VARIANT,
122+
FeatureFlag.MarketplaceCreditsWalletsVariant => FeatureFlagsStrings.MARKETPLACE_CREDITS_WALLETS_VARIANT,
123123
FeatureFlag.AuthCodeValidation => FeatureFlagsStrings.AUTH_CODE_VALIDATION,
124124
FeatureFlag.GpuiEnabled => FeatureFlagsStrings.GPUI_ENABLED,
125125
FeatureFlag.ChatTranslation => FeatureFlagsStrings.CHAT_TRANSLATION_ENABLED,

‎Explorer/Assets/DCL/FeatureFlags/OfficialWalletsHelper.cs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎Explorer/Assets/DCL/FeatureFlags/OfficialWalletsHelper.cs.meta‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Explorer/Assets/DCL/Infrastructure/Global/Dynamic/BootstrapAnalyticsDecorator.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
using SceneRunner.Debugging;
1515
using Segment.Serialization;
1616
using System;
17-
using System.Collections.Generic;
1817
using System.Threading;
1918
using UnityEngine.UIElements;
2019
using Utility;

‎Explorer/Assets/DCL/Infrastructure/Global/Dynamic/Bootstraper.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
using SceneRuntime.Factory.JsSource;
3434
using SceneRuntime.Factory.WebSceneSource;
3535
using System;
36-
using System.Collections.Generic;
3736
using System.Threading;
3837
using UnityEngine;
3938
using UnityEngine.UIElements;

0 commit comments

Comments
 (0)