Merge branch 'dev_220318_test' into test

src/view/components/option-withdraw.vue

@@ -171,13 +171,13 @@ const doneWithdraw = () => {
 
 const withdrawalAll = () => {
     console.log(canWithdrawBalance.value)
-    if (
-        canWithdrawBalance.value &&
+    requestWithdrawParams.value.amountValue =
+            canWithdrawBalance.value / 100;
+    if (!(canWithdrawBalance.value &&
         canWithdrawBalance.value >
-            props.walletWithdrawConfig.withdrawUSDPaypalFee
+            props.walletWithdrawConfig.withdrawUSDPaypalFee)
     ) {
-        requestWithdrawParams.value.amountValue =
-            canWithdrawBalance.value / 100;
+        showWithdrawError.value = true;
     }
 };
 

src/view/components/options-transactions.vue

@@ -79,7 +79,7 @@
                                     Withdrawal to PayPal
                                 </template>
                             </div>
-                            <div class="time">{{moment(item.createTimestamp).format('MM-DD hh:mm:ss')}}</div>
+                            <div class="time">{{moment(item.createTimestamp).format('MM-DD HH:mm:ss')}}</div>
                         </div>
                         <div class="right">
                             <div class="msg">

src/view/popup.vue

@@ -76,7 +76,7 @@
                                     <div class="time">
                                         {{
                                             moment(item.timestamp).format(
-                                                "MM-DD hh:mm:ss"
+                                                "MM-DD HH:mm:ss"
                                             )
                                         }}
                                     </div>