feat: registration success page

fix: term condition page
Merge branch 'dev' of https://git.empatnusabangsa.com/nugrohob825/cims_apps into bayu/dev
2024-02-16 18:03:36 +07:00 · 2024-02-16 17:35:58 +07:00 · 2024-02-16 17:17:32 +07:00 · 2024-02-16 17:17:19 +07:00 · 2024-02-16 17:14:45 +07:00 · 2024-02-16 17:00:19 +07:00
34 changed files with 983 additions and 250 deletions
--- a/assets/icons/icon-cake.png
+++ b/assets/icons/icon-cake.png
--- a/assets/icons/icon-ceklis-outline.png
+++ b/assets/icons/icon-ceklis-outline.png
--- a/assets/icons/icon-create-plan.png
+++ b/assets/icons/icon-create-plan.png
--- a/assets/icons/icon-house.png
+++ b/assets/icons/icon-house.png
--- a/assets/icons/icon-toga.png
+++ b/assets/icons/icon-toga.png
--- a/assets/images/frame-signature.png
+++ b/assets/images/frame-signature.png
--- a/assets/images/img-finish.png
+++ b/assets/images/img-finish.png
--- a/lib/application/assets/path_assets.dart
+++ b/lib/application/assets/path_assets.dart
@ -33,6 +33,12 @@ class PathAssets {
  static const String iconMoneyReceive = 'assets/icons/icon-money-receive.png';
  static const String iconCoins = 'assets/icons/icon-coins.png';
  static const String iconQuestion = 'assets/icons/icon-question.png';
+  static const String iconCake = 'assets/icons/icon-cake.png';
+  static const String iconHouse = 'assets/icons/icon-house.png';
+  static const String iconToga = 'assets/icons/icon-toga.png';
+  static const String iconCreatePlan = 'assets/icons/icon-create-plan.png';
+  static const String iconChecklistOutlined =
+      'assets/icons/icon-ceklis-outline.png';

  /// IMAGE
  static const String imgSplashLogo = 'assets/images/splash-logo.png';
@ -66,4 +72,6 @@ class PathAssets {
  static const String imgGuideBank = 'assets/images/img-guide-bank.png';
  static const String imgGuide1 = 'assets/images/img-guide1.png';
  static const String imgGuide2 = 'assets/images/img-guide2.png';
+  static const String frameSignature = 'assets/images/frame-signature.png';
+  static const String imgFinish = 'assets/images/img-finish.png';
 }
--- a/lib/application/component/button/back_button_view.dart
+++ b/lib/application/component/button/back_button_view.dart
@ -2,10 +2,10 @@ import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
 import 'package:flutter/material.dart';

-class ButtonBack extends StatelessWidget {
+class BackButtonView extends StatelessWidget {
  final EdgeInsets? margin;
  final void Function()? onPress;
-  const ButtonBack({super.key, this.margin, this.onPress});
+  const BackButtonView({super.key, this.margin, this.onPress});

  @override
  Widget build(BuildContext context) {
@ -16,7 +16,7 @@ class ButtonBack extends StatelessWidget {
          style: IconButton.styleFrom(
              backgroundColor: Colors.white,
              shape: const CircleBorder(
-                side: BorderSide(color: ColorPalette.slate200)
+                  side: BorderSide(color: ColorPalette.slate200)
              )
          ),
          onPressed: onPress ?? () => Navigator.pop(context),
--- a/lib/application/component/custom_app_bar/custom_app_bar.dart
+++ b/lib/application/component/custom_app_bar/custom_app_bar.dart
@ -0,0 +1,42 @@
+import 'package:cims_apps/application/component/button/back_button_view.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:flutter/material.dart';
+
+class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
+  final Widget? leading;
+  final String title;
+  final List<Widget>? trailing;
+  final double height;
+
+  const CustomAppBar({
+    Key? key,
+    required this.height,
+    this.leading,
+    required this.title,
+    this.trailing,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: EdgeInsets.symmetric(horizontal: 24),
+      decoration: BoxDecoration(
+          border: Border(bottom: BorderSide(color: ColorPalette.slate200))
+      ),
+      child: AppBar(
+        toolbarHeight: 70,
+        backgroundColor: Colors.white,
+        surfaceTintColor: Colors.white,
+        automaticallyImplyLeading: false,
+        leadingWidth: 40,
+        leading: leading ?? BackButtonView(),
+        title: Text(title),
+        centerTitle: true,
+        actions: trailing ?? [],
+      ),
+    );
+  }
+
+  @override
+  Size get preferredSize => Size.fromHeight(height);
+}
--- a/lib/application/component/goal_investing_view.dart
+++ b/lib/application/component/goal_investing_view.dart
@ -0,0 +1,59 @@
+import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:flutter/material.dart';
+
+class GoalInvest {
+  String icon;
+  String title;
+
+  GoalInvest(this.icon, this.title);
+}
+
+class GoalInvestingView extends StatelessWidget {
+  const GoalInvestingView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    List<GoalInvest> listGoalInvest = [
+      GoalInvest(PathAssets.iconToga, 'Education'),
+      GoalInvest(PathAssets.iconCake, 'Marriage'),
+      GoalInvest(PathAssets.iconHouse, 'Old age days'),
+      GoalInvest(PathAssets.iconCreatePlan, 'Create Plan'),
+    ];
+
+    return Column(
+      children:
+        listGoalInvest.asMap().entries.map((e) {
+          return Padding(
+            padding: EdgeInsets.only(top: e.key != 0 ? 16 : 0),
+            child: ListTile(
+              shape: RoundedRectangleBorder(
+                side: BorderSide(color: ColorPalette.slate200),
+                borderRadius: BorderRadius.circular(14)
+              ),
+              leading: Container(
+                padding: EdgeInsets.all(4),
+                decoration: BoxDecoration(
+                  color: ColorPalette.blue200.withOpacity(0.5),
+                  borderRadius: BorderRadius.circular(8)
+                ),
+                child: Image.asset(
+                  e.value.icon,
+                  width: SizeConfig.width * 0.07
+                )
+              ),
+              contentPadding: EdgeInsets.symmetric(horizontal: 16, vertical: 4),
+              title: Text(e.value.title,
+                style: TextStyle(
+                  fontWeight: FontWeight.w600,
+                  fontSize: 16
+                ),
+              ),
+              trailing: Icon(Icons.chevron_right_rounded),
+            ),
+          );
+        }).toList()
+    );
+  }
+}
--- a/lib/application/component/list_tile/list_tile_view.dart
+++ b/lib/application/component/list_tile/list_tile_view.dart
@ -0,0 +1,70 @@
+import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/component/image/image_view.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:flutter/material.dart';
+
+class ListTileView extends StatelessWidget {
+  final String title;
+  final VoidCallback? onPressed;
+  final Widget? prefixIcon, suffixIcon;
+  final Color? colorTitle;
+  const ListTileView(
+      {Key? key,
+      required this.title,
+      this.onPressed,
+      this.prefixIcon,
+      this.suffixIcon,
+      this.colorTitle})
+      : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: SizeConfig.width,
+      padding: const EdgeInsets.symmetric(vertical: 16.0, horizontal: 8.0),
+      margin: const EdgeInsets.symmetric(vertical: 16.0),
+      decoration: BoxDecoration(
+        color: ColorPalette.blue50,
+        borderRadius: BorderRadius.circular(10),
+        border: Border.all(
+          color: ColorPalette.greyLights,
+          width: 1,
+        ),
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          prefixIcon ??
+              const ImageView(
+                image: PathAssets.iconChecklistOutlined,
+                width: 38,
+                height: 38,
+              ),
+          const SizedBox(
+            width: 16,
+          ),
+          Expanded(
+            child: Text(
+              title,
+              style: TextStyle(
+                fontWeight: FontWeight.w600,
+                color: colorTitle ?? ColorPalette.slate500,
+              ),
+            ),
+          ),
+          suffixIcon != null
+              ? IconButton(
+                  onPressed: onPressed,
+                  icon: const Icon(
+                    Icons.arrow_forward_ios,
+                    color: ColorPalette.primary,
+                    size: 20,
+                  ),
+                )
+              : const SizedBox(),
+        ],
+      ),
+    );
+  }
+}
--- a/lib/application/component/numeric_pad/numeric_pad.dart
+++ b/lib/application/component/numeric_pad/numeric_pad.dart
@ -0,0 +1,109 @@
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:flutter/material.dart';
+
+class NumericPad extends StatelessWidget {
+  final Function(String) onNumberSelected;
+  final bool isPin;
+  const NumericPad({super.key, required this.onNumberSelected, this.isPin = false});
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.stretch,
+      children: [
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            numberWidget('1'),
+            dividerGradient(false, Alignment.bottomCenter, Alignment.topCenter),
+            numberWidget('2'),
+            dividerGradient(false, Alignment.bottomCenter, Alignment.topCenter),
+            numberWidget('3')
+          ],
+        ),
+        dividerGradient(true, Alignment.centerLeft, Alignment.centerRight),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            numberWidget('4'),
+            dividerGradient(false, Alignment.center, Alignment.center, fullColor: true),
+            numberWidget('5'),
+            dividerGradient(false, Alignment.center, Alignment.center, fullColor: true),
+            numberWidget('6')
+          ],
+        ),
+        dividerGradient(true, Alignment.centerLeft, Alignment.centerRight),
+        Row(
+          mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+          crossAxisAlignment: CrossAxisAlignment.center,
+          children: [
+            isPin ? spaceWidget() : numberWidget('0'),
+            dividerGradient(false, Alignment.topCenter, Alignment.bottomCenter),
+            numberWidget(isPin ? '0' : '000'),
+            dividerGradient(false, Alignment.topCenter, Alignment.bottomCenter),
+            removeWidget()
+          ],
+        ),
+      ],
+    );
+  }
+
+  Widget dividerGradient(bool isHorizontal, AlignmentGeometry gradientFrom, AlignmentGeometry gradientTo, {bool fullColor = false}) {
+    return Container(
+      width: isHorizontal ? SizeConfig.width : 1,
+      height: isHorizontal ? 1 : SizeConfig.height * 0.11,
+      decoration: BoxDecoration(
+          gradient: LinearGradient(
+              colors: [
+                if(isHorizontal) ...[
+                  ColorPalette.slate200.withOpacity(0)
+                ],
+                ColorPalette.slate200,
+                fullColor ? ColorPalette.slate200 : ColorPalette.slate200.withOpacity(0)
+              ],
+              begin: gradientFrom,
+              end: gradientTo
+          )
+      ),
+    );
+  }
+
+  Widget spaceWidget() {
+    return Expanded(
+        child: SizedBox()
+    );
+  }
+
+  Widget numberWidget(String number) {
+    return Expanded(
+        child: GestureDetector(
+          onTap: () {
+            onNumberSelected(number);
+          },
+          child: Container(
+            padding: EdgeInsets.symmetric(vertical: SizeConfig.height * .028),
+            child: Text(
+              number,
+              textAlign: TextAlign.center,
+              style: TextStyle(
+                  fontSize: 28,
+                  fontWeight: FontWeight.bold
+              ),
+            ),
+          ),
+        )
+    );
+  }
+
+  Widget removeWidget() {
+    return Expanded(
+        child: Icon(
+          Icons.highlight_remove,
+          size: 28,
+        )
+    );
+  }
+}
--- a/lib/features/auth/login/view/login_view.dart
+++ b/lib/features/auth/login/view/login_view.dart
@ -1,5 +1,5 @@
 import 'package:cims_apps/application/assets/path_assets.dart';
