From 72860fe494a543e3d8bf569cdb5f5706376e38b3 Mon Sep 17 00:00:00 2001
From: Tian L <60599517+tian-lt@users.noreply.github.com>
Date: Fri, 18 Feb 2022 21:57:24 +0800
Subject: [PATCH] Fixes a bug: currency converter never shows error message for
 service failures (#1799)

* check status before registering callback

* optimize the style for error msg
---
 src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp | 3 +--
 src/Calculator/Views/UnitConverter.xaml              | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
index 0eb32714..91429e6e 100644
--- a/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
+++ b/src/CalcViewModel/DataLoaders/CurrencyDataLoader.cpp
@@ -188,10 +188,9 @@ void CurrencyDataLoader::ResetLoadStatus()
 #pragma optimize("", off) // Turn off optimizations to work around DevDiv 393321
 void CurrencyDataLoader::LoadData()
 {
-    RegisterForNetworkBehaviorChanges();
-
     if (!LoadFinished())
     {
+        RegisterForNetworkBehaviorChanges();
         create_task([this]() -> task<bool> {
             vector<function<future<bool>()>> loadFunctions = {
                 [this]() { return TryLoadDataFromCacheAsync(); },
diff --git a/src/Calculator/Views/UnitConverter.xaml b/src/Calculator/Views/UnitConverter.xaml
index 455161a9..58b65afb 100644
--- a/src/Calculator/Views/UnitConverter.xaml
+++ b/src/Calculator/Views/UnitConverter.xaml
@@ -673,9 +673,8 @@
                                 </ResourceDictionary>
                             </HyperlinkButton.Resources>
                         </HyperlinkButton>
-                        <TextBlock Margin="3,7,0,0" Style="{ThemeResource CaptionTextBlockStyle}">
+                        <TextBlock Margin="3,6,0,0" Style="{ThemeResource CaptionTextBlockStyle}">
                             <Run x:Name="CurrencySecondaryStatus"
-                                 FontWeight="SemiBold"
                                  Text=""/>
                         </TextBlock>
                     </StackPanel>