Updated: swap rehydrate logic

StardustCollective · Jan 21, 2025 · d10835b · d10835b
1 parent 46860ef
commit d10835b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/source/scenes/swap/SwapHistory/SwapHistory.scss b/source/scenes/swap/SwapHistory/SwapHistory.scss
@@ -9,6 +9,7 @@
   flex-direction: column;
 
   .historyCell {
+    cursor: pointer;
     display: flex;
     flex-direction: row;
   }

diff --git a/source/scenes/swap/TransactionDetails/TransactionDetails.native.tsx b/source/scenes/swap/TransactionDetails/TransactionDetails.native.tsx
@@ -51,7 +51,7 @@ const TransactionDetails: FC<ITransferInfo> = ({ transaction, onSupportLinkPress
       >
         <View style={styles.amount}>
           <TextV3.BodyStrong numberOfLines={1} color={COLORS_ENUMS.BLACK}>
-            {transaction?.amountTo} {transaction?.coinTo.coinCode}
+            {transaction?.amountTo} {transaction?.coinTo?.coinCode}
           </TextV3.BodyStrong>
         </View>
         <View style={styles.detailRow}>
@@ -154,7 +154,7 @@ const TransactionDetails: FC<ITransferInfo> = ({ transaction, onSupportLinkPress
             color={COLORS_ENUMS.DARK_GRAY_200}
             extraStyles={styles.detailValue}
           >
-            {transaction.id}
+            {transaction?.id}
           </TextV3.CaptionRegular>
         </View>
         <TouchableOpacity style={styles.supportEmail} onPress={onSupportLinkPress}>

diff --git a/source/scenes/swap/TransactionDetails/TransactionDetails.tsx b/source/scenes/swap/TransactionDetails/TransactionDetails.tsx
@@ -47,7 +47,7 @@ const TransactionDetails: FC<ITransferInfo> = ({ transaction, onSupportLinkPress
     <div className={styles.container}>
       <div className={styles.amount}>
         <TextV3.BodyStrong color={COLORS_ENUMS.BLACK}>
-          {transaction?.amountTo} {transaction?.coinTo.coinCode}
+          {transaction?.amountTo} {transaction?.coinTo?.coinCode}
         </TextV3.BodyStrong>
       </div>
       <div className={styles.detailRow}>

diff --git a/source/state/swap/index.ts b/source/state/swap/index.ts
@@ -97,9 +97,11 @@ const SwappingState = createSlice({
   reducers: {
     rehydrate(state: ISwapState, action: PayloadAction<ISwapState>) {
       // txIds is the only key/values that are presisted for the swap state.
+      if (!action?.payload?.txIds?.length) return;
+
       return {
         ...state,
-        txIds: [...state.txIds, ...action.payload.txIds],
+        txIds: action.payload.txIds,
       };
     },
     setSwapFrom(state: ISwapState, action: PayloadAction<ISelectedCurrency>) {