Merge pull request #3290 from bithyve/dev

Build 257

App.tsx

@@ -1,11 +1,10 @@
 import * as Sentry from '@sentry/react-native';
 
-import { LogBox, Platform, StatusBar, UIManager } from 'react-native';
+import { LogBox, Platform, UIManager } from 'react-native';
 import React, { ReactElement, useEffect } from 'react';
 
 import { GestureHandlerRootView } from 'react-native-gesture-handler';
-import LinearGradient from 'react-native-linear-gradient';
-import { NativeBaseProvider } from 'native-base';
+import { NativeBaseProvider, StatusBar } from 'native-base';
 import { PersistGate } from 'redux-persist/integration/react';
 import { Provider } from 'react-redux';
 import { withIAPContext, initConnection, endConnection } from 'react-native-iap';
@@ -44,16 +43,9 @@ function App() {
     };
   }, []);
 
-  // linear-gradient configs for NativeBase
-  const config = {
-    dependencies: {
-      'linear-gradient': LinearGradient,
-    },
-  };
-
   return (
     <GestureHandlerRootView style={{ flex: 1 }}>
-      <NativeBaseProvider theme={customTheme} config={config}>
+      <NativeBaseProvider theme={customTheme}>
         <StatusBar translucent backgroundColor="transparent" barStyle="light-content" />
         <LocalizationProvider>
           <AppContextProvider>

Gemfile.lock

@@ -17,16 +17,16 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.817.0)
-    aws-sdk-core (3.181.0)
+    aws-partitions (1.826.0)
+    aws-sdk-core (3.183.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
     aws-sdk-kms (1.71.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.134.0)
+    aws-sdk-s3 (1.135.0)
       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
@@ -86,7 +86,7 @@ GEM
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
-    excon (0.102.0)
+    excon (0.103.0)
     faraday (1.10.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
@@ -116,7 +116,7 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     fastimage (2.2.7)
-    fastlane (2.214.0)
+    fastlane (2.216.0)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -137,6 +137,7 @@ GEM
       google-apis-playcustomapp_v1 (~> 0.1)
       google-cloud-storage (~> 1.31)
       highline (~> 2.0)
+      http-cookie (~> 1.0.5)
       json (< 3.0.0)
       jwt (>= 2.1.0, < 3)
       mini_magick (>= 4.9.4, < 5.0.0)
@@ -148,7 +149,7 @@ GEM
       security (= 0.1.3)
       simctl (~> 1.6.3)
       terminal-notifier (>= 2.0.0, < 3.0.0)
-      terminal-table (>= 1.4.5, < 2.0.0)
+      terminal-table (~> 3)
       tty-screen (>= 0.6.3, < 1.0.0)
       tty-spinner (>= 0.8.0, < 1.0.0)
       word_wrap (~> 1.0.0)
@@ -190,10 +191,9 @@ GEM
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       mini_mime (~> 1.0)
-    googleauth (1.7.0)
+    googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
-      memoist (~> 0.16)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -206,7 +206,6 @@ GEM
     jmespath (1.6.2)
     json (2.6.3)
     jwt (2.7.1)
-    memoist (0.16.2)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     minitest (5.13.0)
@@ -242,8 +241,8 @@ GEM
       CFPropertyList
       naturally
     terminal-notifier (2.0.0)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
     trailblazer-option (0.1.2)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
@@ -257,7 +256,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (1.8.0)
+    unicode-display_width (2.4.2)
     webrick (1.8.1)
     word_wrap (1.0.0)
     xcodeproj (1.22.0)

android/app/build.gradle

@@ -85,7 +85,7 @@ android {
         applicationId "io.hexawallet.keeper"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 247
+        versionCode 257
         versionName "1.1.6"
         missingDimensionStrategy 'react-native-camera', 'general'
         missingDimensionStrategy 'store', 'play'

android/link-assets-manifest.json

@@ -36,30 +36,6 @@
     {
       "path": "src/assets/fonts/FiraSansCondensed-SemiBold.ttf",
       "sha1": "31fa4deffe82a25c86284d5bd98d69a618eded6b"
-    },
-    {
-      "path": "src/assets/fonts/RobotoCondensed-Bold.ttf",
-      "sha1": "15e8faa21a00eb5b40d3837e16960a39d78fe45c"
-    },
-    {
-      "path": "src/assets/fonts/RobotoCondensed-BoldItalic.ttf",
-      "sha1": "2195d05ea6a9338a69929445e4ddf0a9650dfc12"
-    },
-    {
-      "path": "src/assets/fonts/RobotoCondensed-Italic.ttf",
-      "sha1": "56725c6d7698dcfee226424bb1f21565f23a0573"
-    },
-    {
-      "path": "src/assets/fonts/RobotoCondensed-Light.ttf",
-      "sha1": "124307ef220bd49e2c5a964b730e6403bf8a31ef"
-    },
-    {
-      "path": "src/assets/fonts/RobotoCondensed-LightItalic.ttf",
-      "sha1": "0b979a3ab679afa18c5f31995b78120398f2fdf5"
-    },
-    {
-      "path": "src/assets/fonts/RobotoCondensed-Regular.ttf",
-      "sha1": "e0d7acf2ca3dd0ff68f533797bb94b0580397e95"
     }
   ]
 }

ios/Podfile.lock

@@ -610,9 +610,6 @@ PODS:
     - React-Core
   - RNKeychain (8.1.2):
     - React-Core
-  - RNLinearGradient (3.0.0-alpha.1):
-    - RCT-Folly (= 2021.07.22.00)
-    - React-Core
   - RNLocalize (2.2.2):
     - React-Core
   - RNReanimated (3.4.2):
@@ -752,7 +749,6 @@ DEPENDENCIES:
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNIap (from `../node_modules/react-native-iap`)
   - RNKeychain (from `../node_modules/react-native-keychain`)
-  - RNLinearGradient (from `../node_modules/react-native-linear-gradient`)
   - RNLocalize (from `../node_modules/react-native-localize`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
@@ -922,8 +918,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-iap"
   RNKeychain:
     :path: "../node_modules/react-native-keychain"
-  RNLinearGradient:
-    :path: "../node_modules/react-native-linear-gradient"
   RNLocalize:
     :path: "../node_modules/react-native-localize"
   RNReanimated:
@@ -1028,7 +1022,6 @@ SPEC CHECKSUMS:
   RNGestureHandler: c0d04458598fcb26052494ae23dda8f8f5162b13
   RNIap: c397f49db45af3b10dca64b2325f21bb8078ad21
   RNKeychain: a65256b6ca6ba6976132cc4124b238a5b13b3d9c
-  RNLinearGradient: 03fc377e5f7a1483a33a0642bb523ae4cf102211
   RNLocalize: 95a43f85e41a966be7bc9cff2437128911c52da0
   RNReanimated: 726395a2fa2f04cea340274ba57a4e659bc0d9c1
   RNScreens: 85d3880b52d34db7b8eeebe2f1a0e807c05e69fa