合并240417分支

This commit is contained in:
yuyongdong 2024-04-18 00:27:20 +08:00
parent 74db65752d
commit bce76af641

View File

@ -22,15 +22,12 @@ let errmsg = err
errmsg = `Operation timed out. Please retry.`
} else if(errmsg.indexOf('chest already opened') > -1) {
errmsg = 'chest already opened'
<<<<<<< HEAD
} else if(errmsg.indexOf('check error: not found guild') > -1) {
errmsg = 'Transaction failed please try again'
=======
} else if(errmsg.indexOf('execution reverted: TreasureHunt: paused') > -1) {
errmsg = 'Event starting soon. Please check back later'
} else if(errmsg.indexOf('waiting for chain confirm') > -1) {
errmsg = 'waiting for chain confirm'
>>>>>>> 417684178e4037d270e59278cb92a5b884978317
}
const _confirm = new iErrorMessage({