Align branch with main

minibits-cash · Oct 26, 2023 · f80c3e3 · f80c3e3
1 parent cfb08ae
commit f80c3e3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -102,8 +102,8 @@ android {
         applicationId "com.minibits_wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 18
-        versionName "0.1.3"
+        versionCode 21
+        versionName "0.1.3-tor-beta.6"
         ndk { 
             abiFilters 'arm64-v8a', 'x86_64', 'x86', 'armeabi-v7a'
         } // react-native-tor build

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minibits_wallet",
-  "version": "0.1.3-beta.4",
+  "version": "0.1.3-tor-beta.6",
   "private": true,
   "scripts": {
     "android:clean": "cd android && ./gradlew clean",

diff --git a/src/screens/MintsScreen.tsx b/src/screens/MintsScreen.tsx
@@ -325,12 +325,14 @@ export const MintsScreen: FC<SettingsStackScreenProps<'Mints'>> = observer(funct
                 <Text
                     preset="subheading"
                     tx={'mintsScreen.addMintUrl'}
-                    style={{marginBottom: spacing.medium, textAlign: 'center'}}
+                    // style={{marginBottom: spacing.medium, textAlign: 'center'}}
                 />
-                <View style={{flexDirection: 'row', alignItems: 'center'}}>
+                <View style={{flexDirection: 'row', alignItems: 'center', marginTop: spacing.small}}>
                         <TextInput
                             ref={mintInputRef}
                             onChangeText={mintUrl => setMintUrl(mintUrl)}
+                            autoCapitalize='none'
+                            keyboardType='default'
                             value={mintUrl}
                             style={[$mintInput, {backgroundColor: inputBg}]}
                             maxLength={200}
@@ -376,8 +378,7 @@ export const MintsScreen: FC<SettingsStackScreenProps<'Mints'>> = observer(funct
             </View>
           }
           onBackButtonPress={toggleAddMintModal}
-          onBackdropPress={toggleAddMintModal}
-          top={spacing.screenHeight * 0.35}
+          onBackdropPress={toggleAddMintModal}          
         />
         {error && <ErrorModal error={error} />}
         {info && <InfoModal message={info} />}
@@ -402,9 +403,9 @@ const $contentContainer: TextStyle = {
 }
 
 const $actionCard: ViewStyle = {
-  marginBottom: spacing.extraSmall,
+  marginBottom: spacing.small,
   marginTop: -spacing.extraLarge * 1.5,
-  // padding: 0,
+  minHeight: 70,
 }
 
 const $actionItem: ViewStyle = {
@@ -433,8 +434,8 @@ const $bottomContainer: ViewStyle = {
   alignSelf: 'stretch',
 }
 
-const $bottomModal: ViewStyle = {
-  padding: spacing.small,
+const $bottomModal: ViewStyle = {  
+  alignItems: 'center',
 }
 
 

diff --git a/src/screens/WalletScreen.tsx b/src/screens/WalletScreen.tsx
@@ -103,8 +103,8 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
                     setUpdateSize(`${round(update.packageSize *  0.000001, 2)}MB`)                  
                     setIsUpdateAvailable(true)
                     toggleUpdateModal()
-                }
-                log.trace('update', update, 'checkForUpdate')
+                    log.info('OTA Update available', update, 'checkForUpdate')
+                }                
             } catch (e: any) {                
                 return false // silent
             }            
@@ -116,6 +116,7 @@ export const WalletScreen: FC<WalletScreenProps> = observer(
 
 
     const handleBinaryVersionMismatchCallback = function(update: RemotePackage) {
+        log.info('Native update available', update)
         setIsNativeUpdateAvailable(true)
         toggleUpdateModal()
     }