Merge branch 'dev' into stage

ambrosus · Jan 12, 2024 · 6602824 · 6602824
2 parents cfebea1 + 71bae48
commit 6602824
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/components/templates/BottomSheetSharePortfolio/index.tsx b/src/components/templates/BottomSheetSharePortfolio/index.tsx
@@ -1,6 +1,7 @@
 import React, { ForwardedRef, forwardRef, RefObject, useRef } from 'react';
 import { View } from 'react-native';
 import ViewShot, { captureRef, CaptureOptions } from 'react-native-view-shot';
+import { useTranslation } from 'react-i18next';
 import { BottomSheetFloat } from '@components/modular';
 import { BottomSheetRef } from '@components/composite';
 import { useForwardedRef } from '@hooks/useForwardedRef';
@@ -15,7 +16,6 @@ import { scale, verticalScale } from '@utils/scaling';
 import { ShareUtils } from '@utils/share';
 import { Social } from '@appTypes/Sharing';
 import { styles } from './styles';
-import { useTranslation } from 'react-i18next';
 
 interface SharePortfolioProps extends PortfolioPerformanceProps {
   ref: RefObject<BottomSheetRef>;
@@ -117,7 +117,7 @@ export const SharePortfolio = forwardRef<BottomSheetRef, SharePortfolioProps>(
                   <PlusIcon color={COLORS.gray800} />
                 </Button>
                 <Spacer value={verticalScale(8)} />
-                <Text>More</Text>
+                <Text>{t('common.more')}</Text>
               </View>
             </Row>
           </View>

diff --git a/src/components/templates/PortfolioPerformance/index.tsx b/src/components/templates/PortfolioPerformance/index.tsx
@@ -7,8 +7,8 @@ import { Row, Spacer, Text } from '@components/base';
 import { COLORS } from '@constants/colors';
 import { scale, verticalScale } from '@utils/scaling';
 import { NumberUtils } from '@utils/number';
-import { styles } from './styles';
 import { Badge } from '@components/base/Badge';
+import { styles } from './styles';
 
 export interface PortfolioPerformanceProps {
   balance: string;
@@ -148,13 +148,7 @@ export function PortfolioPerformance(
           </Row>
         </View>
         <Spacer value={scale(4)} horizontal />
-        <Image
-          source={require('@assets/images/logo-sun-like.png')}
-          style={{
-            height: verticalScale(100),
-            width: scale(100)
-          }}
-        />
+        <Image source={require('@assets/images/logo-sun-like.png')} />
       </Row>
     </View>
   );

diff --git a/src/localization/locales/English.json b/src/localization/locales/English.json
@@ -110,6 +110,7 @@
   "common.group_plural": "Groups",
   "common.hour.short": "hr",
   "common.messages": "Messages",
+  "common.more": "More",
   "common.no.transactions": "You will see your transactions here",
   "common.notification.price-alert": "Price Alert",
   "common.notification.transaction-alert": "Transaction Alert",

diff --git a/src/localization/locales/Turkish.json b/src/localization/locales/Turkish.json
@@ -110,6 +110,7 @@
   "common.group_plural": "Gruplar",
   "common.hour.short": "S",
   "common.messages": "Mesajlar",
+  "common.more": "Diğer",
   "common.no.transactions": "İşlemlerinizi burada görebilirsiniz",
   "common.notification.price-alert": "Fiyat Bildirimi",
   "common.notification.transaction-alert": "İşlem Bildirimi",