Merge branch 'swap/complete-orders' into passwoard-error-reset

Emurgo · Oct 10, 2023 · b3514e3 · b3514e3
2 parents 4513d04 + a722d67
commit b3514e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/CompletedOrders.tsx
@@ -102,7 +102,11 @@ export const CompletedOrders = () => {
         })}
       </ScrollView>
 
-      <Counter counter={normalizedOrders?.length ?? 0} customText={strings.listCompletedOrders} />
+      <Counter
+        style={styles.counter}
+        counter={normalizedOrders?.length ?? 0}
+        customText={strings.listCompletedOrders}
+      />
     </>
   )
 }
@@ -254,4 +258,7 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     alignItems: 'center',
   },
+  counter: {
+    paddingVertical: 16,
+  },
 })
diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/mapOrders.ts b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/ListOrders/mapOrders.ts
@@ -93,6 +93,7 @@ export const mapCompletedOrders = (orders: TransactionInfo[], wallet: YoroiWalle
       }
     })
     .filter(isNonNullable)
+    .sort((a, b) => (a.date > b.date ? -1 : 1))
 
   return result
 }
-Original file line number
+Diff line change
@@ Expand Up @@
           }
         })
         .filter(isNonNullable)
+        .sort((a, b) => (a.date > b.date ? -1 : 1))
       return result
     }
@@ Expand Down @@