-import 'package:cims_apps/application/component/button/button_back.dart';
+import 'package:cims_apps/application/component/button/back_button_view.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/component/text_form/text_form_view.dart';
@ -61,7 +61,7 @@ class _LoginViewState extends State<LoginView> {
            title: Row(
              mainAxisAlignment: MainAxisAlignment.spaceBetween,
              children: [
-                ButtonBack(),
+                BackButtonView(),
                const Text('Sign In'),
                SizedBox(
                  width: SizeConfig.width * 0.1,
@ -90,7 +90,7 @@ class _LoginViewState extends State<LoginView> {
      currentPage++;
      pageController.jumpToPage(1);
    } else {
-      routePush(context, page: RiskProfileView());
+      routePush(context, page: BottomNavigationView());
    }
  }
 }
--- a/lib/features/auth/login/view/phone_number_view.dart
+++ b/lib/features/auth/login/view/phone_number_view.dart
@ -1,6 +1,7 @@
 import 'package:cims_apps/application/assets/path_assets.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
+import 'package:cims_apps/application/component/numeric_pad/numeric_pad.dart';
 import 'package:cims_apps/application/component/text_form/text_form_view.dart';
 import 'package:cims_apps/application/component/text_title/text_title.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
@ -35,6 +36,7 @@ class PhoneNumberView extends StatelessWidget {
            inputFormatters: [
              FilteringTextInputFormatter.deny(RegExp(r'^0'))
            ],
+            contentPadding: EdgeInsets.all(1),
            prefixIcon: Container(
                width: SizeConfig.width * .23,
                padding:
@ -108,7 +110,7 @@ class PhoneNumberView extends StatelessWidget {
                  )
              )
            ],
-          )
+          ),
        ],
      ),
    );
