Add RequestStatus_DONE (#15370)

* Add RequestStatus_DONE * remove requests outside of chat * no send button if request done
keybase · Jan 8, 2019 · 45c1244 · 45c1244
1 parent dfb7f17
commit 45c1244
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 122 deletions.
diff --git a/go/protocol/stellar1/common.go b/go/protocol/stellar1/common.go
diff --git a/protocol/avdl/stellar1/common.avdl b/protocol/avdl/stellar1/common.avdl
@@ -40,7 +40,8 @@ protocol common {
 
   enum RequestStatus {
     OK_0,
-    CANCELED_1
+    CANCELED_1,
+    DONE_2
   }
 
   enum PaymentStrategy {

diff --git a/protocol/bin/enabled-calls.json b/protocol/bin/enabled-calls.json
@@ -194,7 +194,6 @@
   "stellar.1.local.getPaymentDetailsLocal": {"promise": true},
   "stellar.1.local.getPaymentsLocal": {"promise": true},
   "stellar.1.local.getPendingPaymentsLocal": {"promise": true},
-  "stellar.1.local.getRequestDetailsLocal": {"promise": true},
   "stellar.1.local.getSendAssetChoicesLocal": {"promise": true},
   "stellar.1.local.getWalletAccountLocal": {"promise": true},
   "stellar.1.local.getWalletAccountSecretKeyLocal": {"promise": true},

diff --git a/protocol/json/stellar1/common.json b/protocol/json/stellar1/common.json
diff --git a/shared/actions/json/wallets.json b/shared/actions/json/wallets.json
@@ -194,10 +194,6 @@
       "accountID": "Types.AccountID",
       "code": "Types.CurrencyCode"
     },
-    "loadRequestDetail": {
-      "_description": "Load a request's details",
-      "requestID": "StellarRPCTypes.KeybaseRequestID"
-    },
     "requestPayment": {
       "_description": "Request payment"
     },
@@ -232,10 +228,6 @@
       "oldestUnread": "Types.PaymentID",
       "payments": "Array<Types.PaymentResult>"
     },
-    "requestDetailReceived": {
-      "_description": "Store a request's details",
-      "request": "StellarRPCTypes.RequestDetailsLocal"
-    },
     "reviewedPaymentReceived": {
       "_description": "Update our store with the results of reviewing a built payment",
       "bid": "string",

diff --git a/shared/actions/wallets-gen.js b/shared/actions/wallets-gen.js
diff --git a/shared/actions/wallets.js b/shared/actions/wallets.js
@@ -536,11 +536,6 @@ const loadDisplayCurrencyForAccounts = (state, action) =>
   // load the display currency of each wallet, now that we have the IDs
   action.payload.accounts.map(account => WalletsGen.createLoadDisplayCurrency({accountID: account.accountID}))
 
-const loadRequestDetail = (state, action) =>
-  RPCStellarTypes.localGetRequestDetailsLocalRpcPromise({reqID: action.payload.requestID})
-    .then(request => WalletsGen.createRequestDetailReceived({request}))
-    .catch(err => logger.error(`Error loading request detail: ${err.message}`))
-
 const cancelPayment = (state, action) => {
   const {paymentID, showAccount} = action.payload
   const pid = Types.paymentIDToString(paymentID)
@@ -918,11 +913,6 @@ function* walletsSaga(): Saga.SagaGenerator<any, any> {
     WalletsGen.exitFailedPayment,
     exitFailedPayment
   )
-
-  yield* Saga.chainAction<WalletsGen.LoadRequestDetailPayload>(
-    WalletsGen.loadRequestDetail,
-    loadRequestDetail
-  )
   yield* Saga.chainAction<WalletsGen.CancelRequestPayload>(WalletsGen.cancelRequest, cancelRequest)
   yield* Saga.chainAction<WalletsGen.CancelPaymentPayload>(WalletsGen.cancelPayment, cancelPayment)
 

diff --git a/shared/chat/conversation/messages/account-payment/container.js b/shared/chat/conversation/messages/account-payment/container.js
@@ -100,7 +100,7 @@ const mapStateToProps = (state, ownProps: OwnProps) => {
         // waiting for service to load it
         return loadingProps
       }
-      const {amountDescription, asset, canceled} = requestInfo
+      const {amountDescription, asset, canceled, done} = requestInfo
       return {
         _paymentID: null,
         action: asset === 'currency' ? 'requested Lumens worth' : 'requested',
@@ -116,7 +116,9 @@ const mapStateToProps = (state, ownProps: OwnProps) => {
         memo: message.note.stringValue(),
         pending: false,
         sendButtonLabel:
-          youAreSender || canceled ? '' : `Send${requestInfo.asset === 'currency' ? ' Lumens worth ' : ' '}`,
+          youAreSender || canceled || done
+            ? ''
+            : `Send${requestInfo.asset === 'currency' ? ' Lumens worth ' : ' '}`,
       }
     }
     default:

diff --git a/shared/constants/chat2/message.js b/shared/constants/chat2/message.js
@@ -221,6 +221,7 @@ export const makeChatRequestInfo: I.RecordFactory<MessageTypes._ChatRequestInfo>
   asset: 'native',
   canceled: false,
   currencyCode: '',
+  done: false,
   type: 'requestInfo',
 })
 
@@ -366,6 +367,7 @@ export const uiRequestInfoToChatRequestInfo = (
     asset,
     canceled: r.status === RPCStellarTypes.commonRequestStatus.canceled,
     currencyCode,
+    done: r.status === RPCStellarTypes.commonRequestStatus.done,
   })
 }
 

diff --git a/shared/constants/types/chat2/message.js b/shared/constants/types/chat2/message.js
@@ -170,6 +170,7 @@ export type _ChatRequestInfo = {
   asset: WalletTypes.Asset,
   canceled: boolean,
   currencyCode: string, // set if asset === 'currency'
+  done: boolean,
   type: 'requestInfo',
 }
 export type ChatRequestInfo = I.RecordOf<_ChatRequestInfo>

diff --git a/shared/constants/types/rpc-stellar-gen.js b/shared/constants/types/rpc-stellar-gen.js