Merge branch 'master' into feature/minting-nft-arbitrum

NextGenSoftwareUK · Sep 1, 2024 · 1eafc76 · 1eafc76
2 parents 33c7b53 + 6d751cf
commit 1eafc76
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/NextGenSoftware.OASIS.API.Providers.ArbitrumOASIS.TestHarness/Program.cs b/NextGenSoftware.OASIS.API.Providers.ArbitrumOASIS.TestHarness/Program.cs
@@ -269,10 +269,8 @@ private static async Task Main(string[] args)
             Console.WriteLine("NextGenSoftware.OASIS.API.Providers.ArbitrumOASIS - TEST HARNESS");
 
             // TODO: Uncomment one of example method to start testing ethereum provider CRUD
+            await ExecuteAvatarProviderExample(_contractAddress);
             // await ExecuteAvatarProviderExample(_contractAddress);
-            // await ExecuteAvatarProviderExample(_contractAddress);
-            // await ExecuteHolonProviderExample(_contractAddress);
-
             await ExecuteMintNftExample();
             await ExecuteSendNFTExample();
         }

diff --git a/NextGenSoftware.OASIS.STAR.CLI.Lib/STARCLI.cs b/NextGenSoftware.OASIS.STAR.CLI.Lib/STARCLI.cs
@@ -768,7 +768,7 @@ public static async Task BeamInAvatar()
                     CLIEngine.ShowErrorMessage("Error Beaming In. Username/Password may be incorrect.");
             }
 
-            CLIEngine.ShowSuccessMessage(string.Concat("Successfully Beamed In! Welcome back ", STAR.BeamedInAvatar.Username, ". Have a nice day! :) You Are Level ", STAR.BeamedInAvatarDetail.Level, " And Have ", STAR.BeamedInAvatarDetail.Karma, " Karma."));
+            //CLIEngine.ShowSuccessMessage(string.Concat("Successfully Beamed In! Welcome back ", STAR.BeamedInAvatar.Username, ". Have a nice day! :) You Are Level ", STAR.BeamedInAvatarDetail.Level, " And Have ", STAR.BeamedInAvatarDetail.Karma, " Karma."));
             //ShowAvatarStats();
             //await ReadyPlayerOne();
         }

diff --git a/NextGenSoftware.OASIS.STAR/OASISAPIManager/OASISAPIManager.cs b/NextGenSoftware.OASIS.STAR/OASISAPIManager/OASISAPIManager.cs
@@ -115,8 +115,8 @@ private void InitOASIS(bool startApolloServer = true)
 
             LogAvatarIntoOASISManagers();
 
-            if (startApolloServer)
-                ApolloServer.StartServer();
+            //if (startApolloServer)
+            //    ApolloServer.StartServer();
 
             IsOASISBooted = true;
 

diff --git a/NextGenSoftware.OASIS.STAR/Star.cs b/NextGenSoftware.OASIS.STAR/Star.cs
@@ -486,12 +486,13 @@ public static async Task<OASISResult<IAvatar>> BeamInAsync(string username, stri
                 BeamedInAvatar = (Avatar)result.Result;
                 OASISAPI.LogAvatarIntoOASISManagers(); //TODO: Is there a better way of doing this?
 
-                OASISResult<IAvatarDetail> loggedInAvatarDetailResult = await OASISAPI.Avatar.LoadAvatarDetailAsync(BeamedInAvatar.Id);
+                //TODO: Fix later! Gifts property de-serialiazed issue in MongoDBOASIS
+                //OASISResult<IAvatarDetail> loggedInAvatarDetailResult = await OASISAPI.Avatar.LoadAvatarDetailAsync(BeamedInAvatar.Id);
 
-                if (!loggedInAvatarDetailResult.IsError && loggedInAvatarDetailResult.Result != null)
-                    BeamedInAvatarDetail = loggedInAvatarDetailResult.Result;
-                else
-                    OASISErrorHandling.HandleError(ref result, $"Error Occured In BeamInAsync Calling LoadAvatarDetailAsync. Reason: {loggedInAvatarDetailResult.Message}");
+                //if (!loggedInAvatarDetailResult.IsError && loggedInAvatarDetailResult.Result != null)
+                //    BeamedInAvatarDetail = loggedInAvatarDetailResult.Result;
+                //else
+                //    OASISErrorHandling.HandleError(ref result, $"Error Occured In BeamInAsync Calling LoadAvatarDetailAsync. Reason: {loggedInAvatarDetailResult.Message}");
             }
 
             return result;