Merge pull request #362 from paytaca/fix/p2p-exchange

Fix Invalid Token Error
paytaca · Aug 7, 2024 · a6ef5b0 · a6ef5b0
2 parents ab1d4c4 + 2b0fafe
commit a6ef5b0
Show file tree

Hide file tree

Showing 37 changed files with 485 additions and 88 deletions.
diff --git a/src/components/ramp/appeal/AppealDetail.vue b/src/components/ramp/appeal/AppealDetail.vue
@@ -260,7 +260,7 @@ export default {
             this.contractBalance = balance
             resolve(balance)
           })
-          .catch(error => reject(error))
+          .catch(error => { reject(error) })
       })
     },
     async onSubmit () {
@@ -287,8 +287,12 @@ export default {
         })
         .catch(error => {
           console.error(error.response)
-          if (error.response && error.response.status === 403) {
-            bus.emit('session-expired')
+          if (error.response) {
+            if (error.response.status === 403) {
+              bus.emit('session-expired')
+            }
+          } else {
+            bus.emit('network-error')
           }
         })
       vm.sendingBch = true

diff --git a/src/components/ramp/appeal/AppealFeedbackDialog.vue b/src/components/ramp/appeal/AppealFeedbackDialog.vue
@@ -115,6 +115,7 @@ export default {
             }
           } else {
             console.error(error)
+            bus.emit('network-error')
           }
         })
         .finally(() => { vm.loading = false })

diff --git a/src/components/ramp/appeal/AppealIndex.vue b/src/components/ramp/appeal/AppealIndex.vue
@@ -237,8 +237,12 @@ export default {
         .catch(error => {
           console.error(error)
           console.error(error.response)
-          if (error.response && error.response.status === 403) {
-            bus.emit('session-expired')
+          if (error.response) {
+            if (error.response.status === 403) {
+              bus.emit('session-expired')
+            }
+          } else {
+            bus.emit('network-error')
           }
         })
     },

diff --git a/src/components/ramp/appeal/AppealListing.vue b/src/components/ramp/appeal/AppealListing.vue
@@ -196,8 +196,12 @@ export default {
         })
         .catch(error => {
           console.error(error?.response)
-          if (error?.response?.status === 403) {
-            bus.emit('session-expired')
+          if (error.response) {
+            if (error?.response?.status === 403) {
+              bus.emit('session-expired')
+            }
+          } else {
+            bus.emit('network-error')
           }
         })
     },

diff --git a/src/components/ramp/appeal/AppealProcess.vue b/src/components/ramp/appeal/AppealProcess.vue
@@ -205,8 +205,12 @@ export default {
           })
           .catch(error => {
             console.error(error?.response)
-            if (error?.response?.status === 403) {
-              bus.emit('session-expired')
+            if (error.response) {
+              if (error?.response?.status === 403) {
+                bus.emit('session-expired')
+              }
+            } else {
+              bus.emit('network-error')
             }
             reject(error)
           })
@@ -227,9 +231,13 @@ export default {
             resolve(response.data)
           })
           .catch(error => {
-            console.error(error.response)
-            if (error.response && error.response.status === 403) {
-              bus.emit('session-expired')
+            if (error.response) {
+              console.error(error.response)
+              if (error.response.status === 403) {
+                bus.emit('session-expired')
+              }
+            } else {
+              bus.emit('network-error')
             }
             this.loading = false
             if (done) done()

diff --git a/src/components/ramp/appeal/AppealProfile.vue b/src/components/ramp/appeal/AppealProfile.vue
@@ -242,6 +242,7 @@ export default {
             }
           } else {
             console.error(error)
+            bus.emit('network-error')
           }
         })
         .finally(() => {
@@ -260,7 +261,11 @@ export default {
             await vm.$store.dispatch('ramp/fetchUser')
           })
       } catch (error) {
-        console.error(error?.response || error)
+        if (error.response) {
+          console.error(error?.response)
+        } else {
+          bus.emit('network-error')
+        }
       }
       this.editNickname = false
     },

diff --git a/src/components/ramp/appeal/AppealSettings.vue b/src/components/ramp/appeal/AppealSettings.vue
@@ -50,6 +50,7 @@
 import { getDarkModeClass } from 'src/utils/theme-darkmode-utils'
 import ConfirmationDialog from './ConfirmationDialog.vue'
 import { backend } from 'src/wallet/ramp/backend'
+import { bus } from 'src/wallet/event-bus.js'
 
 export default {
   data () {
@@ -123,7 +124,16 @@ export default {
             this.inactiveFor = inactiveFor
             resolve(response.data)
           })
-          .catch((error) => { reject(error) })
+          .catch((error) => {
+            if (error.response) {
+              if (error.response.status === 403) {
+                bus.emit('session-expired')
+              }
+            } else {
+              bus.emit('network-error')
+            }
+            reject(error)
+          })
       })
     },
     onSetActive () {
@@ -161,7 +171,16 @@ export default {
           this.$emit('setInactive')
           this.$emit('back')
         })
-        .catch((error) => { console.error(error?.response) })
+        .catch((error) => {
+          console.error(error?.response)
+          if (error.response) {
+            if (error.response.status === 403) {
+              bus.emit('session-expired')
+            }
+          } else {
+            bus.emit('network-error')
+          }
+        })
     },
     editName () {
       this.readOnlyState = false

diff --git a/src/components/ramp/appeal/AppealTransfer.vue b/src/components/ramp/appeal/AppealTransfer.vue
@@ -172,6 +172,7 @@ export default {
             }
           } else {
             console.error(error)
+            bus.emit('network-error')
           }
         })
     },
