Use withdraw type if it is in the Asset (keybase#18695)

* Add withdrawType * Add withdraw type
SaltineChips · Aug 2, 2019 · 6eefc42 · 6eefc42
1 parent 629ab13
commit 6eefc42
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 2 deletions.
diff --git a/go/protocol/stellar1/common.go b/go/protocol/stellar1/common.go
diff --git a/go/stellar/stellarsvc/anchor.go b/go/stellar/stellarsvc/anchor.go
@@ -62,9 +62,14 @@ func (a *anchorInteractor) Withdraw(mctx libkb.MetaContext) (stellar1.AssetActio
 		return stellar1.AssetActionResultLocal{}, err
 	}
 
-	// TODO: `type` is supposedly optional, but actually required...so figure it out.
 	v := url.Values{}
 	v.Set("asset_code", a.asset.Code)
+	if a.asset.WithdrawType != "" {
+		// this is supposed to be optional, but a lot of anchors require it
+		// if they all change to optional, we can not return this from stellard
+		// and it won't get set
+		v.Set("type", a.asset.WithdrawType)
+	}
 	u.RawQuery = v.Encode()
 
 	var okResponse okWithdrawResponse

diff --git a/go/stellar/stellarsvc/anchor_test.go b/go/stellar/stellarsvc/anchor_test.go
@@ -129,6 +129,7 @@ var validAnchorTests = []anchorTest{
 			Issuer:         "GAKBPBDMW6CTRDCXNAPSVJZ6QAN3OBNRG6CWI27FGDQT2ZJJEMDRXPKK",
 			VerifiedDomain: "www.anchorusd.com",
 			TransferServer: "https://api.anchorusd.com/transfer",
+			WithdrawType:   "bank_account",
 		},
 		DepositExternalURL:  "https://portal.anchorusd.com/onboarding?account=GBZX4364PEPQTDICMIQDZ56K4T75QZCR4NBEYKO6PDRJAHZKGUOJPCXB&identifier=b700518e7430513abdbdab96e7ead566",
 		WithdrawExternalURL: "https://portal.anchorusd.com/onboarding?account=GACW7NONV43MZIFHCOKCQJAKSJSISSICFVUJ2C6EZIW5773OU3HD64VI",

diff --git a/protocol/avdl/stellar1/common.avdl b/protocol/avdl/stellar1/common.avdl
@@ -25,6 +25,7 @@ protocol common {
     string depositButtonText; // the text to show in the deposit button, most likely "Deposit"
     boolean showWithdrawButton; // if true, show a withdraw button
     string withdrawButtonText; // the text to show in the withdraw button, most likely "Withdraw"
+    string withdrawType; // bank_account, crypto, cash, etc. that the anchor supports
     string transferServer; // sep6 transfer server
     string authEndpoint; // sep6 auth endpoint
   }

diff --git a/protocol/json/stellar1/common.json b/protocol/json/stellar1/common.json
diff --git a/shared/actions/wallets.tsx b/shared/actions/wallets.tsx
@@ -154,6 +154,7 @@ const emptyAsset: RPCStellarTypes.Asset = {
   type: 'native',
   verifiedDomain: '',
   withdrawButtonText: '',
+  withdrawType: '',
 }
 
 const emptyAssetWithoutType: RPCStellarTypes.Asset = {
@@ -1234,6 +1235,7 @@ const assetDescriptionOrNativeToRpcAsset = (
   type: asset === 'native' ? 'native' : asset.code.length > 4 ? 'credit_alphanum12' : 'credit_alphanum4',
   verifiedDomain: asset === 'native' ? '' : asset.issuerVerifiedDomain,
   withdrawButtonText: '',
+  withdrawType: '',
 })
 
 const rpcAssetToAssetDescriptionOrNative = (asset: RPCStellarTypes.Asset): Types.AssetDescriptionOrNative =>

diff --git a/shared/constants/types/rpc-stellar-gen.tsx b/shared/constants/types/rpc-stellar-gen.tsx
diff --git a/shared/wallets/transaction-details/index.stories.tsx b/shared/wallets/transaction-details/index.stories.tsx
@@ -69,6 +69,7 @@ const partialAsset = {
   transferServer: '',
   type: '',
   withdrawButtonText: '',
+  withdrawType: '',
 }
 
 const load = () => {