From 0ecd9d7813bf69c40386c616181069a83fd56932 Mon Sep 17 00:00:00 2001
From: minibits-cash <mail@minibits.cash>
Date: Thu, 17 Apr 2025 12:19:51 +0200
Subject: [PATCH] UX improvements

---
 ios/minibits_wallet.xcodeproj/project.pbxproj |  4 ++--
 .../xcschemes/minibits_wallet.xcscheme        |  2 +-
 src/screens/Mints/MintBalanceSelector.tsx     | 21 +++++++++++++++++--
 src/screens/SendScreen.tsx                    |  6 +++---
 src/screens/WalletScreen.tsx                  |  1 +
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ios/minibits_wallet.xcodeproj/project.pbxproj b/ios/minibits_wallet.xcodeproj/project.pbxproj
index d0fac238..e9611c8c 100644
--- a/ios/minibits_wallet.xcodeproj/project.pbxproj
+++ b/ios/minibits_wallet.xcodeproj/project.pbxproj
@@ -301,7 +301,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = GR2ZKMCLAM;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = minibits_wallet/Info.plist;
@@ -336,7 +336,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = minibits_wallet/minibits_wallet.entitlements;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = GR2ZKMCLAM;
 				INFOPLIST_FILE = minibits_wallet/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Minibits;
diff --git a/ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme b/ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme
index 9a1b755f..72677cb8 100644
--- a/ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme
+++ b/ios/minibits_wallet.xcodeproj/xcshareddata/xcschemes/minibits_wallet.xcscheme
@@ -31,7 +31,7 @@
       shouldAutocreateTestPlan = "YES">
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
diff --git a/src/screens/Mints/MintBalanceSelector.tsx b/src/screens/Mints/MintBalanceSelector.tsx
index f379f41d..822b34f7 100644
--- a/src/screens/Mints/MintBalanceSelector.tsx
+++ b/src/screens/Mints/MintBalanceSelector.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from "react"
 import { FlatList, Keyboard, LayoutAnimation, Platform, View, ViewStyle } from "react-native"
 import { observer } from "mobx-react-lite"
-import { Button, Card} from "../../components"
+import { Button, Card, Icon, IconTypes} from "../../components"
 import { spacing, useThemeColor } from "../../theme"
 import { MintBalance } from "../../models/Mint"
 import { MintUnit } from "../../services/wallet/currency"
@@ -16,7 +16,10 @@ export const MintBalanceSelector = observer(function (props: {
     unit: MintUnit
     title: string
     confirmTitle: string
+    confirmIcon?: IconTypes
     secondaryConfirmTitle?: string
+    secondaryConfirmIcon?: IconTypes
+    cancelIcon?: IconTypes
     collapsible?: boolean
     onMintBalanceSelect: any
     onSecondaryMintBalanceSelect?: any
@@ -74,7 +77,8 @@ export const MintBalanceSelector = observer(function (props: {
       return props.onMintBalanceSelect(balance)
     }
     
-    const buttonSecondaryBg = useThemeColor("buttonSecondaryPressed")
+    
+    const secondaryIconColor = useThemeColor("textDim")
   
     return (
       <View style={{flex: 1}}>
@@ -123,6 +127,11 @@ export const MintBalanceSelector = observer(function (props: {
               {props.secondaryConfirmTitle && (
                 <Button
                   text={props.secondaryConfirmTitle}
+                  LeftAccessory={() =>
+                    (props.secondaryConfirmIcon && (
+                      <Icon icon={props.secondaryConfirmIcon} color={secondaryIconColor} size={spacing.medium}/>
+                    ))
+                  }
                   preset="secondary"
                   onPress={props.onSecondaryMintBalanceSelect}
                   style={{marginRight: spacing.medium}}          
@@ -130,12 +139,20 @@ export const MintBalanceSelector = observer(function (props: {
               )}
               <Button
                 text={props.confirmTitle}
+                LeftAccessory={() =>
+                  <Icon icon={props.confirmIcon ? props.confirmIcon : 'faCheckCircle'} color="white" size={spacing.medium}/>
+                }
                 onPress={props.onMintBalanceConfirm}
                 style={{marginRight: spacing.medium}}          
               />
 
               <Button
                 preset="secondary"
+                LeftAccessory={() =>
+                  (props.cancelIcon && (
+                    <Icon icon={props.cancelIcon} color={secondaryIconColor} size={spacing.medium}/>
+                  ))
+                }
                 tx={'common.cancel'}
                 onPress={props.onCancel}
               />
diff --git a/src/screens/SendScreen.tsx b/src/screens/SendScreen.tsx
index dd076f46..ab3f2619 100644
--- a/src/screens/SendScreen.tsx
+++ b/src/screens/SendScreen.tsx
@@ -1005,11 +1005,11 @@ const togglePubkeySelectorModal = () => setIsPubkeySelectorModalVisible(previous
                     selectedMintBalance={mintBalanceToSendFrom as MintBalance}
                     unit={unitRef.current}
                     title='Send from mint'
-                    confirmTitle={isOfflineSend ? 'Send offline' : 'Create token'}
-                    secondaryConfirmTitle='Lock'
+                    confirmTitle={isOfflineSend ? 'Send offline' : 'Create token'}                    
+                    secondaryConfirmTitle='Lock'                    
                     onMintBalanceSelect={onMintBalanceSelect}
                     onSecondaryMintBalanceSelect={onLockPubkeyStart}
-                    onCancel={onMintBalanceCancel}              
+                    onCancel={onMintBalanceCancel}                                           
                     onMintBalanceConfirm={isOfflineSend ? onSelectProofsOffline : onMintBalanceConfirm}
                 />
             )}
diff --git a/src/screens/WalletScreen.tsx b/src/screens/WalletScreen.tsx
index bd2fa7cb..eef1a1c4 100644
--- a/src/screens/WalletScreen.tsx
+++ b/src/screens/WalletScreen.tsx
@@ -696,6 +696,7 @@ export const WalletScreen = observer(function WalletScreen({ route }: Props) {
                                 height={spacing.large} 
                                 xml={ScanIcon}
                                 fill={mainButtonIcon}
+                                style={{marginLeft: -spacing.tiny}}
                             />
                         )}
                         onPress={gotoScan}