Revert "(Bug) #955 withdraw transaction failed (#1003)" (#1012)

This reverts commit df178fc.

src/components/dashboard/Claim.js

@@ -205,13 +205,8 @@ const Claim = props => {
       if (curEntitlement == 0) {
         return
       }
-
-      let txHash
-
       const receipt = await goodWallet.claim({
         onTransactionHash: hash => {
-          txHash = hash
-
           const date = new Date()
           const transactionEvent: TransactionEvent = {
             id: hash,
@@ -225,9 +220,7 @@ const Claim = props => {
           userStorage.enqueueTX(transactionEvent)
           AsyncStorage.setItem('GD_AddWebAppLastClaim', date.toISOString())
         },
-        onError: () => {
-          userStorage.markWithErrorEvent(txHash)
-        },
+        onError: userStorage.markWithErrorEvent,
       })
 
       if (receipt.status) {

src/components/dashboard/FeedItems/EventSettingsByType.js

@@ -61,21 +61,6 @@ const getEventSettingsByType = (theme, type) => {
       color: theme.colors.green,
       name: 'receive-filled',
     },
-    withdrawerror: {
-      color: theme.colors.primary,
-      name: 'info',
-      withoutAmount: true,
-    },
-    withdrawcompleted: {
-      actionSymbol: '+',
-      color: theme.colors.green,
-      name: 'receive-filled',
-    },
-    withdrawpending: {
-      actionSymbol: '+',
-      color: theme.colors.orange,
-      name: 'receive-filled',
-    },
     message: {
       color: theme.colors.purple,
       name: 'social-good-filled',

src/components/dashboard/FeedItems/FeedModalItem.js

@@ -42,7 +42,7 @@ const FeedModalItem = (props: FeedEventProps) => {
     >
       {item.type === 'feedback' ? (
         <FeedbackModalItem {...props} />
-      ) : ['senderror', 'withdrawerror'].includes(itemType) ? (
+      ) : itemType === 'senderror' ? (
         <SendModalItemWithError {...props} />
       ) : (
         <React.Fragment>

src/components/dashboard/FeedItems/ListEventItem.js

@@ -26,7 +26,6 @@ const ListEvent = ({ item: feed, theme, styles }: FeedEventProps) => {
   const mainColor = eventSettings.color
   const isSmallDevice = isMobile && getScreenWidth() < 353
   const isFeedTypeClaiming = feed.type === 'claiming'
-  const isErrorCard = ['senderror', 'withdrawerror'].includes(itemType)
 
   if (itemType === 'empty') {
     return <EmptyEventFeed />
@@ -65,7 +64,7 @@ const ListEvent = ({ item: feed, theme, styles }: FeedEventProps) => {
             source={feed.data && feed.data.endpoint && feed.data.endpoint.avatar}
           />
           <View style={[styles.mainInfo, isFeedTypeClaiming && styles.claimingCardFeedText]}>
-            {isErrorCard ? (
+            {itemType === 'senderror' ? (
               <>
                 <Text fontWeight="medium" lineHeight={19} style={styles.mainText} color="primary">
                   {`We're sorry.`}
@@ -108,7 +107,7 @@ const getWelcomeStyles = ({ theme }) => ({
     display: 'inline',
   },
   welcomeText: {
-    textAlign: 'left',
+    flexShrink: 0,
   },
 })
 
@@ -249,7 +248,6 @@ const getStylesFromProps = ({ theme }) => ({
   },
   mainText: {
     textAlignVertical: 'middle',
-    paddingTop: 5,
   },
 })
 

src/components/dashboard/SendLinkSummary.js

@@ -109,8 +109,6 @@ const SendLinkSummary = ({ screenProps }: AmountProps) => {
    */
   const generateLink = () => {
     try {
-      let txHash
-
       // Generate link deposit
       const generateLinkResponse = goodWallet.generateLink(
         amount,
@@ -143,14 +141,7 @@ const SendLinkSummary = ({ screenProps }: AmountProps) => {
             })
           }
         },
-        {
-          onTransactionHash: _h => {
-            txHash = _h
-          },
-          onError: () => {
-            userStorage.markWithErrorEvent(txHash)
-          },
-        }
+        { onError: userStorage.markWithErrorEvent }
       )
       log.debug('generateLinkAndSend:', { generateLinkResponse })
       if (generateLinkResponse) {

src/components/dashboard/SendQRSummary.js

@@ -57,11 +57,9 @@ const SendQRSummary = ({ screenProps }: AmountProps) => {
   const sendGD = () => {
     try {
       setLoading(true)
-      let txhash
       goodWallet.sendAmount(to, amount, {
         onTransactionHash: hash => {
           log.debug({ hash })
-          txhash = hash
 
           // Save transaction
           const transactionEvent: TransactionEvent = {
@@ -94,7 +92,12 @@ const SendQRSummary = ({ screenProps }: AmountProps) => {
         },
         onError: e => {
           log.error('Send TX failed:', e.message, e)
-          userStorage.markWithErrorEvent(txhash)
+          showDialog({
+            visible: true,
+            title: 'Transaction Failed!',
+            message: `There was a problem sending G$. Try again`,
+            dismissText: 'OK',
+          })
         },
       })
     } catch (e) {

src/lib/gundb/UserStorageClass.js

@@ -26,7 +26,6 @@ import { getUserModel, type UserModel } from './UserModel'
 
 const logger = pino.child({ from: 'UserStorage' })
 
-const EVENT_TYPE_WITHDRAW = 'withdraw'
 const EVENT_TYPE_BONUS = 'bonus'
 const EVENT_TYPE_CLAIM = 'claim'
 const EVENT_TYPE_SEND = 'send'
@@ -716,15 +715,15 @@ export class UserStorage {
         .catch(_ => new Date())
 
       //if we withdrawn the payment link then its canceled
-      const status =
+      const otplStatus =
         data.name === CONTRACT_EVENT_TYPE_PAYMENT_CANCEL || data.to === data.from ? 'cancelled' : 'completed'
       const prevDate = feedEvent.date
       feedEvent.data.from = data.from
       feedEvent.data.to = data.to
       feedEvent.data.otplData = data
-      feedEvent.status = status
+      feedEvent.status = feedEvent.data.otplStatus = otplStatus
       feedEvent.date = receiptDate.toString()
-      logger.debug('handleOTPLUpdated receiptReceived', { feedEvent, status, receipt, data })
+      logger.debug('handleOTPLUpdated receiptReceived', { feedEvent, otplStatus, receipt, data })
       await this.updateFeedEvent(feedEvent, prevDate)
       return feedEvent
     } catch (e) {
@@ -1218,25 +1217,12 @@ export class UserStorage {
     return Promise.all(
       eventsIndex
         .filter(_ => _.id)
-        .map(async eventIndex => {
-          let item = this.feed
+        .map(eventIndex =>
+          this.feed
             .get('byid')
             .get(eventIndex.id)
             .decrypt()
-
-          if (item === undefined) {
-            const receipt = await this.wallet.getReceiptWithLogs(eventIndex.id).catch(e => {
-              logger.warn('no receipt found for id:', eventIndex.id, e.message, e)
-              return undefined
-            })
-
-            if (receipt) {
-              item = await this.handleReceiptUpdated(receipt)
-            }
-          }
-
-          return item
-        })
+        )
     )
   }
 
@@ -1250,17 +1236,16 @@ export class UserStorage {
 
     return Promise.all(
       feed
-        .filter(feedItem => feedItem.data && ['deleted', 'cancelled'].includes(feedItem.status) === false)
-        .map(feedItem => {
-          if (!(feedItem.data && feedItem.data.receiptData)) {
-            return this.getFormatedEventById(feedItem.id)
-          }
-
-          return this.formatEvent(feedItem).catch(e => {
+        .filter(
+          feedItem =>
+            feedItem.data && ['deleted', 'cancelled'].includes(feedItem.status || feedItem.otplStatus) === false
+        )
+        .map(feedItem =>
+          this.formatEvent(feedItem).catch(e => {
             logger.error('getFormattedEvents Failed formatting event:', e.message, e, feedItem)
             return {}
           })
-        })
+        )
     )
   }
 
@@ -1405,10 +1390,10 @@ export class UserStorage {
 
     try {
       const { data, type, date, id, status, createdDate } = event
-      const { sender, reason, code: withdrawCode, customName, subtitle } = data
+      const { sender, reason, code: withdrawCode, otplStatus, customName, subtitle } = data
 
       const { address, initiator, initiatorType, value, displayName, message } = this._extractData(event)
-      const withdrawStatus = this._extractWithdrawStatus(withdrawCode, status)
+      const withdrawStatus = this._extractWithdrawStatus(withdrawCode, otplStatus, status)
       const displayType = this._extractDisplayType(type, withdrawStatus, status)
       logger.debug('formatEvent:', event.id, { initiatorType, initiator, address })
       const profileNode = this._extractProfileToShow(initiatorType, initiator, address)
@@ -1488,17 +1473,13 @@ export class UserStorage {
     return data
   }
 
-  _extractWithdrawStatus(withdrawCode, status) {
-    return status === 'error' ? status : withdrawCode ? status : ''
+  _extractWithdrawStatus(withdrawCode, otplStatus = 'pending', status) {
+    return status === 'error' ? status : withdrawCode ? otplStatus : ''
   }
 
   _extractDisplayType(type, withdrawStatus, status) {
     let sufix = ''
 
-    if (type === EVENT_TYPE_WITHDRAW) {
-      sufix = withdrawStatus
-    }
-
     if (type === EVENT_TYPE_SEND) {
       sufix = withdrawStatus
     }
@@ -1537,9 +1518,7 @@ export class UserStorage {
 
     return (
       (type === EVENT_TYPE_BONUS && favicon) ||
-      (((type === EVENT_TYPE_SEND && withdrawStatus === 'error') ||
-        (type === EVENT_TYPE_WITHDRAW && withdrawStatus === 'error')) &&
-        favicon) || // errored send/withdraw
+      (type === EVENT_TYPE_SEND && withdrawStatus === 'error' && favicon) || //errored send
       (await profileFromGun()) || // extract avatar from profile
       (type === EVENT_TYPE_CLAIM || address === '0x0000000000000000000000000000000000000000' ? favicon : undefined)
     )
@@ -1589,7 +1568,7 @@ export class UserStorage {
         .get('queue')
         .get(event.id)
         .putAck(event)
-      await this.updateFeedEvent(event)
+      this.updateFeedEvent(event)
       logger.debug('enqueueTX ok:', { event, putRes })
       return true
     } catch (e) {
@@ -1638,9 +1617,7 @@ export class UserStorage {
    */
   async updateEventStatus(eventId: string, status: string): Promise<FeedEvent> {
     const feedEvent = await this.getFeedItemByTransactionHash(eventId)
-
     feedEvent.status = status
-
     return this.feed
       .get('byid')
       .get(eventId)
@@ -1654,23 +1631,30 @@ export class UserStorage {
   }
 
   /**
-   * Sets the event's status as error
-   * @param {string} txHash
-   * @returns {Promise<void>}
+   * Sets the event's otpl status
+   * @param {string} eventId
+   * @param {string} status
+   * @returns {Promise<FeedEvent>}
    */
-  async markWithErrorEvent(txHash: string): Promise<void> {
-    if (txHash === undefined) {
-      return
-    }
-    const release = await this.feedMutex.lock()
+  async updateEventOtplStatus(eventId: string, status: string): Promise<FeedEvent> {
+    const feedEvent = await this.getFeedItemByTransactionHash(eventId)
+    feedEvent.status = status
 
-    try {
-      await this.updateEventStatus(txHash, 'error')
-    } catch (e) {
-      logger.error('Failed to set error status for feed event', e.message, e)
-    } finally {
-      release()
+    if (feedEvent.data) {
+      feedEvent.data.otplStatus = status
     }
+
+    return this.updateFeedEvent(feedEvent)
+  }
+
+  /**
+   * Sets the event's status as error
+   * @param {*} err
+   * @returns {Promise<FeedEvent>}
+   */
+  async markWithErrorEvent(err: any): Promise<FeedEvent> {
+    const error = JSON.parse(`{${err.message.split('{')[1]}`)
+    await this.updateEventOtplStatus(error.transactionHash, 'error')
   }
 
   /**
@@ -1697,7 +1681,7 @@ export class UserStorage {
    * @returns {Promise<FeedEvent>}
    */
   async cancelOTPLEvent(eventId: string): Promise<FeedEvent> {
-    await this.updateEventStatus(eventId, 'cancelled')
+    await this.updateEventOtplStatus(eventId, 'cancelled')
   }
 
   /**

src/lib/undux/utils/withdraw.js

@@ -23,25 +23,16 @@ type ReceiptType = {
  *
  * @param {Store} store - Undux store
  * @param {string} code - code that unlocks the escrowed payment
- * @param {string} reason - the reason of payment
  * @returns {Promise} Returns the receipt of the transaction
  */
-export const executeWithdraw = async (
-  store: Store,
-  code: string,
-  reason: string
-): Promise<ReceiptType | { status: boolean }> => {
+export const executeWithdraw = async (store: Store, code: string, reason: string): Promise<ReceiptType> => {
   log.info('executeWithdraw', code, reason)
   try {
     const { amount, sender, status } = await goodWallet.getWithdrawDetails(code)
     if (status === WITHDRAW_STATUS_PENDING) {
-      let txHash
-
       return new Promise((res, rej) => {
         goodWallet.withdraw(code, {
           onTransactionHash: transactionHash => {
-            txHash = transactionHash
-
             const transactionEvent: TransactionEvent = {
               id: transactionHash,
               date: new Date().toString(),
@@ -57,7 +48,7 @@ export const executeWithdraw = async (
             res({ status, transactionHash })
           },
           onError: e => {
-            userStorage.markWithErrorEvent(txHash)
+            userStorage.markWithErrorEvent(e)
             rej(e)
           },
         })