Merge branch 'master' into Feature/moonbeam

Author: BellringerQuinn

Assets/SequenceSDK/Ethereum/Tests/ABIRegexTests.cs

@@ -32,6 +32,10 @@ public void TestMatchesFunctionName(string input, bool expected)
         [TestCase("functionName(a,)", false)]
         [TestCase("functionName() ", false)]
         [TestCase("function_-123Name()", true)]
+        [TestCase("function_-123Name(int[])", true)]
+        [TestCase("functionName(a[],a)", true)]
+        [TestCase("functionName(a[5],a)", true)]
+        [TestCase("functionName(a[][],a)", true)]
         public void TestMatchesFunctionABI(string input, bool expected)
         {
             bool result = ABIRegex.MatchesFunctionABI(input);

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/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/SequenceSDK/EmbeddedWallet/SequenceLogin.cs

@@ -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);

Packages/Sequence-Unity/Sequence/SequenceSDK/Ethereum/Contract/ABIRegex.cs

@@ -4,7 +4,7 @@ public static class ABIRegex
     {
 
         public const string FunctionNameRegex = @"^[A-Z|a-z|_,-|0-9]+$";
-        public const string FunctionABIRegex = @"^[A-Z|a-z|_,-|0-9]+\(([A-Z|a-z|0-9]+(, *[A-Z|a-z|0-9]+)*)?\)$";
+        public const string FunctionABIRegex = @"^[A-Z|a-z|_,-|0-9]+\(([A-Za-z0-9\[\]]+(, *[A-Za-z0-9\[\]]+)*)?\)$";
 
         public static bool MatchesFunctionName(string input)
         {

Packages/Sequence-Unity/Sequence/SequenceSDK/Relayer/PermissionedMinterTransactionQueuer.cs

@@ -27,7 +27,8 @@ private void HandleMintTokenFailed(string error)
 
         private void OnDestroy()
         {
-            _minter.OnMintTokenFailed -= HandleMintTokenFailed;
+            if (_minter != null)
+                _minter.OnMintTokenFailed -= HandleMintTokenFailed;
         }
 
         public void Enqueue(PermissionedMintTransaction transaction, IMinter minter = null)