Merge branch 'master' into dev

Author: BellringerQuinn

Assets/SequenceSDK/WaaS/Tests/WaaSFederatedAuthTests.cs

@@ -5,6 +5,7 @@
 using PlayFab.ClientModels;
 using Sequence.EmbeddedWallet;
 using UnityEngine;
+using Random = UnityEngine.Random;
 
 namespace Sequence.EmbeddedWallet.Tests
 {
@@ -86,7 +87,7 @@ private void RetryIfAlreadyLinked(string error)
         {
             if (error.Contains("AccountAlreadyLinked"))
             {
-                _email = "a" + _email;
+                _email = Random.Range(0, 9999999).ToString() + _email;
                 var request = new LoginWithEmailAddressRequest
                 {
                     Email = _email,

Packages/Sequence-Unity/Sequence/SequenceFrontend/ScriptableObjects/NetworkIcons.asset

@@ -57,6 +57,8 @@ MonoBehaviour:
     Value: {fileID: 21300000, guid: bd5c36b9fb9f344faac5498fb1ef8adf, type: 3}
   - Key: 40
     Value: {fileID: 21300000, guid: fca1fb969526641ab92a7dadb3373992, type: 3}
+  - Key: 1284
+    Value: {fileID: 21300000, guid: 487a52377dc99420699217f27a3f7940, type: 3}
   - Key: 11155111
     Value: {fileID: 21300000, guid: 3e21b6696eaaa46b1b176b8b5e6254a3, type: 3}
   - Key: 80002
@@ -101,3 +103,5 @@ MonoBehaviour:
     Value: {fileID: 21300000, guid: 636803a1680c145c99675de2aaf50a81, type: 3}
   - Key: 41
     Value: {fileID: 21300000, guid: fca1fb969526641ab92a7dadb3373992, type: 3}
+  - Key: 1287
+    Value: {fileID: 21300000, guid: 67e27505fbd0e4afe8ed08544b5e232d, type: 3}

Packages/Sequence-Unity/Sequence/SequenceFrontend/Scripts/UI/LoginPage.cs

@@ -3,6 +3,7 @@
 using Sequence.EmbeddedWallet;
 using TMPro;
 using UnityEngine;
+using System.Collections;
 
 namespace Sequence.Demo
 {
@@ -160,5 +161,24 @@ private void EnableLoadingScreen(bool enable)
         {
             _loadingScreen.SetActive(enable);
         }
+        
+        private void OnApplicationFocus(bool hasFocus)
+        {
+#if !UNITY_IOS
+            if (hasFocus)
+            {
+                StartCoroutine(DisableLoadingScreenIfNotLoggingIn());
+            }
+#endif
+        }
+
+        private IEnumerator DisableLoadingScreenIfNotLoggingIn()
+        {
+            yield return new WaitForSecondsRealtime(0.1f);
+            if (!LoginHandler.IsLoggingIn())
+            {
+                EnableLoadingScreen(false);
+            }
+        }
     }
 }

Packages/Sequence-Unity/Sequence/SequenceFrontend/Sprites/Networks/Icons/1284.png

@@ -108,6 +108,9 @@ private void CreateWallet(IValidator validator = null, IAuthenticator authentica
 
         public void ResetSessionId()
         {
+			if (_connectedWalletAddress != null) {
+				return;
+		    }
             _sessionWallet = new EOAWallet();
             _sessionId = IntentDataOpenSession.CreateSessionId(_sessionWallet.GetAddress());
             _intentSender = new IntentSender(new HttpClient(WaaSWithAuthUrl), _sessionWallet, _sessionId, _waasProjectId, _waasVersion);