Merge branch 'dev' into stage

ambrosus · Jan 10, 2024 · cf22ad5 · cf22ad5
2 parents eccf90a + e93458d
commit cf22ad5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/src/components/templates/BottomSheetSharePortfolio/index.tsx b/src/components/templates/BottomSheetSharePortfolio/index.tsx
@@ -15,6 +15,7 @@ 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>;
@@ -26,6 +27,7 @@ export const SharePortfolio = forwardRef<BottomSheetRef, SharePortfolioProps>(
     const { bottomSheetTitle, ...portfolioBalanceProps } = props;
     const localRef: ForwardedRef<BottomSheetRef> = useForwardedRef(ref);
     const shareRef = useRef<View>(null);
+    const { t } = useTranslation();
 
     const onSharePress = async (type?: Social) => {
       const captureOptions: CaptureOptions = {
@@ -103,7 +105,7 @@ export const SharePortfolio = forwardRef<BottomSheetRef, SharePortfolioProps>(
                   <MessagesIcon color={COLORS.neutral0} />
                 </Button>
                 <Spacer value={verticalScale(8)} />
-                <Text>Messages</Text>
+                <Text>{t('common.messages')}</Text>
               </View>
               <View style={styles.shareButton}>
                 <Button

diff --git a/src/components/templates/TransactionDetails/index.tsx b/src/components/templates/TransactionDetails/index.tsx
@@ -264,7 +264,7 @@ export const TransactionDetails = (
         currency="AMB"
         currencyPosition="right"
         txFee={transaction.fee}
-        title="Transaction"
+        title={t('common.transaction')}
         bottomSheetTitle={t('common.share.transaction')}
         timestamp={transaction.timestamp}
       />

diff --git a/src/localization/locales/English.json b/src/localization/locales/English.json
@@ -108,6 +108,7 @@
   "common.field.required": "This field is required",
   "common.group": "Group",
   "common.group_plural": "Groups",
+  "common.messages": "Messages",
   "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
@@ -108,6 +108,7 @@
   "common.field.required": "Zorunlu alan",
   "common.group": "Grup",
   "common.group_plural": "Gruplar",
+  "common.messages": "Mesajlar",
   "common.no.transactions": "İşlemlerinizi burada görebilirsiniz",
   "common.notification.price-alert": "Fiyat Bildirimi",
   "common.notification.transaction-alert": "İşlem Bildirimi",

diff --git a/src/screens/SendFunds/screens/SendFundsStatus/index.tsx b/src/screens/SendFunds/screens/SendFundsStatus/index.tsx
@@ -23,7 +23,8 @@ export const SendFundsStatus = () => {
     amount = 0,
     currency = AirDAODictTypes.Code.AMB,
     loading,
-    error
+    error,
+    estimatedFee
   } = state;
   const navigation = useNavigation<HomeNavigationProp>();
   const { t } = useTranslation();
@@ -169,6 +170,7 @@ export const SendFundsStatus = () => {
             ref={shareModal}
             title={t('common.transaction')}
             bottomSheetTitle={t('common.share.transaction')}
+            txFee={estimatedFee}
             balance={amount.toFixed(2)}
             currency={currency}
             currencyPosition={'right'}