Wert clickId added (#33)

atomex-me · May 18, 2021 · 69e1b0b · 69e1b0b
1 parent a3682d3
commit 69e1b0b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/atomex.Android/Properties/AndroidManifest.xml b/atomex.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8" package="com.atomex.android" android:versionCode="13">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.8.1" package="com.atomex.android" android:versionCode="14">
 	<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="29" />
 	<application android:label="Atomex" android:allowBackup="false" android:icon="@drawable/ic_launcher">
 		<meta-data android:name="com.google.firebase.messaging.default_notification_icon" android:resource="@drawable/ic_notification" />

diff --git a/atomex.client.core b/atomex.client.core
diff --git a/atomex.iOS/Info.plist b/atomex.iOS/Info.plist
@@ -24,7 +24,7 @@
 	<key>CFBundleIdentifier</key>
 	<string>com.atomex.ios</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.0</string>
+	<string>1.8.1</string>
 	<key>UILaunchStoryboardName</key>
 	<string>AtomexLaunchScreen</string>
 	<key>CFBundleName</key>

diff --git a/atomex/ViewModel/BuyViewModel.cs b/atomex/ViewModel/BuyViewModel.cs
@@ -2,7 +2,9 @@
 using System.Linq;
 using System.Windows.Input;
 using Atomex;
+using Atomex.Common;
 using Atomex.Core;
+using Atomex.Cryptography;
 using Xamarin.Essentials;
 using Xamarin.Forms;
 
@@ -29,9 +31,9 @@ public Network Network
                 _network = value;
 
                 if (_network == Network.MainNet)
-                    Url = $"https://widget.wert.io/?partner_id=atomex&theme={_appTheme}";
+                    Url = $"https://widget.wert.io/atomex/widget?click_id=user:{_userId}/network:{_network}&theme={_appTheme}";
                 else
-                    Url = $"https://sandbox.wert.io/?partner_id=01F298K3HP4DY326AH1NS3MM3M&theme={_appTheme}";
+                    Url = $"https://sandbox.wert.io/01F298K3HP4DY326AH1NS3MM3M/widget?click_id=user:{_userId}/network:{_network}&theme={_appTheme}";
 
                 OnPropertyChanged(nameof(Network));
             }
@@ -44,6 +46,8 @@ public string Url
             set { _url = value; OnPropertyChanged(nameof(Url)); }
         }
 
+        private string _userId;
+
         private string _appTheme;
 
         private string[] _redirectedUrls = { "https://widget.wert.io/terms-and-conditions",
@@ -56,6 +60,7 @@ public BuyViewModel(IAtomexApp app, string appTheme)
         {
             AtomexApp = app ?? throw new ArgumentNullException(nameof(AtomexApp));
             IsLoading = true;
+            _userId = GetUserId();
             _appTheme = appTheme;
             Network = app.Account.Network;
         }
@@ -73,6 +78,13 @@ private void CanExecute(WebNavigatingEventArgs args)
                 args.Cancel = true;
             }
         }
+
+        private string GetUserId()
+        {
+            using var servicePublicKey = AtomexApp.Account.Wallet.GetServicePublicKey(AtomexApp.Account.UserSettings.AuthenticationKeyIndex);
+            using var publicKey = servicePublicKey.ToUnsecuredBytes();
+            return Sha256.Compute(Sha256.Compute(publicKey)).ToHexString();
+        }
     }
 }
+6 −3		Atomex.Client.Core.Tests/Atomex.Client.Core.Tests.csproj
+4 −2		Atomex.Client.Core.Tests/BitcoinBased/BitcoinBasedCommon.cs
+14 −8		Atomex.Client.Core.Tests/BitcoinBased/BitcoinBasedTests.cs
+9 −9		Atomex.Client.Core/Atomex.Client.Core.csproj
+7 −3		Atomex.Client.Core/Blockchain/BitcoinBased/BitcoinBasedTransaction.cs
+3 −0		Atomex.Client.Core/Common/AmountHelper.cs
+17 −9		Atomex.Client.Core/Common/Configuration/ConfigurationBuilderExtensions.cs
+0 −35		Atomex.Client.Core/Common/Configuration/EmbeddedFileInfo.cs
+0 −39		Atomex.Client.Core/Common/Configuration/EmbeddedFileProvider.cs
+0 −33		Atomex.Client.Core/Common/Configuration/StringProvider.cs
+12 −6		Atomex.Client.Core/Currencies/BitcoinBasedCurrency.cs
+9 −2		Atomex.Client.Core/Currencies/CurrenciesProvider.cs
+1 −1		Atomex.Client.Core/Subsystems/CurrenciesUpdater.cs
+1 −1		Atomex.Client.Core/Subsystems/SymbolsUpdater.cs
+10 −4		Atomex.Client.Core/Swaps/BitcoinBased/BitcoinBasedSwapTransactionFactory.cs
+2 −0		Atomex.Client.Core/Wallet/Abstract/IAccount.cs
+9 −0		Atomex.Client.Core/Wallet/Account.cs