diff --git a/lib/widgets/desktop/shop_products.dart b/lib/widgets/desktop/shop_products.dart
index 1af5140..2073544 100644
--- a/lib/widgets/desktop/shop_products.dart
+++ b/lib/widgets/desktop/shop_products.dart
@@ -165,7 +165,7 @@ class ShopProductsState extends State<ShopProducts> {
                       fontSize: 11.0,
                     ),
                   ),
-                  animation: BadgeAnimation.scale(),
+                  badgeAnimation: const BadgeAnimation.scale(),
                 ),
               );
             } else {
diff --git a/lib/widgets/general/carousel.dart b/lib/widgets/general/carousel.dart
index 23362a6..55f8a2f 100644
--- a/lib/widgets/general/carousel.dart
+++ b/lib/widgets/general/carousel.dart
@@ -18,8 +18,8 @@ class Carousel extends StatefulWidget {
       animationDuration = animationDuration;
 
   final double height;
-  final List<Widget> pages;
-  final bool autoPlay;
+  final List<Widget>? pages;
+  final bool? autoPlay;
   final Duration duration;
   final Duration animationDuration;
 
@@ -106,7 +106,7 @@ class Indicator extends StatefulWidget {
       : count = count,
         super(key: key);
 
-  final int count;
+  final int? count;
 
   @override
   createState() => new IndicatorState();
diff --git a/lib/widgets/general/parabolic_animation_widget.dart b/lib/widgets/general/parabolic_animation_widget.dart
index e6d9db4..d47de01 100644
--- a/lib/widgets/general/parabolic_animation_widget.dart
+++ b/lib/widgets/general/parabolic_animation_widget.dart
@@ -11,7 +11,7 @@ class ParabolicAnimationWidget extends AnimatedWidget {
   final Offset startAdjustOffset;
   final Offset endAdjustOffset;
 
-  late ParabolicAnimationWidget({
+  ParabolicAnimationWidget({
     required Animation<double> animation,
     required this.stackKey,
     required this.startKey,
@@ -22,8 +22,8 @@ class ParabolicAnimationWidget extends AnimatedWidget {
     this.endAdjustOffset = Offset.zero,
   }) : super(listenable: animation);
 
-  Offset _startOffset;
-  Offset _endOffset;
+  late Offset _startOffset;
+  late Offset _endOffset;
 
   @override
   Widget build(BuildContext context) {
diff --git a/lib/widgets/general/payment_verification_code_dialog.dart b/lib/widgets/general/payment_verification_code_dialog.dart
index c23d6d6..4e94a5f 100644
--- a/lib/widgets/general/payment_verification_code_dialog.dart
+++ b/lib/widgets/general/payment_verification_code_dialog.dart
@@ -1,7 +1,7 @@
 
-import '../utils/countdown.dart';
+import '../../utils/countdown.dart';
 import 'package:flutter/material.dart';
-import 'package:pinput/pin_put/pin_put.dart';
+import 'package:pinput/pinput.dart';
 
 import '../../generated/l10n.dart';
 import '../../models/user.dart';
@@ -74,11 +74,11 @@ class PaymentVerificationCodeDialogState extends State<PaymentVerificationCodeDi
           Center(
             child: Container(
               padding: EdgeInsets.only(top: 0.0, bottom: 10.0, left: 0.0, right: 0.0),
-              child: PinPut(
-                fieldsCount: 4,
+              child: Pinput(
+                length: 4,
                 focusNode: _pinPutFocusNode,
                 controller: _pinPutController,
-                onSubmit: (String pin) {
+                onCompleted: (String pin) {
                   String codeString = generateSignature(pin, key: widget.user.id.toString());
                   FocusScope.of(context).unfocus();
                   if (paymentCodeEncrypt == codeString) {
@@ -109,15 +109,8 @@ class PaymentVerificationCodeDialogState extends State<PaymentVerificationCodeDi
                     );
                   }
                 },
-                submittedFieldDecoration: _pinPutDecoration.copyWith(
+                defaultPinDecoration: _pinPutDecoration.copyWith(
                     borderRadius: BorderRadius.circular(20)),
-                selectedFieldDecoration: _pinPutDecoration,
-                followingFieldDecoration: _pinPutDecoration.copyWith(
-                  borderRadius: BorderRadius.circular(5),
-                  border: Border.all(
-                    color: Colors.deepPurpleAccent.withOpacity(.5),
-                  ),
-                ),
               ),
             ),
           ),
diff --git a/lib/widgets/general/popup_animation_widget.dart b/lib/widgets/general/popup_animation_widget.dart
index 2b0f407..c346003 100644
--- a/lib/widgets/general/popup_animation_widget.dart
+++ b/lib/widgets/general/popup_animation_widget.dart
@@ -9,7 +9,7 @@ class PopupAnimationWidget extends AnimatedWidget {
   final Offset popupOffset;
   final Animation<double> animation;
 
-  late PopupAnimationWidget({
+  PopupAnimationWidget({
     required this.animation,
     required this.stackKey,
     required this.startKey,
@@ -18,7 +18,7 @@ class PopupAnimationWidget extends AnimatedWidget {
     this.popupOffset = Offset.zero,
   }) : super(listenable: animation);
 
-  Offset _startOffset;
+  late Offset _startOffset;
   Offset _offset = Offset.zero;
 
   @override
diff --git a/lib/widgets/mobile/shop.dart b/lib/widgets/mobile/shop.dart
index 00c719a..c629a2a 100644
--- a/lib/widgets/mobile/shop.dart
+++ b/lib/widgets/mobile/shop.dart
@@ -1188,7 +1188,7 @@ class ShopState extends State<Shop>
                         fontSize: 11.0,
                       ),
                     ),
-                    animation: BadgeAnimation.scale(),
+                    badgeAnimation: const BadgeAnimation.scale(),
                   ),
                 );
               } else {