From fd77a005a05a0a46cf7b2ff5c99b82c0cadaf4f8 Mon Sep 17 00:00:00 2001
From: Tian L <60599517+tian-lt@users.noreply.github.com>
Date: Wed, 26 May 2021 14:38:44 +0800
Subject: [PATCH 1/2] **BYPASS_SECRET_SCANNING** (#1546)


From 3c69bf14540f13e72cbaa5e45dae93e86f811980 Mon Sep 17 00:00:00 2001
From: Tian L <60599517+tian-lt@users.noreply.github.com>
Date: Wed, 26 May 2021 16:31:43 +0800
Subject: [PATCH 2/2] Fixes a bug about the UI of expression tokens (#1547)

* fix
---
 src/Calculator/Converters/ExpressionItemTemplateSelector.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Calculator/Converters/ExpressionItemTemplateSelector.cs b/src/Calculator/Converters/ExpressionItemTemplateSelector.cs
index c2c3d55f..772d9455 100644
--- a/src/Calculator/Converters/ExpressionItemTemplateSelector.cs
+++ b/src/Calculator/Converters/ExpressionItemTemplateSelector.cs
@@ -12,7 +12,7 @@ namespace CalculatorApp
         [Windows.UI.Xaml.Data.Bindable]
         public sealed class ExpressionItemTemplateSelector : Windows.UI.Xaml.Controls.DataTemplateSelector
         {
-            protected override DataTemplate SelectTemplateCore(object item)
+            protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
             {
                 DisplayExpressionToken token = (item as DisplayExpressionToken);
                 if (token != null)