Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: the profile picture display the full image of the avatar #5985

Merged
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public BackpackEditorHUDController(
dataStore.HUDs.avatarEditorVisible.OnChange += OnBackpackVisibleChanged;
dataStore.HUDs.isAvatarEditorInitialized.Set(true);
dataStore.exploreV2.configureBackpackInFullscreenMenu.OnChange += ConfigureBackpackInFullscreenMenuChanged;
dataStore.common.isSignUpFlow.OnChange += OnSignUpFlowChanged;
dataStore.backpackV2.isWaitingToBeSavedAfterSignUp.OnChange += SaveBackpackBeforeSignUpFinishes;

ConfigureBackpackInFullscreenMenuChanged(dataStore.exploreV2.configureBackpackInFullscreenMenu.Get(), null);

Expand Down Expand Up @@ -193,7 +193,7 @@ public void Dispose()
ownUserProfile.OnUpdate -= LoadUserProfileFromProfileUpdate;
dataStore.HUDs.avatarEditorVisible.OnChange -= OnBackpackVisibleChanged;
dataStore.exploreV2.configureBackpackInFullscreenMenu.OnChange -= ConfigureBackpackInFullscreenMenuChanged;
dataStore.common.isSignUpFlow.OnChange -= OnSignUpFlowChanged;
dataStore.backpackV2.isWaitingToBeSavedAfterSignUp.OnChange -= SaveBackpackBeforeSignUpFinishes;

backpackEmotesSectionController.OnNewEmoteAdded -= OnNewEmoteAdded;
backpackEmotesSectionController.OnEmotePreviewed -= OnEmotePreviewed;
Expand Down Expand Up @@ -298,9 +298,9 @@ private void CloseView()
private void ConfigureBackpackInFullscreenMenuChanged(Transform currentParentTransform, Transform previousParentTransform) =>
view.SetAsFullScreenMenuMode(currentParentTransform);

private void OnSignUpFlowChanged(bool current, bool previous)
private void SaveBackpackBeforeSignUpFinishes(bool isBackpackWaitingToBeSaved, bool _)
{
if (current)
if (!isBackpackWaitingToBeSaved)
return;

view.SetSignUpStage(SignUpStage.CustomizeAvatar);
Expand Down Expand Up @@ -453,6 +453,10 @@ private async UniTask SaveAsync(CancellationToken cancellationToken)
try
{
await TakeSnapshotsAndSaveAvatarAsync(cancellationToken);

if (dataStore.backpackV2.isWaitingToBeSavedAfterSignUp.Get())
dataStore.backpackV2.isWaitingToBeSavedAfterSignUp.Set(false);

CloseView();
}
catch (OperationCanceledException) { }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ public SignupHUDController(
this.browserBridge = browserBridge;
this.subscriptionsAPIService = subscriptionsAPIService;
loadingScreenDataStore.decoupledLoadingHUD.visible.OnChange += OnLoadingScreenAppear;
DataStore.i.backpackV2.isWaitingToBeSavedAfterSignUp.OnChange += OnTermsOfServiceAgreedStepAfterSaveBackpack;
sandrade-dcl marked this conversation as resolved.
Show resolved Hide resolved
}

public void Initialize()
Expand All @@ -62,7 +63,7 @@ public void Initialize()

view.OnNameScreenNext += OnNameScreenNext;
view.OnEditAvatar += OnEditAvatar;
view.OnTermsOfServiceAgreed += OnTermsOfServiceAgreed;
view.OnTermsOfServiceAgreed += OnTermsOfServiceAgreedStepBeforeSaveBackpack;
view.OnTermsOfServiceBack += OnTermsOfServiceBack;
view.OnLinkClicked += OnLinkClicked;

Expand Down Expand Up @@ -104,10 +105,11 @@ internal void OnEditAvatar()
dataStoreHUDs.avatarEditorVisible.Set(true, true);
}

internal void OnTermsOfServiceAgreed()
private void OnTermsOfServiceAgreedStepBeforeSaveBackpack()
{
WebInterface.SendPassport(name, email);
DataStore.i.common.isSignUpFlow.Set(false);
DataStore.i.backpackV2.isWaitingToBeSavedAfterSignUp.Set(true);

newUserExperienceAnalytics?.SendTermsOfServiceAcceptedNux(name, email);

if (!isNewTermsOfServiceAndEmailSubscriptionEnabled)
Expand All @@ -117,6 +119,14 @@ internal void OnTermsOfServiceAgreed()
CreateSubscriptionAsync(email, createSubscriptionCts.Token).Forget();
}

private void OnTermsOfServiceAgreedStepAfterSaveBackpack(bool isBackpackWaitingToBeSaved, bool _)
{
if (isBackpackWaitingToBeSaved)
return;

DataStore.i.common.isSignUpFlow.Set(false);
}

private async UniTaskVoid CreateSubscriptionAsync(string emailAddress, CancellationToken cancellationToken)
{
try
Expand Down Expand Up @@ -157,9 +167,10 @@ public void Dispose()
return;
view.OnNameScreenNext -= OnNameScreenNext;
view.OnEditAvatar -= OnEditAvatar;
view.OnTermsOfServiceAgreed -= OnTermsOfServiceAgreed;
view.OnTermsOfServiceAgreed -= OnTermsOfServiceAgreedStepBeforeSaveBackpack;
view.OnTermsOfServiceBack -= OnTermsOfServiceBack;
CommonScriptableObjects.isFullscreenHUDOpen.OnChange -= OnLoadingScreenAppear;
DataStore.i.backpackV2.isWaitingToBeSavedAfterSignUp.OnChange -= OnTermsOfServiceAgreedStepAfterSaveBackpack;
loadingScreenDataStore.decoupledLoadingHUD.visible.OnChange -= OnLoadingScreenAppear;
createSubscriptionCts.SafeCancelAndDispose();
view.Dispose();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ public class DataStore_BackpackV2
{
public readonly BaseCollection<string> previewEquippedWearables = new ();
public readonly BaseVariable<string> previewBodyShape = new ();
public readonly BaseVariable<bool> isWaitingToBeSavedAfterSignUp = new (false);
}
}