merge with master

Dockerfile

@@ -5,7 +5,11 @@ WORKDIR /sdk
 ENV ANDROID_COMPILE_SDK=29 \
     ANDROID_BUILD_TOOLS=29.0.3 \
     ANDROID_SDK_TOOLS=4333796 \
+<<<<<<< HEAD
     FLUTTER_VERSION="https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_1.20.4-stable.tar.xz" \
+=======
+    FLUTTER_VERSION="https://storage.googleapis.com/flutter_infra/releases/stable/linux/flutter_linux_1.17.1-stable.tar.xz" \
+>>>>>>> 1ce093fbb8b7c3cef92dece67fd3333ce60acea8
     ANDROID_HOME=/sdk/android-sdk-linux \
     PATH="$PATH:/sdk/android-sdk-linux/platform-tools" \
     PATH="/sdk/flutter/bin:$PATH" \

lib/Component/router.dart

@@ -30,7 +30,6 @@ import 'package:home_industry/Pages/Transactions/my_detail_order.dart';
 import 'package:home_industry/Pages/Transactions/repositories/transaction_repository.dart';
 import 'package:home_industry/State/Auth/repositories/depedencies_repositories.dart';
 import 'package:home_industry/State/ChangeBottomNavigatonBar/bloc.dart';
-
 import '../Pages/Program/repositories/program_repository.dart';
 
 class Router {

test/mock/donation.json

@@ -17,7 +17,10 @@
   "transfer_destination_bank_name": null,
   "transfer_destination_bank_account_name": null,
   "transfer_destination_bank_account_number": null,
+<<<<<<< HEAD
   "donation_type": "CSH",
+=======
+>>>>>>> 1ce093fbb8b7c3cef92dece67fd3333ce60acea8
   "created_at": "2020-05-02T17:20:33.493414+07:00",
   "updated_at": "2020-05-02T17:20:33.493505+07:00"
 }
\ No newline at end of file

test/mock/transaction.json

@@ -40,14 +40,21 @@
   "proof_of_payment": "ada",
   "user_bank_name": null,
   "user_bank_account_name": "adada",
+<<<<<<< HEAD
   "bank_account_transfer_destination": "f1291c48-793c-4d44-89fe-6f64452f8aa9",
+=======
+>>>>>>> 1ce093fbb8b7c3cef92dece67fd3333ce60acea8
   "transfer_destination_bank_name": null,
   "transfer_destination_bank_account_name": null,
   "transfer_destination_bank_account_number": null,
   "created_at": "2020-04-16T15:04:22.073683+07:00",
   "updated_at": "2020-04-20T16:58:37.049871+07:00",
+<<<<<<< HEAD
   "subtotal": "155040.00",
   "batch": "e24ae351-0cd1-450a-8050-b56594d680b4",
   "batch_name": "batch 1",
   "end_date": "2020-10-17"
+=======
+  "subtotal": "155040.00"
+>>>>>>> 1ce093fbb8b7c3cef92dece67fd3333ce60acea8
 }
\ No newline at end of file

test/money_donation_page_test.dart

@@ -36,7 +36,8 @@ void main() {
       dio = DioMock();
       changeBottomNavigationBarBloc = ChangeBottomNavBarMock();
       donationBloc =
-          MoneyDonationBloc(DonationRepository(dio), changeBottomNavigationBarBloc);
+          MoneyDonationBloc(DonationRepository(dio),
+              changeBottomNavigationBarBloc);
     });
 
     blocTest('Donation Success',

test/product_payment_test.dart

@@ -24,7 +24,6 @@ import 'package:home_industry/main.dart';
 import 'package:intl/date_symbol_data_local.dart';
 import 'package:intl/intl.dart';
 import 'package:mockito/mockito.dart';
-
 import 'money_donation_page_test.dart';
 import 'register_test.dart';
 

test/program_page_test.dart

@@ -155,6 +155,9 @@ void main() {
       expect(find.text('Rumah Belajar'), findsNWidgets(11));
       expect(find.text('DETAIL'), findsNWidgets(11));
       expect(find.text('Selesai'), findsNothing);
+      expect(find.byType(Card), findsNWidgets(3));
+      expect(find.text('Rumah Belajar'), findsNWidgets(3));
+      expect(find.text('DETAIL'), findsNWidgets(3));
     });
 
     testWidgets('No program', (WidgetTester tester) async {