Merge pull request #6 from RemarkableTools/dev

Dev to main
RemarkableTools · Jan 31, 2023 · f5142ac · f5142ac
2 parents 066621f + 7e343c9
commit f5142ac
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -365,3 +365,4 @@ FodyWeavers.xsd
 # other
 desktop.ini
 TestResults
+Console Testing
diff --git a/Mx.NET.SDK.sln b/Mx.NET.SDK.sln
@@ -25,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mx.NET.SDK.Core", "src\Mx.N
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mx.NET.SDK.Wallet", "src\Mx.NET.SDK.Wallet\Mx.NET.SDK.Wallet.csproj", "{2FEB9B6A-04A7-4840-8770-BB01B02E41D8}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Console Testing", "tests\Console Testing\Console Testing.csproj", "{66FB4DED-F523-46FE-AEB9-5A4AD284214D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -47,6 +49,10 @@ Global
 		{2FEB9B6A-04A7-4840-8770-BB01B02E41D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2FEB9B6A-04A7-4840-8770-BB01B02E41D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2FEB9B6A-04A7-4840-8770-BB01B02E41D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{66FB4DED-F523-46FE-AEB9-5A4AD284214D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{66FB4DED-F523-46FE-AEB9-5A4AD284214D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{66FB4DED-F523-46FE-AEB9-5A4AD284214D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{66FB4DED-F523-46FE-AEB9-5A4AD284214D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -56,6 +62,7 @@ Global
 		{149FA3CD-11A5-4402-A923-4F8B87F894A6} = {DF07F928-D972-4F69-9E8C-E6EA16C25BF3}
 		{DD5C9C0D-E6A7-4327-84F1-9B5021B7F5A2} = {D56A890E-8033-4A93-87CF-586BA916BC07}
 		{2FEB9B6A-04A7-4840-8770-BB01B02E41D8} = {D56A890E-8033-4A93-87CF-586BA916BC07}
+		{66FB4DED-F523-46FE-AEB9-5A4AD284214D} = {DF07F928-D972-4F69-9E8C-E6EA16C25BF3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9B29FC9F-BF63-432E-8920-99FBCE6DA974}

diff --git a/src/Mx.NET.SDK/Domain/Data/Common/Transaction.cs b/src/Mx.NET.SDK/Domain/Data/Common/Transaction.cs
@@ -85,7 +85,7 @@ public static Transfer[] From(TransferDto[] transfers)
                 Decimals = transfer.Decimals,
                 Identifier = transfer.Identifier is null ? null : ESDTIdentifierValue.From(transfer.Identifier),
                 Value = ESDTAmount.From(transfer.Value,
-                                        ESDT.ESDT_TOKEN(transfer.Type, transfer.Name, transfer.Identifier, transfer.Decimals ?? 0))
+                                        ESDT.ESDT_TOKEN(transfer.Type, transfer.Name, transfer.Identifier ?? transfer.Token, transfer.Decimals ?? 0))
             }).ToArray();
         }
     }

diff --git a/src/Mx.NET.SDK/Mx.NET.SDK.csproj b/src/Mx.NET.SDK/Mx.NET.SDK.csproj
@@ -11,7 +11,7 @@
     <RepositoryUrl>https://github.com/RemarkableTools/Mx.NET.SDK</RepositoryUrl>
     <RepositoryType>GitHub</RepositoryType>
     <Company>Remarkable Tools</Company>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Title>RemarkableTools.Mx</Title>
     <PackageReadmeFile>README.md</PackageReadmeFile>