From e1bf0875651606fc8990b49b52f53b1dd07efcd0 Mon Sep 17 00:00:00 2001
From: minibits-cash <support@minibits.cash>
Date: Tue, 5 Dec 2023 23:06:36 +0100
Subject: [PATCH] Final small UX tuning

---
 android/app/build.gradle           |  2 +-
 package.json                       |  2 +-
 src/screens/RemoteBackupScreen.tsx |  6 +++---
 src/screens/SendScreen.tsx         | 31 +++++++++++++++++++-----------
 4 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index aa19b335..d216165a 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -102,7 +102,7 @@ android {
         applicationId "com.minibits_wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 25
+        versionCode 26
         versionName "0.1.5"
         ndk { 
             abiFilters 'arm64-v8a', 'x86_64', 'x86', 'armeabi-v7a'
diff --git a/package.json b/package.json
index a37cb7a2..f94c59fc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minibits_wallet",
-  "version": "0.1.5-beta.2",
+  "version": "0.1.5-beta.3",
   "private": true,
   "scripts": {
     "android:clean": "cd android && ./gradlew clean",
diff --git a/src/screens/RemoteBackupScreen.tsx b/src/screens/RemoteBackupScreen.tsx
index b2f829c5..64fe2e40 100644
--- a/src/screens/RemoteBackupScreen.tsx
+++ b/src/screens/RemoteBackupScreen.tsx
@@ -118,7 +118,8 @@ export const RemoteBackupScreen: FC<SettingsStackScreenProps<'RemoteBackup'>> =
           <Card
             style={$card}
             ContentComponent={
-                <>  
+                <>
+                {isLoading && <Loading />} 
                 <FlatList
                     data={mnemonicArray}
                     numColumns={2}
@@ -150,8 +151,7 @@ export const RemoteBackupScreen: FC<SettingsStackScreenProps<'RemoteBackup'>> =
                     />       
                 </View>
             }
-          />
-          {isLoading && <Loading />}
+          />          
         </View>      
         {error && <ErrorModal error={error} />}
         {info && <InfoModal message={info} />}      
diff --git a/src/screens/SendScreen.tsx b/src/screens/SendScreen.tsx
index 845a31c0..449a9a45 100644
--- a/src/screens/SendScreen.tsx
+++ b/src/screens/SendScreen.tsx
@@ -642,7 +642,7 @@ export const SendScreen: FC<WalletStackScreenProps<'Send'>> = observer(
                     gotoWallet={resetState}
                 />
             )}
-            {(transactionStatus === TransactionStatus.PENDING || transactionStatus === TransactionStatus.COMPLETED)  && (
+            {(transactionStatus === TransactionStatus.COMPLETED)  && (
                 <View style={$bottomContainer}>
                     <View style={$buttonContainer}>
                         <Button
@@ -956,7 +956,7 @@ const SelectedMintBlock = observer(function (props: {
     const tokenTextColor = useThemeColor('textDim')
 
   return (
-        <View>            
+        <View style={{flex: 1}}>
             <Card
                 style={$card}
                 heading={'Send from'}
@@ -972,8 +972,9 @@ const SelectedMintBlock = observer(function (props: {
                         separator={'top'}
                     />
                 }
-            /> 
-            <View style={$buttonContainer}>
+            />
+            <View style={$bottomContainer}>
+                <View style={$buttonContainer}>
                 <Button
                     text='QR code'
                     preset='secondary'
@@ -991,7 +992,7 @@ const SelectedMintBlock = observer(function (props: {
                         text='Send to contact'
                         preset='secondary'
                         onPress={props.toggleNostrDMModal}
-                        style={{marginLeft: spacing.medium}}
+                        style={{marginLeft: spacing.small}}
                         LeftAccessory={() => (
                             <Icon
                             icon='faPaperPlane'
@@ -1001,7 +1002,15 @@ const SelectedMintBlock = observer(function (props: {
                         )} 
                     />
                 )}
-            </View>
+                    <Button
+                        preset="secondary"
+                        tx={'common.close'}
+                        onPress={props.gotoWallet}
+                        style={{marginLeft: spacing.small}}
+                    />
+                </View>
+            </View> 
+
         </View>
   )
 })
@@ -1024,15 +1033,15 @@ const SendAsQRCodeBlock = observer(function (props: {
     }
 
   return (
-    <View style={[$bottomModal, {marginHorizontal: spacing.small}]}>
-      <Text text={'Scan to receive'} />
+    <View style={[{marginHorizontal: spacing.small}]}>
+      <Text text={'Scan to receive'} style={{alignSelf: 'center'}}/>
       
             {qrError ? (
                 <ListItem 
-                    text='Could not display QR code.'
-                    subText={qrError.message || ''}
+                    text='Could not display QR code, copy token instead.'
+                    subText={qrError ? qrError.message : ''}
                     leftIcon='faTriangleExclamation'
-                    style={{alignSelf: 'stretch'}}
+                    containerStyle={{marginVertical: spacing.large}}
                     leftIconColor={colors.palette.angry500}
                 />
             ) : (