From 41a04fe02b7ea7f71ae5b359c9b1410bad6d3ccc Mon Sep 17 00:00:00 2001 From: Dima Rifai <dima.rifai@gmail.com> Date: Fri, 31 Jan 2025 08:16:27 +0200 Subject: [PATCH] Issue #430 - Adjust position of operations on operations tab --- .../tabs/operations/OperationsTabContent.tsx | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/components/account/tabs/operations/OperationsTabContent.tsx b/components/account/tabs/operations/OperationsTabContent.tsx index c2652e55..3066b625 100644 --- a/components/account/tabs/operations/OperationsTabContent.tsx +++ b/components/account/tabs/operations/OperationsTabContent.tsx @@ -245,33 +245,32 @@ const OperationTabContent: React.FC<OpeationTabContentProps> = ({ </CardHeader> <CardContent> <SearchRanges rangesProps={searchRanges} /> - <div className="flex items-center justify-between my-2"> - <div className="flex min-w-[120px] gap-2"> + + <div className="flex items-center my-2"> + <OperationTypesDialog + operationTypes={accountOperationTypes} + setSelectedOperations={handleOperationSelect} + selectedOperations={convertBooleanArrayToIds(filters)} + buttonClassName="bg-theme" + triggerTitle={getOperationButtonTitle( + convertBooleanArrayToIds(filters), + accountOperationTypes + )} + /> + </div> + <div className="flex items-center justify-between"> + <div> <Button onClick={() => handleSearch(true)} data-testid="apply-filters" + className="mr-2 my-2" > - <span>Search</span>{" "} - </Button> - </div> - <div className="flex w-full justify-end flex-wrap gap-2"> - <OperationTypesDialog - operationTypes={accountOperationTypes} - setSelectedOperations={handleOperationSelect} - selectedOperations={convertBooleanArrayToIds(filters)} - buttonClassName="bg-theme" - triggerTitle={getOperationButtonTitle( - convertBooleanArrayToIds(filters), - accountOperationTypes - )} - /> - <Button - onClick={handleFilterClear} - data-testid="clear-filters" - > - <span>Clear</span>{" "} + <span>Search</span> </Button> </div> + <Button onClick={handleFilterClear} data-testid="clear-filters"> + <span>Clear</span> + </Button> </div> </CardContent> </Card> -- GitLab