Merge branch '@matthew/add-points-tweet-intent' of https://github.com…

…/rainbow-me/rainbow into @matthew/add-points-tweet-intent
rainbow-me · Dec 7, 2023 · 8ce3e1a · 8ce3e1a
2 parents dc1a8e1 + 1fae5ea
commit 8ce3e1a
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/crowdin.yml b/crowdin.yml
@@ -1,3 +1,5 @@
 files:
   - source: /src/languages/en_US.json
     translation: /src/languages/%locale_with_underscore%.json
+bundles:
+  - 2
diff --git a/src/navigation/SwipeNavigator.js b/src/navigation/SwipeNavigator.js
@@ -56,12 +56,17 @@ const animationConfig = {
 
 const Swipe = createMaterialTopTabNavigator();
 
-// eslint-disable-next-line no-nested-ternary
-export const TAB_BAR_HEIGHT = IS_IOS
-  ? 82
-  : !isUsingButtonNavigation()
-  ? 72
-  : 48;
+export const getHeaderHeight = () => {
+  if (IS_IOS) {
+    return 82;
+  }
+
+  if (!isUsingButtonNavigation()) {
+    return 72;
+  }
+
+  return 48;
+};
 
 const TabBar = ({
   state,
@@ -163,7 +168,7 @@ const TabBar = ({
   return (
     <ShadowWrapper>
       <Box
-        height={{ custom: TAB_BAR_HEIGHT }}
+        height={{ custom: getHeaderHeight() }}
         position="absolute"
         style={{
           bottom: 0,
@@ -176,7 +181,7 @@ const TabBar = ({
           blurAmount={40}
           blurType={isDarkMode ? 'chromeMaterialDark' : 'chromeMaterialLight'}
           width="full"
-          height={{ custom: TAB_BAR_HEIGHT }}
+          height={{ custom: getHeaderHeight() }}
         >
           <Box
             height="full"

diff --git a/src/resources/pointsTweetIntent/pointsTweetIntentQuery.ts b/src/resources/pointsTweetIntent/pointsTweetIntentQuery.ts
@@ -1,5 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import { noop } from 'lodash';
+
 import {
   createQueryKey,
   queryClient,
@@ -91,7 +92,7 @@ export function usePointsTweetIntentQuery(
     {
       enabled,
       staleTime: defaultStaleTime,
-      onSuccess,
+      onSuccess
     }
   );
 }
diff --git a/src/screens/SignTransactionSheet.tsx b/src/screens/SignTransactionSheet.tsx
@@ -241,8 +241,7 @@ export const SignTransactionSheet = () => {
     gasFeeParamsBySpeed,
   } = useGas();
 
-  const simulationUnavailable =
-    isPersonalSign || currentNetwork === Network.zora;
+  const simulationUnavailable = isPersonalSign;
 
   const itemCount =
     (simulationData?.in?.length || 0) +
@@ -1427,8 +1426,7 @@ const SimulationCard = ({
   );
   const spinnerRotation = useSharedValue(0);
 
-  const simulationUnavailable =
-    isPersonalSign || currentNetwork === Network.zora;
+  const simulationUnavailable = isPersonalSign;
 
   const listStyle = useAnimatedStyle(() => ({
     opacity: noChanges
@@ -1584,11 +1582,9 @@ const SimulationCard = ({
     const shouldExpandOnLoad =
       isBalanceEnough === false ||
       (!isEmpty(simulation) && !noChanges) ||
-      currentNetwork === Network.zora ||
       !!simulationError;
     return shouldExpandOnLoad;
   }, [
-    currentNetwork,
     isBalanceEnough,
     isLoading,
     isPersonalSign,
@@ -1606,13 +1602,7 @@ const SimulationCard = ({
       isExpanded={isExpanded}
     >
       <Stack
-        space={
-          simulationError ||
-          isBalanceEnough === false ||
-          currentNetwork === Network.zora
-            ? '16px'
-            : '24px'
-        }
+        space={simulationError || isBalanceEnough === false ? '16px' : '24px'}
       >
         <Box
           alignItems="center"
@@ -1694,12 +1684,12 @@ const SimulationCard = ({
               </Text>
             ) : (
               <>
-                {simulationUnavailable && !isPersonalSign && (
+                {simulationUnavailable && isPersonalSign && (
                   <Box style={{ opacity: 0.6 }}>
                     <Text color="labelQuaternary" size="13pt" weight="semibold">
                       {i18n.t(
                         i18n.l.walletconnect.simulation.simulation_card.messages
-                          .unavailable_zora_network
+                          .unavailable_personal_sign
                       )}
                     </Text>
                   </Box>

diff --git a/src/screens/discover/components/DiscoverSearch.js b/src/screens/discover/components/DiscoverSearch.js
@@ -38,6 +38,7 @@ import {
   getPoapAndOpenSheetWithSecretWord,
 } from '@/utils/poaps';
 import { navigateToMintCollection } from '@/resources/reservoir/mints';
+import { getHeaderHeight } from '@/navigation/SwipeNavigator';
 
 export const SearchContainer = styled(Row)({
   height: '100%',
@@ -61,6 +62,7 @@ export default function DiscoverSearch() {
 
   const { colors } = useTheme();
   const profilesEnabled = useExperimentalFlag(PROFILES);
+  const marginBottom = useMemo(() => getHeaderHeight(), []);
 
   const currencySelectionListRef = useRef();
   const [searchQueryForSearch] = useDebounce(searchQuery, 350);
@@ -277,7 +279,7 @@ export default function DiscoverSearch() {
   return (
     <View
       key={currencyListDataKey}
-      style={{ height: deviceUtils.dimensions.height - 140 }}
+      style={{ height: deviceUtils.dimensions.height - 140 - marginBottom }}
     >
       <SearchContainer>
         <CurrencySelectionList