Merge pull request #33 from oxygenpay/develop

fixed issue with some empty fields from server (#32)
oxygenpay · Sep 5, 2023 · ad0c9d9 · ad0c9d9
2 parents 2761fee + 521d031
commit ad0c9d9
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 27 deletions.
diff --git a/ui-dashboard/src/components/withdraw-desc-card/withdraw-desc-card.tsx b/ui-dashboard/src/components/withdraw-desc-card/withdraw-desc-card.tsx
@@ -105,18 +105,23 @@ const WithdrawalDescCard: React.FC<Props> = ({data, openNotificationFunc, addres
                         </Descriptions.Item>
 
                         <Descriptions.Item span={3} label={<span className={b("item-title")}>Transaction ID</span>}>
-                            {renderStrippedStr(data.additionalInfo.withdrawal.transactionHash, 24, -12)}{" "}
-                            <CopyOutlined
-                                className={b("copy-btn")}
-                                onClick={() =>
-                                    copyToClipboard(
-                                        data?.additionalInfo?.withdrawal?.transactionHash
-                                            ? data.additionalInfo.withdrawal.transactionHash
-                                            : "",
-                                        openNotificationFunc
-                                    )
-                                }
-                            />
+                            {data.additionalInfo.withdrawal.transactionHash != null
+                                ? renderStrippedStr(data.additionalInfo.withdrawal.transactionHash, 24, -12)
+                                : "Transaction hash is not created yet"}
+                            {data.additionalInfo.withdrawal.transactionHash != null ? " " : null}
+                            {data.additionalInfo.withdrawal.transactionHash != null ? (
+                                <CopyOutlined
+                                    className={b("copy-btn")}
+                                    onClick={() =>
+                                        copyToClipboard(
+                                            data?.additionalInfo?.withdrawal?.transactionHash
+                                                ? data.additionalInfo.withdrawal.transactionHash
+                                                : "",
+                                            openNotificationFunc
+                                        )
+                                    }
+                                />
+                            ) : null}
                         </Descriptions.Item>
                         {data.additionalInfo?.payment?.customerEmail ? (
                             <>
@@ -135,15 +140,17 @@ const WithdrawalDescCard: React.FC<Props> = ({data, openNotificationFunc, addres
                                 </Descriptions.Item>
                             </>
                         ) : null}
-                        <Descriptions.Item>
-                            <a
-                                href={data.additionalInfo.withdrawal.explorerLink}
-                                target="_blank"
-                                rel="noopener noreferrer"
-                            >
-                                View on blockchain explorer <LinkOutlined className={b("copy-btn")} />
-                            </a>
-                        </Descriptions.Item>
+                        {data.additionalInfo.withdrawal.explorerLink != null ? (
+                            <Descriptions.Item>
+                                <a
+                                    href={data.additionalInfo.withdrawal.explorerLink ?? ""}
+                                    target="_blank"
+                                    rel="noopener noreferrer"
+                                >
+                                    View on blockchain explorer <LinkOutlined className={b("copy-btn")} />
+                                </a>
+                            </Descriptions.Item>
+                        ) : null}
                     </Descriptions>
                 </>
             )}

diff --git a/ui-dashboard/src/types/index.ts b/ui-dashboard/src/types/index.ts
@@ -137,9 +137,9 @@ interface AdditionalPaymentInfo {
 interface AdditionalWithdrawalInfo {
     addressId: string;
     balanceId: string;
-    explorerLink: string;
+    explorerLink: string | null;
     serviceFee: string;
-    transactionHash: string;
+    transactionHash: string | null;
 }
 
 interface AdditionalInfo {
@@ -150,15 +150,15 @@ interface AdditionalInfo {
 interface Payment {
     additionalInfo?: AdditionalInfo;
     id: string;
-    orderId: string;
+    orderId?: string;
     type: PaymentType;
     status: PaymentStatus;
     createdAt: string;
     currency: CurrencyWithFiat;
     price: string;
-    redirectUrl: string;
-    paymentUrl: string;
-    description: string;
+    redirectUrl?: string;
+    paymentUrl?: string;
+    description?: string;
     isTest: boolean;
 }