diff --git a/app/View/Components/Form/Group/Tax.php b/app/View/Components/Form/Group/Tax.php
index 5f6d5b8ee..a154674f1 100644
--- a/app/View/Components/Form/Group/Tax.php
+++ b/app/View/Components/Form/Group/Tax.php
@@ -3,7 +3,7 @@
 namespace App\View\Components\Form\Group;
 
 use App\Abstracts\View\Components\Form;
-use App\Models\Setting\Currency as Model;
+use App\Models\Setting\Tax as Model;
 
 class Tax extends Form
 {
@@ -13,7 +13,7 @@ class Tax extends Form
 
     public $field;
 
-    public $currencies;
+    public $taxes;
 
     /**
      * Get the view / contents that represent the component.
@@ -23,20 +23,32 @@ class Tax extends Form
     public function render()
     {
         if (empty($this->name)) {
-            $this->name = 'currency_code';
+            $this->name = 'tax_id';
         }
 
-        $this->path = route('modals.currencies.create');
+        $this->path = route('modals.taxes.create');
 
         $this->field = [
-            'key' => 'code',
+            'key' => 'id',
             'value' => 'name'
         ];
 
-        $this->currencies = Model::enabled()->orderBy('name')->pluck('name', 'code');
+        $this->taxes = Model::enabled()->orderBy('name')->pluck('name', 'id');
+
+        $tax_id = old('tax.id', old('tax_id', null));
+
+        if (! empty($tax_id)) {
+            $this->selected = $tax_id;
+
+            if ($this->taxes->has($tax_id)) {
+                $tax = Model::find($tax_id);
+
+                $this->taxes->put($tax->id, $tax->name);
+            }
+        }
 
         if (empty($this->selected)) {
-            $this->selected = setting('default.currency');
+            $this->selected = setting('default.tax');
         }
 
         return view('components.form.group.tax');
diff --git a/resources/views/components/form/group/tax.blade.php b/resources/views/components/form/group/tax.blade.php
new file mode 100644
index 000000000..b6346ff9b
--- /dev/null
+++ b/resources/views/components/form/group/tax.blade.php
@@ -0,0 +1,81 @@
+@if ((! $attributes->has('withoutRemote') && ! $attributes->has('without-remote')) && (! $attributes->has('withoutAddNew') && ! $attributes->has('without-add-new')))
+    <x-form.group.select
+        remote
+        remote_action="{{ $remoteAction }}"
+
+        add-new
+        path="{{ $path }}"
+
+        name="{{ $name }}"
+        label="{!! trans_choice('general.taxes', 1) !!}"
+        :options="$taxes"
+        :selected="$selected"
+        sort-options="false"
+
+        :multiple="$multiple"
+        :group="$group"
+        form-group-class="{{ $formGroupClass }}"
+        :required="$required"
+        :readonly="$readonly"
+        :disabled="$disabled"
+
+        {{ $attributes }}
+    />
+@elseif (($attributes->has('withoutRemote') && $attributes->has('without-remote')) && (! $attributes->has('withoutAddNew') && ! $attributes->has('without-add-new')))
+    <x-form.group.select
+        add-new
+        path="{{ $path }}"
+
+        name="{{ $name }}"
+        label="{!! trans_choice('general.taxes', 1) !!}"
+        :options="$taxes"
+        :selected="$selected"
+        sort-options="false"
+
+        :multiple="$multiple"
+        :group="$group"
+        form-group-class="{{ $formGroupClass }}"
+        :required="$required"
+        :readonly="$readonly"
+        :disabled="$disabled"
+
+        {{ $attributes }}
+    />
+@elseif ((! $attributes->has('withoutRemote') && ! $attributes->has('without-remote')) && ($attributes->has('withoutAddNew') && $attributes->has('without-add-new')))
+    <x-form.group.select
+        remote
+        remote_action="{{ $remoteAction }}"
+
+        name="{{ $name }}"
+        label="{!! trans_choice('general.taxes', 1) !!}"
+        :options="$taxes"
+        :selected="$selected"
+        sort-options="false"
+
+        :multiple="$multiple"
+        :group="$group"
+        form-group-class="{{ $formGroupClass }}"
+        :required="$required"
+        :readonly="$readonly"
+        :disabled="$disabled"
+
+        {{ $attributes }}
+    />
+@else
+    <x-form.group.select
+        name="{{ $name }}"
+        label="{!! trans_choice('general.taxes', 1) !!}"
+        :options="$taxes"
+        :selected="$selected"
+        sort-options="false"
+
+        :multiple="$multiple"
+        :group="$group"
+        form-group-class="{{ $formGroupClass }}"
+        :required="$required"
+        :readonly="$readonly"
+        :disabled="$disabled"
+
+        {{ $attributes }}
+    />
+@endif