Merge branch 'pharmacy_fix' into 'development'

cart fix

See merge request Cloud_Solution/diplomatic-quarter!413

lib/widgets/buttons/GestureIconButton.dart

@@ -29,9 +29,7 @@ class _GestureIconButtonState extends State<GestureIconButton> {
           setState(() => _buttonLongPress = !_buttonLongPress),
       onLongPressEnd: (_) =>
           setState(() => _buttonLongPress = !_buttonLongPress),
-      child: Wrap(
-        children: [
-          Container(
+      child: Container(
         decoration: BoxDecoration(
             border: Border.all(
               color: widget.backgroundColor != null
@@ -45,7 +43,6 @@ class _GestureIconButtonState extends State<GestureIconButton> {
         child: Padding(
           padding: const EdgeInsets.all(8.0),
           child: Container(
-                child: Expanded(
             child: Row(
               mainAxisSize: MainAxisSize.min,
               children: [
@@ -62,9 +59,6 @@ class _GestureIconButtonState extends State<GestureIconButton> {
           ),
         ),
       ),
-          ),
-        ],
-      ),
     );
   }
 }