From 35b931f478745be4cf148249eff7c257175093a4 Mon Sep 17 00:00:00 2001
From: N3TC4T <netcat.av@gmail.com>
Date: Wed, 27 Nov 2024 22:25:15 +0100
Subject: [PATCH] fix: small bugs

---
 src/screens/Home/HomeView.tsx  | 6 +++---
 src/screens/Home/styles.tsx    | 8 +++++---
 src/services/AccountService.ts | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/screens/Home/HomeView.tsx b/src/screens/Home/HomeView.tsx
index e02b55007..df845e917 100644
--- a/src/screens/Home/HomeView.tsx
+++ b/src/screens/Home/HomeView.tsx
@@ -299,13 +299,13 @@ class HomeView extends Component<Props, State> {
                         small
                         testID="request-button"
                         containerStyle={
-                            experimentalUI ? styles.requestButtonContainerGrey : styles.requestButtonContainer
+                            experimentalUI ? styles.requestButtonContainerClean : styles.requestButtonContainer
                         }
                         icon="IconCornerRightDown"
                         iconSize={18}
-                        iconStyle={styles.requestButtonIcon}
+                        iconStyle={experimentalUI ? styles.requestButtonIconClean : styles.requestButtonIcon}
                         label={Localize.t('global.request')}
-                        textStyle={styles.requestButtonText}
+                        textStyle={experimentalUI ? styles.requestButtonTextClean : styles.requestButtonText}
                         onPress={this.onShowAccountQRPress}
                     />
                 </View>
diff --git a/src/screens/Home/styles.tsx b/src/screens/Home/styles.tsx
index 32f4086b6..ce7a6b54a 100644
--- a/src/screens/Home/styles.tsx
+++ b/src/screens/Home/styles.tsx
@@ -44,13 +44,15 @@ const styles = StyleService.create({
         backgroundColor: '$green',
     },
 
-    requestButtonIcon: { tintColor: '$textPrimary' },
-    requestButtonText: { fontSize: AppFonts.base.size, color: '$textPrimary' },
+    requestButtonIcon: { tintColor: '$white' },
+    requestButtonText: { fontSize: AppFonts.base.size, color: '$white' },
 
-    requestButtonContainerGrey: {
+    requestButtonContainerClean: {
         marginLeft: 15,
         backgroundColor: '$tint',
     },
+    requestButtonIconClean: { tintColor: '$textPrimary' },
+    requestButtonTextClean: { fontSize: AppFonts.base.size, color: '$textPrimary' },
 
     QRButtonText: { fontSize: AppFonts.base.size },
 
diff --git a/src/services/AccountService.ts b/src/services/AccountService.ts
index 4b3030370..cea121760 100644
--- a/src/services/AccountService.ts
+++ b/src/services/AccountService.ts
@@ -57,7 +57,7 @@ class AccountService extends EventEmitter {
         return new Promise<void>((resolve, reject) => {
             try {
                 // set current default account
-                this.account = settings.account.address;
+                this.account = settings.account?.address;
 
                 // list for any default account change
                 CoreRepository.on('updateSettings', this.onSettingsUpdate);