Update MetaMask SDK to 1.2.2 (#142)

Co-authored-by: 0xFirekeeper <0xFirekeeper@gmail.com>

Author: ecp4224

Assets/Thirdweb/Core/Prefabs/WalletProvider_Metamask.prefab

@@ -31,7 +31,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2438333664808875362}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -107,7 +106,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2438333664808875362}
-  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -185,7 +183,6 @@ RectTransform:
   - {fileID: 5780280198508624836}
   - {fileID: 3246246231219207936}
   m_Father: {fileID: 2438333664808875362}
-  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -259,14 +256,14 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3503421935870801903}
+  serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2438333664808875362}
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &228276015862408994
 MonoBehaviour:
@@ -285,6 +282,7 @@ MonoBehaviour:
   DeepLinkButton: {fileID: 4160231591218546103}
   OTPPanel: {fileID: 1978744874944535028}
   OTPText: {fileID: 9175537191550043107}
+  OTPHeaderText: {fileID: 6388212339867805453}
 --- !u!114 &3873553887018070327
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -322,8 +320,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   config: {fileID: 11400000, guid: 6cbb8289bcfbdba43817188b3b4f15e0, type: 2}
-  initializeOnAwake: 1
+  initializeOnAwake: 0
   _transport: {fileID: 11400000, guid: 2794b8de755b55048bc6f0544321e072, type: 2}
+  InfuraProjectId: 
   RpcUrl: []
   clearSessionData: 0
 --- !u!114 &4671479922431115845
@@ -383,7 +382,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6025360505761643383}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -518,7 +516,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4654996450284410679}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -656,7 +653,6 @@ RectTransform:
   m_Children:
   - {fileID: 1016137851376285130}
   m_Father: {fileID: 2438333664808875362}
-  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -788,7 +784,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2438333664808875362}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -871,7 +866,6 @@ RectTransform:
   - {fileID: 2932539567639123612}
   - {fileID: 4654996450284410679}
   m_Father: {fileID: 3503421935870801902}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -895,7 +889,9 @@ Canvas:
   m_OverrideSorting: 0
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 25
+  m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
   m_SortingOrder: 1
   m_TargetDisplay: 0
@@ -970,7 +966,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2932539567639123612}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -1105,7 +1100,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 4654996450284410679}
-  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1242,7 +1236,6 @@ RectTransform:
   m_Children:
   - {fileID: 5381113169963213877}
   m_Father: {fileID: 2438333664808875362}
-  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}

Assets/Thirdweb/Core/Scripts/Wallets/ThirdwebMetamask.cs

@@ -1,5 +1,6 @@
 using System.Numerics;
 using System.Threading.Tasks;
+using MetaMask;
 using MetaMask.NEthereum;
 using MetaMask.Unity;
 using Nethereum.Web3;
@@ -11,6 +12,25 @@ namespace Thirdweb.Wallets
 {
     public class ThirdwebMetamask : IThirdwebWallet
     {
+        public class MetaMaskThirdwebConfig : MetaMaskConfig
+        {
+            public void SetDefaults(MetaMaskConfig defaults)
+            {
+                this.encrypt = defaults.Encrypt;
+                this.log = defaults.Log;
+                this.encryptionPassword = defaults.EncryptionPassword;
+                this.userAgent = defaults.UserAgent;
+                this.sessionIdentifier = defaults.SessionIdentifier;
+                this.socketUrl = defaults.SocketUrl;
+            }
+
+            public void UpdateConfig(string appName, string appUrl)
+            {
+                this.appName = appName;
+                this.appUrl = appUrl;
+            }
+        }
+        
         private Web3 _web3;
         private readonly WalletProvider _provider;
         private readonly WalletProvider _signerProvider;
@@ -28,12 +48,27 @@ public async Task<string> Connect(WalletConnection walletConnection, string rpc)
             {
                 GameObject.Instantiate(ThirdwebManager.Instance.MetamaskPrefab);
                 await new WaitForSeconds(1f);
+                SetupMetaMask();
             }
             await MetamaskUI.Instance.Connect();
             _web3 = MetaMaskUnity.Instance.CreateWeb3();
             return await GetAddress();
         }
 
+        private void SetupMetaMask()
+        {
+            var config = ScriptableObject.CreateInstance<MetaMaskThirdwebConfig>();
+            var defaults = MetaMaskConfig.DefaultInstance;
+
+            config.SetDefaults(defaults);
+
+            var appName = ThirdwebManager.Instance.SDK.session.Options.wallet?.appName;
+            var appUrl = ThirdwebManager.Instance.SDK.session.Options.wallet?.appUrl;
+            config.UpdateConfig(appName, appUrl);
+            
+            MetaMaskUnity.Instance.Initialize(config);
+        }
+
         public Task Disconnect()
         {
             MetaMaskUnity.Instance.Disconnect(true);

Assets/Thirdweb/Core/Scripts/WalletsUI/MetamaskUI.cs

@@ -19,6 +19,7 @@ public class MetamaskUI : MonoBehaviour, IMetaMaskUnityTransportListener
         public Button DeepLinkButton;
         public GameObject OTPPanel;
         public TMP_Text OTPText;
+        public TMP_Text OTPHeaderText;
 
         public static MetamaskUI Instance;
 
@@ -150,7 +151,20 @@ public void OnMetaMaskSuccess()
         public void OnMetaMaskOTP(int otp)
         {
             OTPPanel.SetActive(true);
-            OTPText.text = otp.ToString();
+
+            var shouldShowOtpCode = DateTime.Now - MetaMaskUnity.Instance.Wallet.LastActive >= TimeSpan.FromHours(1);
+
+            // They simply need to press resume in the app
+            OTPText.gameObject.SetActive(shouldShowOtpCode);
+            
+            if (shouldShowOtpCode)
+            {
+                OTPText.text = otp.ToString();
+            }
+            else
+            {
+                OTPHeaderText.text = "Open the MetaMask app to continue with your session.";
+            }
         }
 
         public void OnMetaMaskDisconnected()