Merge branch 'main' into release/3.6

tonkeeper · Jan 31, 2024 · b5d43af · b5d43af
2 parents 199d596 + 020addd
commit b5d43af
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 56 deletions.
diff --git a/packages/mobile/package.json b/packages/mobile/package.json
@@ -35,10 +35,10 @@
     "@react-native-async-storage/async-storage": "^1.15.5",
     "@react-native-community/clipboard": "^1.5.1",
     "@react-native-community/netinfo": "^9.3.2",
-    "@react-native-firebase/analytics": "^18.5.0",
-    "@react-native-firebase/app": "^18.5.0",
-    "@react-native-firebase/crashlytics": "^18.5.0",
-    "@react-native-firebase/messaging": "^18.5.0",
+    "@react-native-firebase/analytics": "18.5.0",
+    "@react-native-firebase/app": "18.5.0",
+    "@react-native-firebase/crashlytics": "18.5.0",
+    "@react-native-firebase/messaging": "18.5.0",
     "@reduxjs/toolkit": "^1.6.1",
     "@shopify/flash-list": "^1.5.0",
     "@ton/core": "^0.53.0",

diff --git a/packages/mobile/src/assets/icons/png/[email protected] b/packages/mobile/src/assets/icons/png/[email protected]
diff --git a/packages/mobile/src/assets/icons/svg/28/ic-globe-28.svg b/packages/mobile/src/assets/icons/svg/28/ic-globe-28.svg
diff --git a/packages/mobile/src/navigation/ModalStack.tsx b/packages/mobile/src/navigation/ModalStack.tsx
@@ -60,6 +60,7 @@ export const ModalStack = React.memo(() => (
         path={AppStackRouteNames.ReceiveInscription}
       />
       <Stack.Modal component={NFT} path="NFTItemDetails" />
+      {/* <Stack.Modal component={Receive} path={AppStackRouteNames.Receive} /> */}
       <Stack.Modal component={Send} path={AppStackRouteNames.Send} />
       <Stack.Modal component={RenewAllDomainModal} path="RenewAllDomains" />
       <Stack.Modal component={ChooseCountry} path={AppStackRouteNames.ChooseCountry} />

diff --git a/packages/mobile/src/store/zustand/domains/types.ts b/packages/mobile/src/store/zustand/domains/types.ts
@@ -1,43 +1,42 @@
 export type RawAddress = string;
 export type ExpiringAt = number;
 
-
 export interface ExpiringDomainItem {
-  expiring_at: number
-  name: string
-  dns_item: DnsItem
+  expiring_at: number;
+  name: string;
+  dns_item: DnsItem;
 }
 
 export interface DnsItem {
-  address: string
-  index: number
-  owner: Owner
-  collection: Collection
-  verified: boolean
-  metadata: Metadata
-  previews: Preview[]
-  dns: string
-  approved_by: string[]
+  address: string;
+  index: number;
+  owner: Owner;
+  collection: Collection;
+  verified: boolean;
+  metadata: Metadata;
+  previews: Preview[];
+  dns: string;
+  approved_by: string[];
 }
 
 export interface Owner {
-  address: string
-  is_scam: boolean
+  address: string;
+  is_scam: boolean;
 }
 
 export interface Collection {
-  address: string
-  name: string
-  description: string
+  address: string;
+  name: string;
+  description: string;
 }
 
 export interface Metadata {
-  name: string
+  name: string;
 }
 
 export interface Preview {
-  resolution: string
-  url: string
+  resolution: string;
+  url: string;
 }
 
 export type ExpiringDomains = {

diff --git a/packages/mobile/src/uikit/Icon/IconsMobileList.ts b/packages/mobile/src/uikit/Icon/IconsMobileList.ts
@@ -67,6 +67,7 @@ export const MobileIconsList = {
   'ic-explore-28': require('$assets/icons/png/ic-explore-28.png'),
   'ic-flash-28': require('$assets/icons/png/ic-flash-28.png'),
   'ic-gear-28': require('$assets/icons/png/ic-gear-28.png'),
+  'ic-globe-28': require('$assets/icons/png/ic-globe-28.png'),
   'ic-home-28': require('$assets/icons/png/ic-home-28.png'),
   'ic-jetton-28': require('$assets/icons/png/ic-jetton-28.png'),
   'ic-key-28': require('$assets/icons/png/ic-key-28.png'),

diff --git a/packages/mobile/src/uikit/Icon/generated.types.ts b/packages/mobile/src/uikit/Icon/generated.types.ts
@@ -67,6 +67,7 @@ export type IconNames =
   | 'ic-explore-28'
   | 'ic-flash-28'
   | 'ic-gear-28'
+  | 'ic-globe-28'
   | 'ic-home-28'
   | 'ic-jetton-28'
   | 'ic-key-28'
@@ -191,6 +192,7 @@ export const AllIcons = [
   'ic-explore-28',
   'ic-flash-28',
   'ic-gear-28',
+  'ic-globe-28',
   'ic-home-28',
   'ic-jetton-28',
   'ic-key-28',
@@ -316,6 +318,7 @@ export const IconSizes = {
   'ic-explore-28': 28,
   'ic-flash-28': 28,
   'ic-gear-28': 28,
+  'ic-globe-28': 28,
   'ic-home-28': 28,
   'ic-jetton-28': 28,
   'ic-key-28': 28,

diff --git a/packages/mobile/src/uikit/List/ListItem.tsx b/packages/mobile/src/uikit/List/ListItem.tsx
@@ -33,6 +33,8 @@ export interface ListItemProps {
   disabled?: boolean;
   titleProps?: TextProps;
   leftContentStyle?: StyleProp<ViewStyle>;
+
+  titleStyle?: ViewStyle;
   /*
     Shared value that will be updated when user press on ListItem
  */
@@ -81,7 +83,7 @@ export const ListItem = memo<ListItemProps>((props) => {
   const TouchableComponent = isAndroid ? Pressable : TouchableHighlight;
   const renderTitle = useCallback(() => {
     return (
-      <View style={styles.title}>
+      <View style={[styles.title, props.titleStyle]}>
         <View style={styles.titleTextContainer}>
           {typeof props.title === 'string' ? (
             <SText
@@ -205,7 +207,7 @@ const styles = Steezy.create(({ colors }) => ({
     height: 44,
     borderRadius: 44 / 2,
     overflow: 'hidden',
-    backgroundColor: colors.backgroundContentTint,
+    backgroundColor: colors.backgroundContentAttention,
   },
   picture: {
     width: 44,

diff --git a/packages/mobile/src/uikit/TransitionOpacity.tsx b/packages/mobile/src/uikit/TransitionOpacity.tsx
@@ -1,6 +1,12 @@
 import React from 'react';
 import { StyleProp, ViewStyle } from 'react-native';
-import Animated, { runOnJS, useAnimatedStyle, useSharedValue, withDelay, withTiming } from 'react-native-reanimated';
+import Animated, {
+  runOnJS,
+  useAnimatedStyle,
+  useSharedValue,
+  withDelay,
+  withTiming,
+} from 'react-native-reanimated';
 
 interface TransitionOpacity {
   isVisible: boolean;
@@ -12,46 +18,49 @@ interface TransitionOpacity {
 } 
 
 export const TransitionOpacity: React.FC<TransitionOpacity> = (props) => {
-  const { 
-    children, 
-    isVisible, 
-    alwaysShown, 
-    style, 
-    entranceAnimation = true, 
-    duration = 150
+  const {
+    children,
+    isVisible,
+    alwaysShown,
+    style,
+    entranceAnimation = true,
+    duration = 150,
   } = props;
 
   const [shown, setIsShown] = React.useState(false);
-  const opacity = useSharedValue(entranceAnimation ? 0 : 1); 
+  const opacity = useSharedValue(entranceAnimation ? 0 : 1);
 
   React.useEffect(() => {
     if (isVisible) {
       setIsShown(true);
-      opacity.value = withDelay(250, withTiming(1, {
-        duration,
-      }));
+      opacity.value = withDelay(
+        250,
+        withTiming(1, {
+          duration,
+        }),
+      );
     } else {
-      opacity.value = withTiming(0, {
-        duration,
-      }, (isComplete) => {
-        if (isComplete) {
-          runOnJS(setIsShown)(false);
-        }
-      });
+      opacity.value = withTiming(
+        0,
+        {
+          duration,
+        },
+        (isComplete) => {
+          if (isComplete) {
+            runOnJS(setIsShown)(false);
+          }
+        },
+      );
     }
   }, [isVisible]);
 
   const opacityStyle = useAnimatedStyle(() => ({
-    opacity: opacity.value
+    opacity: opacity.value,
   }));
 
   if (!shown && !alwaysShown) {
     return null;
   }
 
-  return (
-    <Animated.View style={[style, opacityStyle]}>
-      {children}
-    </Animated.View>
-  );
+  return <Animated.View style={[style, opacityStyle]}>{children}</Animated.View>;
 };
diff --git a/yarn.lock b/yarn.lock
@@ -2729,27 +2729,27 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/netinfo/-/netinfo-9.4.1.tgz#7b880758adca65fe47ee866cf7b00416b9dcc192"
   integrity sha512-dAbY5mfw+6Kas/GJ6QX9AZyY+K+eq9ad4Su6utoph/nxyH3whp5cMSgRNgE2VhGQVRZ/OG0qq3IaD3+wzoqJXw==
 
-"@react-native-firebase/analytics@^18.5.0":
+"@react-native-firebase/[email protected]":
   version "18.5.0"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/analytics/-/analytics-18.5.0.tgz#cca5858e44f3f8cbf387fa7cd6debb95fbcf8023"
   integrity sha512-+8fkDedcftieOBEkNdqEW0lS/FB9SKzfUc3yYXnJcLTy3Ceg9JZga/tWz4BGbbxPddUy1Sm2UuWDuOxsdkFUyA==
 
-"@react-native-firebase/app@^18.5.0":
+"@react-native-firebase/[email protected]":
   version "18.5.0"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/app/-/app-18.5.0.tgz#198a133229d1b8710f257e76d9703dcb7e4cd6e0"
   integrity sha512-AhHQi5KFDlKZn/lH7rEYtLfpsGamEq+P/cXZWcNPcP0WGlmi++abk7Pxnn4MjnG7TNhEyG/C9uq//qb6VhXaZg==
   dependencies:
     opencollective-postinstall "^2.0.1"
     superstruct "^0.6.2"
 
-"@react-native-firebase/crashlytics@^18.5.0":
+"@react-native-firebase/[email protected]":
   version "18.5.0"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/crashlytics/-/crashlytics-18.5.0.tgz#b5c1e15d260d5243c5ffb2963114bb7e42fe2b7f"
   integrity sha512-i/jt/kNyhLws10/DeYgSQbGIekNPCAdtdg36NmFSw7URZf+1JUczKePbHqq3TvMFZJi5OjnDj06Fj9oenQKjWA==
   dependencies:
     stacktrace-js "^2.0.0"
 
-"@react-native-firebase/messaging@^18.5.0":
+"@react-native-firebase/[email protected]":
   version "18.5.0"
   resolved "https://registry.yarnpkg.com/@react-native-firebase/messaging/-/messaging-18.5.0.tgz#2a80b25816470e9843682e031a3a113566067ce6"
   integrity sha512-y1FApYxBMcygmbWBqUPFC+fCfvx6Yf6TdZewun7kPwx+S+tkYzoKx1IsXtxOXtqyJjCNEYirjFgNrs5SSd02zA==