@@ -197,6 +198,7 @@ export default {
               vm.errorMessage = error.response?.data?.error
             } else {
               console.error(error)
+              bus.emit('network-error')
             }
             vm.hideBtn = false
           })

diff --git a/src/components/ramp/fiat/AdListings.vue b/src/components/ramp/fiat/AdListings.vue
@@ -298,6 +298,8 @@ export default {
             if (error.response.status === 403) {
               bus.emit('session-expired')
             }
+          } else {
+            bus.emit('network-error')
           }
         })
     },
@@ -324,8 +326,12 @@ export default {
         })
         .catch(error => {
           console.error(error.response)
-          if (error.response && error.response.status === 403) {
-            bus.emit('session-expired')
+          if (error.response) {
+            if (error.response.status === 403) {
+              bus.emit('session-expired')
+            }
+          } else {
+            bus.emit('network-error')
           }
         })
     },

diff --git a/src/components/ramp/fiat/AddPaymentMethods.vue b/src/components/ramp/fiat/AddPaymentMethods.vue
@@ -417,8 +417,12 @@ export default {
         })
         .catch(error => {
           console.error(error.response || error)
-          if (error.response && error.response.status === 403) {
-            bus.emit('session-expired')
+          if (error.response) {
+            if (error.response.status === 403) {
+              bus.emit('session-expired')
+            }
+          } else {
+            bus.emit('network-error')
           }
         })
     },
@@ -439,8 +443,12 @@ export default {
         })
         .catch(error => {
           console.error(error.response)
-          if (error.response && error.response.status === 403) {
-            bus.emit('session-expired')
+          if (error.response) {
+            if (error.response.status === 403) {
+              bus.emit('session-expired')
+            }
+          } else {
+            bus.emit('network-error')
           }
         })
     },
@@ -465,8 +473,12 @@ export default {
       await backend.delete(`/ramp-p2p/payment-method/${index}`, { authorize: true })
         .catch(error => {
           console.error(error.response || error)
-          if (error.response && error.response.status === 403) {
-            bus.emit('session-expired')
+          if (error.response) {
+            if (error.response.status === 403) {
+              bus.emit('session-expired')
+            }
+          } else {
+            bus.emit('network-error')
           }
         })
       await vm.fetchPaymentMethods()
@@ -501,8 +513,12 @@ export default {
             .catch(error => {
               console.error(error.response || error)
               vm.openDialog = false
-              if (error.response && error.response.status === 403) {
-                bus.emit('session-expired')
+              if (error.response) {
+                if (error.response.status === 403) {
+                  bus.emit('session-expired')
+                }
+              } else {
+                bus.emit('network-error')
               }
             })
 
@@ -519,8 +535,12 @@ export default {
             .catch(error => {
               console.error(error.response)
               vm.savingPaymentMethod = false
-              if (error.response && error.response.status === 403) {
-                bus.emit('session-expired')
+              if (error.response) {
+                if (error.response.status === 403) {
+                  bus.emit('session-expired')
+                }
+              } else {
+                bus.emit('network-error')
               }
             })
           break

diff --git a/src/components/ramp/fiat/DisplayConfirmation.vue b/src/components/ramp/fiat/DisplayConfirmation.vue
@@ -230,8 +230,12 @@ export default {
         console.log(response)
       } catch (error) {
         console.error(error.response)
-        if (error.response && error.response.status === 403) {
-          bus.emit('session-expired')
+        if (error.response) {
+          if (error.response.status === 403) {
+            bus.emit('session-expired')
+          }
+        } else {
+          bus.emit('network-error')
         }
       }
     }

diff --git a/src/components/ramp/fiat/EscrowTransfer.vue b/src/components/ramp/fiat/EscrowTransfer.vue
@@ -343,6 +343,8 @@ export default {
               if (error.response.status === 403) {
                 bus.emit('session-expired')
               }
+            } else {
+              bus.emit('network-error')
             }
             reject(error)
           })
@@ -371,8 +373,12 @@ export default {
           })
           .catch(error => {
             console.error(error.response)
-            if (error.response && error.response.status === 403) {
-              bus.emit('session-expired')
+            if (error.response) {
+              if (error.response.status === 403) {
+                bus.emit('session-expired')
+              }
+            } else {
+              bus.emit('network-error')
             }
             vm.loading = false
             reject(error)
@@ -395,8 +401,12 @@ export default {
           })
           .catch(error => {
             console.error(error.response)
-            if (error.response && error.response.status === 403) {
-              bus.emit('session-expired')
+            if (error.response) {
+              if (error.response.status === 403) {
+                bus.emit('session-expired')
+              }
+            } else {
+              bus.emit('network-error')
             }
             vm.loading = false
             reject(error)
@@ -468,6 +478,7 @@ export default {
               }
             } else {
               console.error(error)
+              bus.emit('network-error')
             }
             reject(error)
           })
@@ -488,6 +499,7 @@ export default {
               }
             } else {
               console.error(error)
+              bus.emit('network-error')
             }
             reject(error)
           })