--- a/lib/features/auth/registration/view/registration_success_view.dart
+++ b/lib/features/auth/registration/view/registration_success_view.dart
@ -0,0 +1,40 @@
+import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/component/image/image_view.dart';
+import 'package:cims_apps/application/component/text_caption/text_caption.dart';
+import 'package:cims_apps/core/route/route.dart';
+import 'package:cims_apps/features/bottom_navigation_view.dart';
+import 'package:flutter/material.dart';
+
+class RegistrationSuccessView extends StatelessWidget {
+  const RegistrationSuccessView({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Container(
+        padding: const EdgeInsets.all(24.0),
+        child: Column(
+          children: [
+            const ImageView(image: PathAssets.imgFinish),
+            const TextCaption(
+              crossAxisAlignment: CrossAxisAlignment.center,
+              textAlignSubtitle: TextAlign.center,
+              title: 'Registration Successful!',
+              subtitle:
+                  'Please wait for the data verification process so that you can start investing.',
+            ),
+            const Spacer(),
+            ButtonView(
+              name: 'Next',
+              marginVertical: 0.0,
+              onPressed: () {
+                routePush(context, page: const BottomNavigationView());
+              },
+            )
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/features/auth/registration/view/submission_data/data_bank/confirm_bank_account.dart
+++ b/lib/features/auth/registration/view/submission_data/data_bank/confirm_bank_account.dart
@ -0,0 +1,112 @@
+import 'package:cims_apps/application/component/button/back_button_view.dart';
+import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/component/list_tile/list_tile_view.dart';
+import 'package:cims_apps/application/component/text_caption/text_caption.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/core/route/route.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/submission_parent.dart';
+import 'package:flutter/material.dart';
+
+class ConfirmBankAccount extends StatelessWidget {
+  const ConfirmBankAccount({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    List listData = [
+      {'title': 'Bank Name', 'subtitle': 'Bank Mandiri'},
+      {'title': 'Account Number', 'subtitle': '123002212084'},
+      {'title': 'Account Owner Name', 'subtitle': 'Muhamad Rosyidin'},
+      {'title': 'Name on ID card', 'subtitle': 'Muhamad Rosyidin'},
+    ];
+    return Scaffold(
+      appBar: AppBar(
+        toolbarHeight: 70,
+        backgroundColor: Colors.white,
+        surfaceTintColor: Colors.white,
+        automaticallyImplyLeading: false,
+        title: Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            const BackButtonView(),
+            const Text('Registration'),
+            SizedBox(
+              width: SizeConfig.width * 0.1,
+            )
+          ],
+        ),
+        shape: const RoundedRectangleBorder(
+            side: BorderSide(color: ColorPalette.slate200)),
+      ),
+      body: SingleChildScrollView(
+        padding: const EdgeInsets.all(16.0),
+        child: SizedBox(
+          height: SizeConfig.height * .85,
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              const TextCaption(title: 'Bank account confirmation'),
+              SizedBox(
+                height: SizeConfig.height * .6,
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.start,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    ...listData.map((e) {
+                      return Padding(
+                        padding: const EdgeInsets.only(bottom: 16.0),
+                        child: Column(
+                          mainAxisAlignment: MainAxisAlignment.start,
+                          crossAxisAlignment: CrossAxisAlignment.start,
+                          children: [
+                            Text(
+                              e['title'],
+                              style: const TextStyle(
+                                  color: ColorPalette.slate400, fontSize: 16),
+                            ),
+                            Text(
+                              e['subtitle'],
+                              style: const TextStyle(
+                                  fontSize: 16,
+                                  color: ColorPalette.slate800,
+                                  fontWeight: FontWeight.w600),
+                            ),
+                          ],
+                        ),
+                      );
+                    }).toList(),
+                    const ListTileView(
+                      title:
+                          'Make sure your data is correct as it will affect the disbursement process',
+                    ),
+                  ],
+                ),
+              ),
+              Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  ButtonView(
+                    name: 'Recheck',
+                    isOutlined: true,
+                    width: SizeConfig.width * .42,
+                    onPressed: () {
+                      Navigator.pop(context);
+                    },
+                  ),
+                  ButtonView(
+                    name: 'Confirm',
+                    width: SizeConfig.width * .42,
+                    onPressed: () {
+                      routePush(context, page: const SubmissionParent());
+                    },
+                  ),
+                ],
+              )
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}
--- a/lib/features/auth/registration/view/submission_data/data_bank/guide_screen.dart
+++ b/lib/features/auth/registration/view/submission_data/data_bank/guide_screen.dart
@ -1,5 +1,5 @@
 import 'package:cims_apps/application/assets/path_assets.dart';
-import 'package:cims_apps/application/component/button/button_back.dart';
+import 'package:cims_apps/application/component/button/back_button_view.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/component/text_caption/text_caption.dart';
@ -93,7 +93,7 @@ class GuideScreen extends StatelessWidget {
        title: Row(
          mainAxisAlignment: MainAxisAlignment.spaceBetween,
          children: [
-            const ButtonBack(),
+            const BackButtonView(),
            const Text('Guide'),
            SizedBox(
              width: SizeConfig.width * 0.1,
--- a/lib/features/auth/registration/view/submission_data/data_bank/submit_bank_account.dart
+++ b/lib/features/auth/registration/view/submission_data/data_bank/submit_bank_account.dart
@ -6,7 +6,9 @@ import 'package:cims_apps/application/component/text_form/text_form_view.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/data_bank/guide_screen.dart';
+import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
 import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';

 class SubmitBankAccount extends StatelessWidget {
  const SubmitBankAccount({Key? key}) : super(key: key);
@ -20,37 +22,48 @@ class SubmitBankAccount extends StatelessWidget {
      ItemSelectForm('key4', 'BANK MANDIRI'),
      ItemSelectForm('key5', 'CIMB NIAGA'),
    ];
-    return SingleChildScrollView(
-      child: Column(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          const TextCaption(title: 'Input your bank account data'),
-          SelectFormView(
-            name: 'Bank Name',
-            listItem: listForm,
-            onSelect: (value) {},
-          ),
-          TextFormView(
-            name: 'Account Number',
-            trailingTitleWidget: SizedBox(
-              width: 24,
-              child: GestureDetector(
-                onTap: () {
-                  routePush(context, page: GuideScreen());
-                },
-                child: const ImageView(image: PathAssets.iconQuestion),
-              ),
-            ),
-          ),
-          TextFormView(name: 'Account Owner Name'),
-          const Text(
-            "Make sure the account you use is in your name, not someone else's",
-            style: TextStyle(
-              color: ColorPalette.slate400,
-            ),
+    return MultiProvider(
+        providers: [
+          ChangeNotifierProvider(
+            create: (context) => SubmissionDataViewModel(),
          )
        ],
-      ),
-    );
+        builder: (context, child) {
+          return SizedBox(
+            child: Consumer<SubmissionDataViewModel>(
+                builder: (context, provider, child) {
+              return Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  const TextCaption(title: 'Input your bank account data'),
+                  SelectFormView(
+                    name: 'Bank Name',
+                    listItem: listForm,
+                    onSelect: (value) {},
+                  ),
+                  TextFormView(
+                    name: 'Account Number',
+                    trailingTitleWidget: SizedBox(
+                      width: 24,
+                      child: GestureDetector(
+                        onTap: () {
+                          routePush(context, page: const GuideScreen());
+                        },
+                        child: const ImageView(image: PathAssets.iconQuestion),
+                      ),
+                    ),
+                  ),
+                  TextFormView(name: 'Account Owner Name'),
+                  const Text(
+                    "Make sure the account you use is in your name, not someone else's",
+                    style: TextStyle(
+                      color: ColorPalette.slate400,
+                    ),
+                  ),
+                ],
+              );
+            }),
+          );
+        });
  }
 }
--- a/lib/features/auth/registration/view/submission_data/risk_profile/question_view.dart
+++ b/lib/features/auth/registration/view/submission_data/risk_profile/question_view.dart
@ -1,5 +1,5 @@
 import 'package:cims_apps/application/assets/path_assets.dart';
-import 'package:cims_apps/application/component/button/button_back.dart';
+import 'package:cims_apps/application/component/button/back_button_view.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
@ -37,7 +37,7 @@ class _QuestionViewState extends State<QuestionView> {
            title: Row(
              mainAxisAlignment: MainAxisAlignment.spaceBetween,
              children: [
-                ButtonBack(),
+                BackButtonView(),
                const Text('Risk Profile', textAlign: TextAlign.center),
                SizedBox(width: SizeConfig.width * 0.1)
              ],
--- a/lib/features/auth/registration/view/submission_data/risk_profile/results_view.dart
+++ b/lib/features/auth/registration/view/submission_data/risk_profile/results_view.dart
@ -1,19 +1,17 @@
-import 'package:cims_apps/application/assets/path_assets.dart';
-import 'package:cims_apps/application/component/button/button_back.dart';
+import 'package:cims_apps/application/component/button/back_button_view.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
-import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
-import 'package:cims_apps/features/auth/registration/view/registration_password_view.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/risk_profile/risk_profile_view_model/risk_profile_view_model.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/terms_and_condition/terms_and_condition_view.dart';
 import 'package:flutter/material.dart';
-import 'package:provider/provider.dart';

 class ResultsView extends StatelessWidget {
  final String totalScore;
  final RiskProfileResult typeResult;
-  const ResultsView({super.key, required this.typeResult, required this.totalScore});
+  const ResultsView(
+      {super.key, required this.typeResult, required this.totalScore});

  @override
  Widget build(BuildContext context) {
@ -26,19 +24,16 @@ class ResultsView extends StatelessWidget {
        title: Row(
          mainAxisAlignment: MainAxisAlignment.spaceBetween,
          children: [
-            ButtonBack(),
+            const BackButtonView(),
            const Text('Risk Profile', textAlign: TextAlign.center),
-            SizedBox(
-                width: SizeConfig.width * 0.1
-            )
+            SizedBox(width: SizeConfig.width * 0.1)
          ],
        ),
        shape: const RoundedRectangleBorder(
-            side: BorderSide(color: ColorPalette.slate200)
-        ),
+            side: BorderSide(color: ColorPalette.slate200)),
      ),
      body: SingleChildScrollView(
-        padding: EdgeInsets.all(24),
+        padding: const EdgeInsets.all(24),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
          children: [
@ -46,39 +41,41 @@ class ResultsView extends StatelessWidget {
              borderRadius: BorderRadius.circular(8),
              child: Container(
                decoration: BoxDecoration(
-                  color: typeResult.color,
-                  image: DecorationImage(image: AssetImage(typeResult.img), alignment: Alignment.centerRight)
-                ),
+                    color: typeResult.color,
+                    image: DecorationImage(
+                        image: AssetImage(typeResult.img),
+                        alignment: Alignment.centerRight)),
                child: Row(
                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
                  children: [
                    Container(
-                      padding: EdgeInsets.all(24),
+                      padding: const EdgeInsets.all(24),
                      child: Column(
                        crossAxisAlignment: CrossAxisAlignment.start,
                        children: [
                          Text(
                            typeResult.type,
-                            style: TextStyle(
-                              fontWeight: FontWeight.bold,
-                              fontSize: 24,
-                              color: ColorPalette.white
-                            ),
+                            style: const TextStyle(
+                                fontWeight: FontWeight.bold,
+                                fontSize: 24,
+                                color: ColorPalette.white),
                          ),
-                          SizedBox(height: 16,),
-                          Text('Total Score :',
+                          const SizedBox(
+                            height: 16,
+                          ),
+                          const Text(
+                            'Total Score :',
                            style: TextStyle(
                                fontWeight: FontWeight.bold,
                                fontSize: 16,
-                                color: ColorPalette.white
-                            ),
+                                color: ColorPalette.white),
                          ),
-                          Text(totalScore,
-                            style: TextStyle(
+                          Text(
+                            totalScore,
+                            style: const TextStyle(
                                fontWeight: FontWeight.bold,
                                fontSize: 28,
-                                color: ColorPalette.white
-                            ),
+                                color: ColorPalette.white),
                          )
                        ],
                      ),
@ -87,35 +84,30 @@ class ResultsView extends StatelessWidget {
                ),
              ),
            ),
-            SizedBox(
+            const SizedBox(
              height: 24,
            ),
-            Text(
-              typeResult.desc,
-              style: TextStyle(
-                color: ColorPalette.slate500,
-                fontSize: 16
-              )
-            ),
-            SizedBox(
+            Text(typeResult.desc,
+                style: const TextStyle(
+                    color: ColorPalette.slate500, fontSize: 16)),
+            const SizedBox(
              height: 24,
            ),
-            Text(
+            const Text(
              'Suitable Product',
              style: TextStyle(
-                color: ColorPalette.slate800,
-                fontWeight: FontWeight.bold,
-                fontSize: 16
-              ),
+                  color: ColorPalette.slate800,
+                  fontWeight: FontWeight.bold,
+                  fontSize: 16),
            ),
-            SizedBox(
+            const SizedBox(
              height: 16,
            ),
            Wrap(
              runSpacing: 16,
              children: typeResult.suitableProduct.map((e) {
                return Container(
-                  padding: EdgeInsets.all(16),
+                  padding: const EdgeInsets.all(16),
                  decoration: BoxDecoration(
                    borderRadius: BorderRadius.circular(6),
                    border: Border.all(color: ColorPalette.slate200),
@ -123,24 +115,24 @@ class ResultsView extends StatelessWidget {
                  child: Row(
                    children: [
                      Container(
-                        padding: EdgeInsets.all(8),
-                        alignment: Alignment.center,
-                        decoration: BoxDecoration(
-                          shape: BoxShape.circle,
-                          color: typeResult.color.withOpacity(0.1)
-                        ),
-                        child: Image.asset(e['icon'], width: SizeConfig.width * 0.07, color: typeResult.color)
-                      ),
-                      SizedBox(
+                          padding: const EdgeInsets.all(8),
+                          alignment: Alignment.center,
+                          decoration: BoxDecoration(
+                              shape: BoxShape.circle,
+                              color: typeResult.color.withOpacity(0.1)),
+                          child: Image.asset(e['icon'],
+                              width: SizeConfig.width * 0.07,
+                              color: typeResult.color)),
+                      const SizedBox(
                        width: 12,
                      ),
                      Expanded(
-                        child: Text(e['desc'],
-                          style: TextStyle(
-                            fontSize: 16,
-                            fontWeight: FontWeight.bold,
-                            color: ColorPalette.slate800
-                          ),
+                        child: Text(
+                          e['desc'],
+                          style: const TextStyle(
+                              fontSize: 16,
+                              fontWeight: FontWeight.bold,
+                              color: ColorPalette.slate800),
                        ),
                      )
                    ],
@ -148,13 +140,12 @@ class ResultsView extends StatelessWidget {
                );
              }).toList(),
            ),
-            SizedBox(
+            const SizedBox(
              height: 32,
            ),
            ButtonView(
              name: 'Re-test',
-              onPressed: () {
-              },
+              onPressed: () {},
              marginVertical: 0,
              backgroundColor: ColorPalette.white,
              textColor: ColorPalette.primary,
@ -162,21 +153,21 @@ class ResultsView extends StatelessWidget {
              isOutlined: true,
              textSize: 16,
              heightWrapContent: true,
-              contentPadding: EdgeInsets.all(16),
+              contentPadding: const EdgeInsets.all(16),
              width: SizeConfig.width,
            ),
-            SizedBox(
+            const SizedBox(
              height: 16,
            ),
            ButtonView(
              name: 'Confirm',
              onPressed: () {
-                routePush(context, page: DialogSuccess());
+                routePush(context, page: const TermsAndConditionView());
              },
              marginVertical: 0,
              textSize: 16,
              heightWrapContent: true,
-              contentPadding: EdgeInsets.all(16),
+              contentPadding: const EdgeInsets.all(16),
              width: SizeConfig.width,
            )
          ],
--- a/lib/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart
+++ b/lib/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart
@ -1,5 +1,4 @@
 import 'package:cims_apps/application/assets/path_assets.dart';
-import 'package:cims_apps/application/component/button/button_back.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
@ -13,93 +12,75 @@ class RiskProfileView extends StatelessWidget {

  @override
  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        toolbarHeight: 70,
-        backgroundColor: Colors.white,
-        surfaceTintColor: Colors.white,
-        automaticallyImplyLeading: false,
-        title: Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            ButtonBack(),
-            const Text('Risk Profile', textAlign: TextAlign.center),
-            SizedBox(width: SizeConfig.width * 0.1)
-          ],
-        ),
-        shape: const RoundedRectangleBorder(
-            side: BorderSide(color: ColorPalette.slate200)),
-      ),
-      body: Container(
-        width: SizeConfig.width,
-        height: SizeConfig.height,
-        padding: EdgeInsets.all(24),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            Column(
-              children: [
-                ImageView(image: PathAssets.imgDataReport),
-                SizedBox(
-                  height: 24,
-                ),
-                Text(
-                  'Know Your Risk Profile',
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                      color: ColorPalette.slate800,
-                      fontWeight: FontWeight.bold,
-                      fontSize: 24),
-                ),
-                SizedBox(
-                  height: 12,
-                ),
-                Text(
-                  'We will provide recommendations that match your profile and risk tolerance level.',
-                  textAlign: TextAlign.center,
-                  style: TextStyle(
-                      fontSize: 16,
-                      fontWeight: FontWeight.w600,
-                      color: ColorPalette.slate500),
-                ),
-              ],
-            ),
-            Column(
-              children: [
-                Row(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    ImageView(
-                      image: PathAssets.iconShield,
-                      width: 20,
-                      height: 22,
-                    ),
-                    SizedBox(
-                      width: 8,
-                    ),
-                    Text(
-                      'Your data is secure and encrypted',
-                      style: TextStyle(
-                          fontWeight: FontWeight.w600,
-                          color: ColorPalette.primary,
-                          fontSize: 16),
-                    )
-                  ],
-                ),
-                SizedBox(
-                  height: 24,
-                ),
-                ButtonView(
-                  name: "Let's Start",
-                  onPressed: () {
-                    routePush(context, page: QuestionView());
-                  },
-                  marginVertical: 0,
-                )
-              ],
-            )
-          ],
-        ),
+    return Container(
+      width: SizeConfig.width,
+      height: SizeConfig.height,
+      padding: EdgeInsets.all(24),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          Column(
+            children: [
+              ImageView(image: PathAssets.imgDataReport),
+              SizedBox(
+                height: 24,
+              ),
+              Text(
+                'Know Your Risk Profile',
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                    color: ColorPalette.slate800,
+                    fontWeight: FontWeight.bold,
+                    fontSize: 24),
+              ),
+              SizedBox(
+                height: 12,
+              ),
+              Text(
+                'We will provide recommendations that match your profile and risk tolerance level.',
+                textAlign: TextAlign.center,
+                style: TextStyle(
+                    fontSize: 16,
+                    fontWeight: FontWeight.w600,
+                    color: ColorPalette.slate500),
+              ),
+            ],
+          ),
+          Column(
+            children: [
+              Row(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  ImageView(
+                    image: PathAssets.iconShield,
+                    width: 20,
+                    height: 22,
+                  ),
+                  SizedBox(
+                    width: 8,
+                  ),
+                  Text(
+                    'Your data is secure and encrypted',
+                    style: TextStyle(
+                        fontWeight: FontWeight.w600,
+                        color: ColorPalette.primary,
+                        fontSize: 16),
+                  )
+                ],
+              ),
+              SizedBox(
+                height: 24,
+              ),
+              ButtonView(
+                name: "Let's Start",
+                onPressed: () {
+                  routePush(context, page: QuestionView());
+                },
+                marginVertical: 0,
+              )
+            ],
+          )
+        ],
      ),
    );
  }
--- a/lib/features/auth/registration/view/submission_data/submission_parent.dart
+++ b/lib/features/auth/registration/view/submission_data/submission_parent.dart
@ -1,13 +1,18 @@
+import 'package:cims_apps/application/component/button/back_button_view.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/data_bank/confirm_bank_account.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/data_bank/submit_bank_account.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/risk_profile/risk_profile_view.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submit_data_id_card.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submit_photo_ktp.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submit_email.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submit_personal_data.dart';
 import 'package:cims_apps/features/auth/registration/view/submission_data/submit_photo_selfie.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/submit_signature/initial_signature.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/submit_signature/submit_signature.dart';
 import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
 import 'package:cims_apps/features/bottom_navigation_view.dart';
 import 'package:flutter/material.dart';
@ -24,7 +29,7 @@ class SubmissionParent extends StatefulWidget {
 class _SubmissionParentState extends State<SubmissionParent> {
  Widget _stepItem({bool isCurrentStep = false, bool isDone = false}) {
    return Container(
-      margin: const EdgeInsets.only(right: 4.0, left: 4.0),
+      margin: const EdgeInsets.only(right: 0.0, left: 4.0),
      height: 6,
      width: SizeConfig.width * .08,
      decoration: BoxDecoration(
@ -51,17 +56,26 @@ class _SubmissionParentState extends State<SubmissionParent> {
      case 6:
        return const SubmitBankAccount();
      case 7:
-        return Container(
-          child: Text("Step 7"),
-        );
+        return const InitialSignature();
      case 8:
-        return Container(
-          child: Text("Step 8"),
-        );
+        return const RiskProfileView();
      case 9:
-        return Container(
-          child: Text("Step 9"),
-        );
+        return const Text("Step 9");
+    }
+  }
+
+  _contentPush(int index) {
+    switch (index) {
+      case 6:
+        routePush(context, page: const ConfirmBankAccount());
+      case 7:
+        routePush(context, page: const SubmitSignature());
+      // case 8:
+      //   return const RiskProfileView();
+      // case 9:
+      //   return Container(
+      //     child: Text("Step 9"),
+      //   );
    }
  }

@ -77,15 +91,30 @@ class _SubmissionParentState extends State<SubmissionParent> {
                  routeType: RouteType.pushReplace);
              return false;
            },
-            child: Scaffold(
-              appBar: AppBar(
-                title: const Text('Registration'),
-              ),
-              body: Stack(
-                children: [
-                  Consumer<SubmissionDataViewModel>(
-                      builder: (context, provider, child) {
-                    return Column(
+            child: Consumer<SubmissionDataViewModel>(
+                builder: (context, provider, child) {
+              return Scaffold(
+                appBar: AppBar(
+                  toolbarHeight: 70,
+                  backgroundColor: Colors.white,
+                  surfaceTintColor: Colors.white,
+                  automaticallyImplyLeading: false,
+                  title: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      const BackButtonView(),
+                      const Text('Registration'),
+                      SizedBox(
+                        width: SizeConfig.width * 0.1,
+                      )
+                    ],
+                  ),
+                  shape: const RoundedRectangleBorder(
+                      side: BorderSide(color: ColorPalette.slate200)),
+                ),
+                body: Stack(
+                  children: [
+                    Column(
                      crossAxisAlignment: CrossAxisAlignment.start,
                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
                      children: [
@ -111,7 +140,8 @@ class _SubmissionParentState extends State<SubmissionParent> {
                          ),
                        ),
                        provider.getCurrentStep == 3 ||
-                                provider.getCurrentStep == 4
+                                provider.getCurrentStep == 4 ||
+                                provider.getCurrentStep == 8
                            ? const SizedBox()
                            : Align(
                                alignment: Alignment.bottomCenter,
@ -119,16 +149,17 @@ class _SubmissionParentState extends State<SubmissionParent> {
                                  name: 'Next',
                                  marginVertical: 16.0,
                                  onPressed: () {
+                                    _contentPush(provider.getCurrentStep);
                                    provider.nextSubmission(context);
                                  },
                                ),
                              )
                      ],
-                    );
-                  }),
-                ],
-              ),
-            ),
+                    ),
+                  ],
+                ),
+              );
+            }),
          );
        });
  }
--- a/lib/features/auth/registration/view/submission_data/submit_signature/initial_signature.dart
+++ b/lib/features/auth/registration/view/submission_data/submit_signature/initial_signature.dart
@ -0,0 +1,33 @@
+import 'package:cims_apps/application/assets/path_assets.dart';
+import 'package:cims_apps/application/component/image/image_view.dart';
+import 'package:cims_apps/application/component/list_tile/list_tile_view.dart';
+import 'package:cims_apps/application/component/text_caption/text_caption.dart';
+import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class InitialSignature extends StatelessWidget {
+  const InitialSignature({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return MultiProvider(
+        providers: [
+          ChangeNotifierProvider(
+            create: (context) => SubmissionDataViewModel(),
+          )
+        ],
+        builder: (context, child) {
+          return const Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              TextCaption(title: 'Draw your digital sign'),
+              ImageView(image: PathAssets.frameSignature),
+              ListTileView(
+                  title:
+                      'Make sure the sign you draw is match with your ID Card'),
+            ],
+          );
+        });
+  }
+}
--- a/lib/features/auth/registration/view/submission_data/submit_signature/submit_signature.dart
+++ b/lib/features/auth/registration/view/submission_data/submit_signature/submit_signature.dart
@ -0,0 +1,100 @@
+import 'dart:ui' as ui;
+
+import 'package:cims_apps/application/component/button/back_button_view.dart';
+import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/component/list_tile/list_tile_view.dart';
+import 'package:cims_apps/application/component/text_caption/text_caption.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/core/route/route.dart';
+import 'package:cims_apps/core/utils/size_config.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/submission_parent.dart';
+import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
+import 'package:dotted_border/dotted_border.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+import 'package:syncfusion_flutter_signaturepad/signaturepad.dart';
+
+class SubmitSignature extends StatelessWidget {
+  const SubmitSignature({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    GlobalKey<SfSignaturePadState> signaturePadKey = GlobalKey();
+    return ChangeNotifierProvider(
+        create: (context) => SubmissionDataViewModel(),
+        builder: (context, child) {
+          return Scaffold(
+            appBar: AppBar(
+              toolbarHeight: 70,
+              backgroundColor: Colors.white,
+              surfaceTintColor: Colors.white,
+              automaticallyImplyLeading: false,
+              title: Row(
+                mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                children: [
+                  const BackButtonView(),
+                  const Text('Registration'),
+                  SizedBox(
+                    width: SizeConfig.width * 0.1,
+                  )
+                ],
+              ),
+              shape: const RoundedRectangleBorder(
+                  side: BorderSide(color: ColorPalette.slate200)),
+            ),
+            body: Container(
+              padding: const EdgeInsets.all(16.0),
+              child: Consumer<SubmissionDataViewModel>(
+                  builder: (context, provider, child) {
+                return Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    const TextCaption(title: 'Draw your digital sign'),
+                    SizedBox(
+                      height: SizeConfig.height * .28,
+                      child: DottedBorder(
+                        color: ColorPalette.primary,
+                        borderType: BorderType.RRect,
+                        radius: const Radius.circular(8),
+                        padding: const EdgeInsets.all(6),
+                        strokeWidth: 2.0,
+                        dashPattern: const [14, 0, 0, 8],
+                        child: SfSignaturePad(
+                          key: signaturePadKey,
+                          backgroundColor: Colors.white,
+                        ),
+                      ),
+                    ),
+                    const ListTileView(
+                        title:
+                            'Make sure the sign you draw is match with your ID Card'),
+                    const Spacer(),
+                    Row(
+                      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                      children: [
+                        ButtonView(
+                          name: 'Delete',
+                          isOutlined: true,
+                          width: SizeConfig.width * .42,
+                          onPressed: () {
+                            signaturePadKey.currentState?.clear();
+                          },
+                        ),
+                        ButtonView(
+                          name: 'Next',
+                          width: SizeConfig.width * .42,
+                          onPressed: () async {
+                            // ui.Image image = await _signaturePadKey.currentState!.toImage();
+                            routePush(context, page: const SubmissionParent());
+                          },
+                        ),
+                      ],
+                    )
+                  ],
+                );
+              }),
+            ),
+          );
+        });
+  }
+}
--- a/lib/features/auth/registration/view/submission_data/terms_and_condition/terms_and_condition_view.dart
+++ b/lib/features/auth/registration/view/submission_data/terms_and_condition/terms_and_condition_view.dart
@ -0,0 +1,103 @@
+import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
+import 'package:cims_apps/application/component/button/button_view.dart';
+import 'package:cims_apps/application/theme/color_palette.dart';
+import 'package:cims_apps/core/route/route.dart';
+import 'package:cims_apps/features/auth/registration/view/submission_data/submission_parent.dart';
+import 'package:cims_apps/features/auth/registration/viewmodel/submission_data_viewmodel.dart';
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+class TermsAndConditionView extends StatelessWidget {
+  const TermsAndConditionView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    List<String> listRules = [
+      'I have never committed nor been involved in any breach or violations of laws, especially that in financial terms such as corruption, manipulation, money laundering or terrorism',
+      'I have received comprehensive description from mutual marketing officers and fully understood Mutual Fund’s characteristics and therefore is ready for any risks occurring from investing in mutual fund',
+      'I have read and understood the content of prospectus, monthly report of mutual fun performance, products and other information related to the Mutual Fund that I am about to purchase',
+      'I fully understand that the Mutual Fund is the investment product of PT Gemilang Indonesia Manajemen Investasi and not the product of any selling agent',
+      'I fully understand that Investment Product is not included in Government Warranty or Deposit Warranty Institution and therefore such product is not guaranteed by government',
+      'I agree to relieve PT Gemilang Indonesia Manajemen Investasi any claims, cost and expenses related to or occurred due to PT Gemilang Indonesia Manajemen Investasi’s actions with regards to its instructions of my mutual fun unit transactions',
+      'I fully understand, consider and I am fully responsible for all the investment decision I have made without any influence of PT Gemilang Indonesia Manajemen Investasi or its employees, and;',
+      'I declare that all data I have presented are true',
+      'I am willing to comply with the provisions set forth in laws in the financial services sectors',
+      'PT Gemilang Indonesia Manajemen Investasi may refuse and close business relationship, refuse to transac with prospective customers and/or customers under UJK regulation No. 12/POJK. 01/2017 on the Implementation of Anti Money Laundering and Terrorism Funding Prevention Program in Financial Service Sector',
+      'I am willing to provide my data and information from PT Gemilang  Indonesia Manajemen Investasi to groups'
+    ];
+
+    return ChangeNotifierProvider(
+        create: (context) => SubmissionDataViewModel(),
+        builder: (context, child) {
+          return Scaffold(
+            appBar:
+                const CustomAppBar(height: 70, title: 'Terms And Condition'),
+            body: SingleChildScrollView(
+              padding: const EdgeInsets.all(24),
+              child: Column(
+                children: [
+                  const Text(
+                    'In relevance with the data that i have submitted and in relation to the purchase of Mutual Fund Products, I hereby declare that:',
+                    style: TextStyle(
+                        fontWeight: FontWeight.w600,
+                        color: ColorPalette.slate800),
+                  ),
+                  const SizedBox(height: 12),
+                  ...listRules.asMap().entries.map((e) {
+                    return Padding(
+                      padding: EdgeInsets.only(top: e.key != 0 ? 12 : 0),
+                      child: Row(
+                        crossAxisAlignment: CrossAxisAlignment.start,
+                        children: [
+                          Text('${e.key + 1}',
+                              style: const TextStyle(
+                                  color: ColorPalette.slate500)),
+                          const SizedBox(width: 12),
+                          Expanded(
+                              child: Text(e.value,
+                                  style: const TextStyle(
+                                      color: ColorPalette.slate500)))
+                        ],
+                      ),
+                    );
+                  })
+                ],
+              ),
+            ),
+            bottomNavigationBar: Consumer<SubmissionDataViewModel>(
+                builder: (context, provider, child) {
+              return Container(
+                height: 84,
+                padding: const EdgeInsets.symmetric(horizontal: 24),
+                child: Row(
+                  children: [
+                    Expanded(
+                        child: ButtonView(
+                      name: 'Decline',
+                      onPressed: () {
+                        Navigator.pop(context);
+                      },
+                      marginVertical: 16,
+                      backgroundColor: ColorPalette.white,
+                      textColor: ColorPalette.primary,
+                      isOutlined: true,
+                      borderColor: ColorPalette.primary,
+                    )),
+                    const SizedBox(width: 16),
+                    Expanded(
+                        child: ButtonView(
+                            name: 'Accept',
+                            onPressed: () {
+                              provider.nextSubmission(context);
+                              routePush(context,
+                                  page: const SubmissionParent());
+                            },
+                            marginVertical: 16))
+                  ],
+                ),
+              );
+            }),
+          );
+        });
+  }
+}
--- a/lib/features/auth/registration/viewmodel/submission_data_viewmodel.dart
+++ b/lib/features/auth/registration/viewmodel/submission_data_viewmodel.dart
@ -34,6 +34,7 @@ class SubmissionDataViewModel extends ChangeNotifier {
    } else {
      //ToDo : Go To next step after completing the submission
    }
+
    notifyListeners();
  }
 }
--- a/lib/features/bottom_navigation_view.dart
+++ b/lib/features/bottom_navigation_view.dart
@ -1,5 +1,6 @@
 import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/features/dashboard/dashboard_account/view/homepage/homepage_view.dart';
+import 'package:cims_apps/features/dashboard/dashboard_account/view/plan/plan_view.dart';
 import 'package:cims_apps/features/dashboard/dashboard_account/view/portfolio/portfolio_view.dart';
 import 'package:flutter/material.dart';

@ -18,9 +19,7 @@ class _BottomNavigationViewState extends State<BottomNavigationView> {
    ///TODO: masukan pagenya dilistWidget ini
    List<Widget> listWidget = [
      HomeView(),
-      Container(
-        color: Colors.redAccent,
-      ),
+      PlanView(),
      Container(),
      PortofolioView(),
      Container(),
@ -32,8 +31,8 @@ class _BottomNavigationViewState extends State<BottomNavigationView> {
        label: 'Home',
      ),
      BottomNavigationBarItem(
-        icon: Icon(Icons.search),
-        label: 'Search',
+        icon: Icon(Icons.file_open),
+        label: 'Plan',
      ),
      BottomNavigationBarItem(
        icon: Icon(Icons.compare_arrows),
@ -51,20 +50,24 @@ class _BottomNavigationViewState extends State<BottomNavigationView> {

    return Scaffold(
      body: listWidget[_selectedIndex],
-      bottomNavigationBar: BottomNavigationBar(
-        onTap: (value) {
-          setState(() {
-            _selectedIndex = value;
-          });
-        },
-        currentIndex: _selectedIndex,
-        items: listNavigation,
-        type: BottomNavigationBarType.fixed,
-        showUnselectedLabels: true,
-        selectedItemColor: ColorPalette.primary,
-        unselectedItemColor: Colors.black,
-        selectedLabelStyle: const TextStyle(color: ColorPalette.primary),
-        unselectedLabelStyle: const TextStyle(color: Colors.black),
+      bottomNavigationBar: Padding(
+        padding: const EdgeInsets.symmetric(vertical: 12),
+        child: BottomNavigationBar(
+          elevation: 0,
+          onTap: (value) {
+            setState(() {
+              _selectedIndex = value;
+            });
+          },
+          currentIndex: _selectedIndex,
+          items: listNavigation,
+          type: BottomNavigationBarType.fixed,
+          showUnselectedLabels: true,
+          selectedItemColor: ColorPalette.primary,
+          unselectedItemColor: Colors.black,
+          selectedLabelStyle: const TextStyle(color: ColorPalette.primary),
+          unselectedLabelStyle: const TextStyle(color: Colors.black),
+        ),
      ),
    );
  }
--- a/lib/features/dashboard/dashboard_account/view/invest_type/invest_type_view.dart
+++ b/lib/features/dashboard/dashboard_account/view/invest_type/invest_type_view.dart
@ -1,5 +1,5 @@
 import 'package:cims_apps/application/assets/path_assets.dart';
-import 'package:cims_apps/application/component/button/button_back.dart';
+import 'package:cims_apps/application/component/button/back_button_view.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/component/text_title/text_title.dart';
 import 'package:cims_apps/application/theme/color_palette.dart';
@ -53,7 +53,7 @@ class _InvestTypeViewState extends State<InvestTypeView> {
                  child: Row(
                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                    children: [
-                      const ButtonBack(),
+                      const BackButtonView(),
                      TextTitle(title: widget.title, color: Colors.white),
                      SizedBox(
                        width: SizeConfig.width * 0.1,
--- a/lib/features/dashboard/dashboard_account/view/plan/plan_view.dart
+++ b/lib/features/dashboard/dashboard_account/view/plan/plan_view.dart
@ -0,0 +1,22 @@
+import 'package:cims_apps/application/component/custom_app_bar/custom_app_bar.dart';
+import 'package:cims_apps/application/component/goal_investing_view.dart';
+import 'package:flutter/material.dart';
+
+class PlanView extends StatelessWidget {
+  const PlanView({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: CustomAppBar(height: 70, title: 'Investment Plan'),
+      body: SingleChildScrollView(
+        padding: EdgeInsets.all(24),
+        child: Column(
+          children: [
+            GoalInvestingView()
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/features/dashboard/dashboard_account/view/product/product_view.dart
+++ b/lib/features/dashboard/dashboard_account/view/product/product_view.dart
@ -1,7 +1,7 @@
 import 'dart:math';

 import 'package:cims_apps/application/assets/path_assets.dart';
-import 'package:cims_apps/application/component/button/button_back.dart';
+import 'package:cims_apps/application/component/button/back_button_view.dart';
 import 'package:cims_apps/application/component/button/button_view.dart';
 import 'package:cims_apps/application/component/image/image_view.dart';
 import 'package:cims_apps/application/component/text_form/text_form_view.dart';
@ -112,7 +112,7 @@ class _ProductViewState extends State<ProductView> {
                  child: Row(
                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
                    children: [
-                      ButtonBack(),
+                      BackButtonView(),
                      Wrap(
                        spacing: 12,
                        children: [
--- a/lib/features/dashboard/dashboard_public/view/dashboard_public_view.dart
+++ b/lib/features/dashboard/dashboard_public/view/dashboard_public_view.dart
@ -5,8 +5,8 @@ import 'package:cims_apps/application/theme/color_palette.dart';
 import 'package:cims_apps/core/route/route.dart';
 import 'package:cims_apps/core/utils/size_config.dart';
 import 'package:cims_apps/features/auth/login/view/login_view.dart';
+import 'package:cims_apps/features/auth/registration/view/initial_registration_step.dart';
 import 'package:cims_apps/features/auth/registration/view/registration_view.dart';
-import 'package:cims_apps/features/bottom_navigation_view.dart';
 import 'package:flutter/material.dart';

 class DashboardPublicView extends StatelessWidget {
@ -39,9 +39,11 @@ class DashboardPublicView extends StatelessWidget {
  Widget build(BuildContext context) {
    return Scaffold(
      body: Container(
-        padding: const EdgeInsets.symmetric(
-          vertical: 32.0,
-          horizontal: 24.0,
+        padding: const EdgeInsets.only(
+          top: 32.0,
+          bottom: 8.0,
+          left: 24.0,
+          right: 24.0,
        ),
        child: Column(
          crossAxisAlignment: CrossAxisAlignment.start,
@ -93,7 +95,9 @@ class DashboardPublicView extends StatelessWidget {
                image: PathAssets.iconGoogle,
                width: 26,
              ),
-              onPressed: () {},
+              onPressed: () {
+                routePush(context, page: const InitialRegistrationStep());
+              },
            ),
            Row(
              mainAxisAlignment: MainAxisAlignment.spaceBetween,
--- a/pubspec.lock
+++ b/pubspec.lock
@ -153,6 +153,14 @@ packages:
      url: "https://pub.dev"
    source: hosted
    version: "1.0.6"
+  dotted_border:
+    dependency: "direct main"
+    description:
+      name: dotted_border
+      sha256: "108837e11848ca776c53b30bc870086f84b62ed6e01c503ed976e8f8c7df9c04"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
  equatable:
    dependency: transitive
    description:
--- a/pubspec.yaml
+++ b/pubspec.yaml
@ -49,6 +49,7 @@ dependencies:
  path_provider: ^2.1.2
  path: ^1.8.3
  syncfusion_flutter_signaturepad: ^24.2.4
+  dotted_border: ^2.1.0
Author	SHA1	Message	Date
Dian Bayu Nugroho	5cb76fca7f	feat: registration success page	2024-02-16 18:03:36 +07:00
Dian Bayu Nugroho	e86e67b9c9	fix: term condition page	2024-02-16 17:35:58 +07:00
Dian Bayu Nugroho	a6248520ef	Merge branch 'dev' of https://git.empatnusabangsa.com/nugrohob825/cims_apps into bayu/dev	2024-02-16 17:17:32 +07:00
Dian Bayu Nugroho	eb1eb83d52	fix: risk profile	2024-02-16 17:17:19 +07:00
Prajna Prayoga	7706fe4387	Merge pull request 'yoga' (#10 ) from yoga into dev Reviewed-on: #10	2024-02-16 17:14:45 +07:00
Dian Bayu Nugroho	9da1675250	feat: submit signature	2024-02-16 17:00:19 +07:00
Dian Bayu Nugroho	298d7f46d2	fix: submit data bank account	2024-02-16 16:03:06 +07:00
Dian Bayu Nugroho	368f326123	merge conflict	2024-02-16 11:46:28 +07:00
Dian Bayu Nugroho	a574f30424	fix: submit data bank account	2024-02-16 11:39:16 +07:00
Prajna Prayoga	3c1f7e210a	fix: assets local history	2024-02-15 20:24:19 +07:00
Prajna Prayoga	b3a68b4436	feat: terms and condition view	2024-02-15 20:00:15 +07:00
Prajna Prayoga	ce2bf8a777	Merge pull request 'feat: wip plan view, and component numeric pad' (#9 ) from yoga into dev Reviewed-on: #9	2024-02-15 19:56:43 +07:00
Prajna Prayoga	7e9c109fa2	feat: wip plan view, and component numeric pad	2024-02-15 19:55:21 +07:00
nugrohob825	8537045d74	Merge pull request 'bayu/dev' (#8 ) from bayu/dev into dev Reviewed-on: #8	2024-02-15 19:25:38 +07:00