Merge pull request #85 from WDI-Ideas/main

bug fixing

lib/core/styles/app_text.dart

@@ -84,7 +84,7 @@ class AppText {
   static const String currentval = "Current valuation";
   static const String totalreturn = "Total return";
   static const String disttodate = "Distributions to date";
-  static const String includeddocs = "Included Documents";
+  static const String includeddocs = "Investment Documents";
 
   //Academy
   static const String videosTitle = "Videos";
@@ -275,15 +275,18 @@ class AppText {
   static const String verifyYourAccountInUnderMinutesToStartInvestingToday =
       "Verify your account in under 10 minutes to start investing today!";
   static const String closingDateText = "Closing Date";
+  static const String closedDateText = "Closed Date";
   static const String fundedText = "funded";
   static const String sponsorNameText = "Sponsor name";
   static const String estimatedReturnText = "Estimated return";
   static const String originalEstimatedReturnText = "Original estimated return";
   static const String actualEstimatedReturnText = "Actual return";
+  static const String actualReturnToDate = "Actual return to date";
   static const String holdingPeriodText = "Holding period";
   static const String payoutDateText = "Payout Date";
+  static const String expectedExitDate = "Expected Exit Date";
   static const String minimumInvestmentText = "Minimum investment";
-  static const String keyMeritsOfInvestmentText = "Key Merits of Investment";
+  static const String keyMeritsOfInvestmentText = "Key Merits";
   static const String investmentDetailsText = "Investment details";
   static const String enterInvestmentAmountText = "Enter investment amount";
   static const String thisIsUsdInvestmentOpportunityText =

lib/features/MainScreens/Invest/presentation/pages/invest_details_layout.dart

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:gap/gap.dart';
 import 'package:tanami_app/core/styles/app_color.dart';
-import 'package:tanami_app/features/MainScreens/Invest/presentation/pages/invest_video_section.dart';
+import 'package:tanami_app/features/MainScreens/Invest/presentation/widgets/invest_video_section.dart';
 
 import '../widgets/invest_detail_details_section.dart';
 import '../widgets/invest_detail_image_carousel.dart';

lib/features/MainScreens/Invest/presentation/pages/invest_layout.dart

@@ -136,44 +136,36 @@ class ClosedItemsScreen extends StatelessWidget {
         return ListView.builder(
           itemCount: state.closedItems.length,
           itemBuilder: (context, index) {
-            return index == 0
+            return GestureDetector(
-                ? Container(
+              onTap: () {
-                    margin: const EdgeInsets.symmetric(
+                goRouter.pushNamed(RouteName.investDetailScreen,
-                      horizontal: 16,
+                    pathParameters: {"type": "closed"});
-                      vertical: 18,
+              },
+              child: Container(
+                margin: const EdgeInsets.symmetric(
+                  horizontal: 16,
+                  vertical: 18,
+                ),
+                decoration: BoxDecoration(
+                  color: AppColor.plainWhite,
+                  borderRadius: const BorderRadius.all(Radius.circular(20.0)),
+                  boxShadow: [
+                    BoxShadow(
+                      color: AppColor.plainBlack.withOpacity(0.15),
+                      spreadRadius: 2,
+                      blurRadius: 10,
+                      offset: const Offset(0, 3),
                     ),
-                    child: kycCard())
+                  ],
-                : GestureDetector(
+                ),
-                    onTap: () {
+                child: Column(
-                      goRouter.pushNamed(RouteName.investDetailScreen,
+                  children: [
-                          pathParameters: {"type": "closed"});
+                    InvestCarouselView(),
-                    },
+                    const InvestClosedDetailsSection(),
-                    child: Container(
+                  ],
-                      margin: const EdgeInsets.symmetric(
+                ),
-                        horizontal: 16,
+              ),
-                        vertical: 18,
+            );
-                      ),
-                      decoration: BoxDecoration(
-                        color: AppColor.plainWhite,
-                        borderRadius:
-                            const BorderRadius.all(Radius.circular(20.0)),
-                        boxShadow: [
-                          BoxShadow(
-                            color: AppColor.plainBlack.withOpacity(0.15),
-                            spreadRadius: 2,
-                            blurRadius: 10,
-                            offset: const Offset(0, 3),
-                          ),
-                        ],
-                      ),
-                      child: Column(
-                        children: [
-                          InvestCarouselView(),
-                          const InvestClosedDetailsSection(),
-                        ],
-                      ),
-                    ),
-                  );
           },
         );
       },

lib/features/MainScreens/Invest/presentation/widgets/invest_closed_details_section.dart

@@ -71,7 +71,7 @@ class InvestClosedDetailsSection extends StatelessWidget {
                         5.w,
                       ),
                       TextWidget().text12W700(
-                        "${AppText.closingDateText}: ",
+                        "${AppText.closedDateText}: ",
                         clr: AppColor.plainBlack,
                       ),
                       TextWidget().text12W500(
@@ -142,28 +142,6 @@ class InvestClosedDetailsSection extends StatelessWidget {
                   SizedBox(
                     height: 8.h,
                   ),
-                  Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    crossAxisAlignment: CrossAxisAlignment.start,
-                    children: [
-                      SizedBox(
-                        width: 200.w,
-                        child: TextWidget().text14W500(
-                          "${AppText.originalEstimatedReturnText}:",
-                          clr: AppColor.portoflioCardTextColor,
-                          txtAlign: TextAlign.start,
-                        ),
-                      ),
-                      TextWidget().text14W700(
-                        '20.0%',
-                        clr: AppColor.plainBlack,
-                        txtAlign: TextAlign.end,
-                      ),
-                    ],
-                  ),
-                  SizedBox(
-                    height: 8.h,
-                  ),
                   Row(
                     mainAxisAlignment: MainAxisAlignment.spaceBetween,
                     crossAxisAlignment: CrossAxisAlignment.start,
@@ -171,7 +149,7 @@ class InvestClosedDetailsSection extends StatelessWidget {
                       SizedBox(
                         width: 150.w,
                         child: TextWidget().text14W500(
-                          "${AppText.actualEstimatedReturnText}:",
+                          "${AppText.actualReturnToDate}:",
                           clr: AppColor.portoflioCardTextColor,
                           txtAlign: TextAlign.start,
                         ),
@@ -213,7 +191,7 @@ class InvestClosedDetailsSection extends StatelessWidget {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       TextWidget().text14W500(
-                        "${AppText.payoutDateText}:",
+                        "${AppText.expectedExitDate}:",
                         clr: AppColor.portoflioCardTextColor,
                         txtAlign: TextAlign.start,
                       ),

lib/features/MainScreens/Invest/presentation/widgets/invest_video_section.dart

@@ -84,6 +84,4 @@ class InvestVideoSection extends StatelessWidget {
 
 List videos = [
   'assets/images/academy_screen/vd_bg.jpg',
-  'assets/images/academy_screen/vd_bg.jpg',
-  'assets/images/academy_screen/vd_bg.jpg'
 ];