Merge branch 'develop' of https://github.com/rainbow-me/rainbow into …

…brody/QR-code-scanner-fixes * 'develop' of https://github.com/rainbow-me/rainbow: fix special characters overflowing due to lineHeight (#5239) Optional chaining (#5232) tx sim: warnings (#5224) tx sim: enable zora (#5226) fix search not being able to scroll to bottom due to add bottom tab bar (#5227) Update Crowdin configuration file
rainbow-me · Dec 11, 2023 · fd752ca · fd752ca
2 parents 70bce84 + c4aca64
commit fd752ca
Show file tree

Hide file tree

Showing 7 changed files with 153 additions and 40 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/components/asset-list/RecyclerAssetList2/FastComponents/FastBalanceCoinRow.tsx b/src/components/asset-list/RecyclerAssetList2/FastComponents/FastBalanceCoinRow.tsx
@@ -135,14 +135,14 @@ const MemoizedBalanceCoinRow = React.memo(
         <ButtonPressAnimation
           onPress={handlePress}
           scaleTo={0.96}
-          testID={`balance-coin-row-${item.name}`}
+          testID={`balance-coin-row-${item?.name}`}
         >
           <View style={[sx.container]}>
             <FastCoinIcon
-              address={item.address}
-              network={item.network}
-              mainnetAddress={item.mainnet_address}
-              symbol={item.symbol}
+              address={item?.address}
+              network={item?.network}
+              mainnetAddress={item?.mainnet_address}
+              symbol={item?.symbol}
               theme={theme}
             />
 
@@ -155,7 +155,7 @@ const MemoizedBalanceCoinRow = React.memo(
                     size="16px / 22px (Deprecated)"
                     weight="semibold"
                   >
-                    {item.name}
+                    {item?.name}
                   </Text>
                 </View>
 

diff --git a/src/components/cards/FeaturedMintCard.tsx b/src/components/cards/FeaturedMintCard.tsx
@@ -198,14 +198,21 @@ export function FeaturedMintCard() {
                           )}
                         </Text>
                       </Inline>
-                      <Text
-                        size="20pt"
-                        weight="heavy"
-                        color="label"
-                        numberOfLines={1}
+                      <Box
+                        height={{ custom: 36 }}
+                        justifyContent="flex-start"
+                        alignItems="flex-start"
                       >
-                        {featuredMint.name}
-                      </Text>
+                        <Text
+                          size="20pt"
+                          weight="heavy"
+                          color="label"
+                          numberOfLines={1}
+                          style={{ lineHeight: 48 }}
+                        >
+                          {featuredMint.name}
+                        </Text>
+                      </Box>
                     </Stack>
                     <Stack space={{ custom: 14 }}>
                       <Inline space="6px" alignVertical="center">

diff --git a/src/languages/en_US.json b/src/languages/en_US.json
@@ -2339,14 +2339,18 @@
             "likely_to_fail": "Likely to Fail",
             "simulation_unavailable": "Simulation Unavailable",
             "simulation_result": "Simulated Result",
-            "simulating": "Simulating"
+            "simulating": "Simulating",
+            "proceed_carefully": "Proceed Carefully",
+            "suspicious_transaction": "Suspicious Transaction"
           },
           "messages": {
             "no_changes": "No Changes Detected",
             "need_more_native": "You’ll need more %{symbol} on %{network} to pay for this transaction. Get some %{symbol} below to continue with this request.",
             "unavailable_personal_sign": "Simulation for personal signs is not yet supported",
             "unavailable_zora_network": "Simulation on Zora is not yet supported",
-            "failed_to_simulate": "The simulation failed, which suggests your transaction is likely to fail. This may be an issue with the app you’re using."
+            "failed_to_simulate": "The simulation failed, which suggests your transaction is likely to fail. This may be an issue with the app you’re using.",
+            "warning": "No known malicious behavior was detected, but this transaction has characteristics that may pose a risk to your wallet.",
+            "malicious": "Signing this transaction could result in losing access to everything in your wallet."
           },
           "event_row": {
             "unlimited": "Unlimited",

diff --git a/src/navigation/SwipeNavigator.js b/src/navigation/SwipeNavigator.js
@@ -64,7 +64,7 @@ const animationConfig = {
 
 const Swipe = createMaterialTopTabNavigator();
 
-const getHeaderHeight = () => {
+export const getHeaderHeight = () => {
   if (IS_IOS) {
     return 82;
   }