Fix bottom tabs

android/app/build.gradle

@@ -95,7 +95,7 @@ android {
         applicationId "com.minibits_wallet"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 58036
+        versionCode 58037
         versionName "0.2.2"
     }
 

dist/BUNDLE_ID

@@ -0,0 +1 @@
+01965a3e-543a-7328-be93-2e6f26f2a7ee

ios/Podfile.lock

@@ -59,9 +59,9 @@ PODS:
   - GoogleUtilities/UserDefaults (8.0.2):
     - GoogleUtilities/Logger
     - GoogleUtilities/Privacy
-  - hermes-engine (0.79.0-rc.3):
-    - hermes-engine/Pre-built (= 0.79.0-rc.3)
-  - hermes-engine/Pre-built (0.79.0-rc.3)
+  - hermes-engine (0.79.0):
+    - hermes-engine/Pre-built (= 0.79.0)
+  - hermes-engine/Pre-built (0.79.0)
   - HotUpdater (0.16.0):
     - DoubleConversion
     - glog
@@ -104,7 +104,7 @@ PODS:
     - nanopb/encode (= 3.30910.0)
   - nanopb/decode (3.30910.0)
   - nanopb/encode (3.30910.0)
-  - OpenSSL-Universal (3.3.3000)
+  - OpenSSL-Universal (3.3.3001)
   - PromisesObjC (2.4.0)
   - RCT-Folly (2024.11.18.00):
     - boost
@@ -2677,11 +2677,11 @@ SPEC CHECKSUMS:
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
-  hermes-engine: 222573b97e0c0023ee02f5a8480d6aa3080ceb3f
+  hermes-engine: cd4bd90f051e3658c83cc00e87c603dfe1b75947
   HotUpdater: 3f457ec8e209a7060a1403d6d523ef159eb016f8
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
-  OpenSSL-Universal: d776ce24dab24323e6995dfb17c64d598885d05c
+  OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
   RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82
   RCTDeprecation: c147f8912f768e5eedbc5f115b2b223d007d9fe3

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 = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				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 = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = GR2ZKMCLAM;
 				INFOPLIST_FILE = minibits_wallet/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = Minibits;

ios/minibits_wallet/AppDelegate.swift

@@ -48,7 +48,7 @@ class ReactNativeDelegate: RCTDefaultReactNativeFactoryDelegate {
     RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
 #else
     Bundle.main.url(forResource: "main", withExtension: "jsbundle")
-    HotUpdater.bundleURL()
+    return HotUpdater.bundleURL()
 #endif
   }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "minibits_wallet",
-  "version": "0.2.2-beta.6",
+  "version": "0.2.2-beta.7",
   "private": true,
   "scripts": {
     "android:clean": "cd android && ./gradlew clean",

src/navigation/TabsNavigator.tsx

@@ -38,8 +38,6 @@ import {
   NwcScreen,
 } from "../screens"
 import { colors, spacing, typography } from "../theme"
-import { moderateVerticalScale } from "@gocodingnow/rn-size-matters"
-import { initialWindowMetrics } from "react-native-safe-area-context"
 
 const $tabBar: ViewStyle = {  
   borderTopColor: 'transparent',
@@ -48,10 +46,7 @@ const $tabBar: ViewStyle = {
 }
 
 const $tabBarItem = {
-  paddingTop: spacing.small,
-  android_ripple: {
-    radius: 20
-  }
+  paddingVertical: spacing.small,
 }
 
 const $tabBarLabel: TextStyle = {
@@ -153,25 +148,23 @@ declare global {
   }
 }
 
-
 export const TabsNavigator = createBottomTabNavigator({
   initialRouteName: "WalletNavigator",
   backBehavior: 'firstRoute',
   screenOptions: {
     headerShown: false,
     tabBarHideOnKeyboard: true,
-    tabBarStyle: [$tabBar, { height: 70 + initialWindowMetrics?.insets.bottom }],
-    tabBarItemStyle: $tabBarItem,
+    tabBarShowLabel: false,
+    tabBarStyle: [$tabBar, { 
+      marginBottom: spacing.medium
+    }],
+    tabBarItemStyle: [$tabBarItem, {}],
     tabBarLabelStyle: $tabBarLabel,    
     animation: 'shift',
     tabBarButton: (props) => (
       <PlatformPressable
         {...props}
-        android_ripple={{ 
-          color: colors.light.tabActiveIcon,
-          radius: 45,
-          borderless: true
-        }}
+        android_ripple={{color: 'transparent'}}       
       />
     ),   
   },

src/screens/Transactions/TransactionListItem.tsx

@@ -103,10 +103,7 @@ export const TransactionListItem = observer(function (props: TransactionListProp
     switch (tx.status) {
       case TransactionStatus.COMPLETED:
         return (
-          timeAgo +
-          translate('transactionCommon.status.completedFee', {
-            fee: (tx.fee && tx.fee > 0) ? ' · Fee ' + tx.fee : '',
-          })
+          timeAgo + (tx.fee && tx.fee > 0) ? ' · Fee ' + tx.fee : ''          
         )
       case TransactionStatus.DRAFT:
         return timeAgo + translate('transactionCommon.status.draft')