diff --git a/charts/flash/Chart.yaml b/charts/flash/Chart.yaml index 391da238..ccb5cecf 100644 --- a/charts/flash/Chart.yaml +++ b/charts/flash/Chart.yaml @@ -3,7 +3,7 @@ name: flash description: A Helm chart for the Flash application backend type: application version: 3.2.4 -appVersion: 0.7.45 +appVersion: 0.7.48 dependencies: - name: redis repository: https://charts.bitnami.com/bitnami diff --git a/charts/flash/apollo-router/supergraph.graphql b/charts/flash/apollo-router/supergraph.graphql index 6372a6ba..c41e24b8 100644 --- a/charts/flash/apollo-router/supergraph.graphql +++ b/charts/flash/apollo-router/supergraph.graphql @@ -207,11 +207,18 @@ type Bank type BankAccount @join__type(graph: PUBLIC) { + accountName: String! accountNumber: String! - accountType: String! - bankBranch: String! - bankName: String! + + """Name of the bank institution""" + bank: String! + + """Account currency (e.g. JMD, USD)""" currency: String! + + """ERPNext bank account identifier""" + id: ID! + isDefault: Boolean! } input BankAccountInput @@ -234,8 +241,9 @@ type BTCWallet implements Wallet accountId: ID! """A balance stored in BTC.""" - balance: FractionalCentAmount! + balance: FractionalCentAmount id: ID! + isExternal: Boolean! lnurlp: Lnurl """An unconfirmed incoming onchain balance.""" @@ -1165,6 +1173,7 @@ type Mutation The user can review this offer and then execute the withdrawal by calling the initiateCashout mutation. """ requestCashout(input: RequestCashoutInput!): RequestCashoutResponse! + updateExternalWallet(input: UpdateExternalWalletInput!): UpdateExternalWalletPayload! userContactUpdateAlias(input: UserContactUpdateAliasInput!): UserContactUpdateAliasPayload! @deprecated(reason: "will be moved to AccountContact") userEmailDelete: UserEmailDeletePayload! userEmailRegistrationInitiate(input: UserEmailRegistrationInitiateInput!): UserEmailRegistrationInitiatePayload! @@ -1856,6 +1865,19 @@ enum TxStatus SUCCESS @join__enumValue(graph: PUBLIC) } +input UpdateExternalWalletInput + @join__type(graph: PUBLIC) +{ + lnurlp: Lnurl! +} + +type UpdateExternalWalletPayload + @join__type(graph: PUBLIC) +{ + errors: [Error!]! + walletId: WalletId +} + type UpgradePayload @join__type(graph: PUBLIC) { @@ -1876,8 +1898,9 @@ type UsdWallet implements Wallet @join__type(graph: PUBLIC) { accountId: ID! - balance: FractionalCentAmount! + balance: FractionalCentAmount id: ID! + isExternal: Boolean! lnurlp: Lnurl """An unconfirmed incoming onchain balance.""" @@ -1917,6 +1940,9 @@ type UsdWallet implements Wallet type User @join__type(graph: PUBLIC) { + """Bank accounts available for cashout""" + bankAccounts: [BankAccount!]! + """ Get single contact details. Can include the transactions associated with the contact. @@ -2205,8 +2231,9 @@ interface Wallet @join__type(graph: PUBLIC) { accountId: ID! - balance: FractionalCentAmount! + balance: FractionalCentAmount id: ID! + isExternal: Boolean! lnurlp: Lnurl pendingIncomingBalance: SignedAmount! diff --git a/charts/flash/values.yaml b/charts/flash/values.yaml index 2aa7967b..3045f9a0 100644 --- a/charts/flash/values.yaml +++ b/charts/flash/values.yaml @@ -48,16 +48,16 @@ galoy: repository: lnflash/flash-app imagePullPolicy: Always # digests managed by flash-app pipeline in concourse - digest: sha256:d28ba49761265d51f194e46878196be4b6a84194f83fdd51b6c86e2c66d68673 - git_ref: "e9452c3" + digest: sha256:b1f476aef0726420b3b963b3be5c8b9cbd122c9520e015738740f6a4615fc02f + git_ref: "1dcae32" websocket: repository: docker.io/lnflash/galoy-app-websocket # digests managed by flash-app pipeline in concourse - digest: "sha256:497a91d736d56e1e27a962aa7cd722077da8d21791a18ee0b108ff75d3cb48b8" + digest: "sha256:0b4099d3cee95bf7a94d9ae3867c3df5b05846d5516e536021e51806b668923f" mongodbMigrate: repository: docker.io/lnflash/galoy-app-migrate # digests managed by flash-app pipeline in concourse - digest: "sha256:b66414307d90369280168ad26336e073ce3485b79b3e8cdd8e09377511eaae88" + digest: "sha256:cc4e198551584c89488880cc1c24e1731aa426132760ded3bb51173228b17cd3" mongoBackup: repository: us.gcr.io/galoy-org/mongo-backup # Currently using Galoy's images. To make changes, see /images & /ci in this repo @@ -841,7 +841,7 @@ kratos: body: plaintext: base64://SGksCgpDb25maXJtIGFjY2VzcyB0byB5b3VyIEZsYXNoIGFjY291bnQgdXNpbmcgdGhlIGZvbGxvd2luZyBjb2RlOgoKe3sgLlJlY292ZXJ5Q29kZSB9fQoKVGhpcyBjb2RlIHdpbGwgb25seSBiZSB1c2VkIG9uY2UuIERvIG5vdCBzaGFyZSBpdCB3aXRoIGFueW9uZS4gCg== html: base64://PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ImVuIj4KCjxoZWFkPgogICAgPG1ldGEgY2hhcnNldD0iVVRGLTgiPgogICAgPG1ldGEgbmFtZT0idmlld3BvcnQiIGNvbnRlbnQ9IndpZHRoPWRldmljZS13aWR0aCwgaW5pdGlhbC1zY2FsZT0xLjAiPgogICAgPHN0eWxlPgogICAgICAgIGJvZHkgewogICAgICAgICAgICBmb250LWZhbWlseTogQXJpYWwsIHNhbnMtc2VyaWY7CiAgICAgICAgICAgIG1hcmdpbjogMDsKICAgICAgICAgICAgcGFkZGluZzogMDsKICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2Y0ZjRmNDsKICAgICAgICAgICAgY29sb3I6ICMzMzM7CiAgICAgICAgfQoKICAgICAgICAuY29udGFpbmVyIHsKICAgICAgICAgICAgbWF4LXdpZHRoOiA2MDBweDsKICAgICAgICAgICAgbWFyZ2luOiAwIGF1dG87CiAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6ICNmZmZmZmY7CiAgICAgICAgICAgIGJvcmRlci1yYWRpdXM6IDhweDsKICAgICAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsKICAgICAgICAgICAgYm94LXNoYWRvdzogMCAwIDEwcHggcmdiYSgwLCAwLCAwLCAwLjEpOwogICAgICAgIH0KCiAgICAgICAgLmhlYWRlciB7CiAgICAgICAgICAgIGJhY2tncm91bmQtY29sb3I6ICMwMDdiZmY7CiAgICAgICAgICAgIGNvbG9yOiAjZmZmZmZmOwogICAgICAgICAgICB0ZXh0LWFsaWduOiBjZW50ZXI7CiAgICAgICAgICAgIHBhZGRpbmc6IDIwcHg7CiAgICAgICAgfQoKICAgICAgICAuaGVhZGVyIGgxIHsKICAgICAgICAgICAgbWFyZ2luOiAwOwogICAgICAgICAgICBmb250LXNpemU6IDI0cHg7CiAgICAgICAgfQoKICAgICAgICAuaGVhZGVyIGltZyB7CiAgICAgICAgICAgIG1heC13aWR0aDogMTAwcHg7CiAgICAgICAgICAgIG1hcmdpbi10b3A6IDEwcHg7CiAgICAgICAgfQoKICAgICAgICAuY29udGVudCB7CiAgICAgICAgICAgIHBhZGRpbmc6IDIwcHg7CiAgICAgICAgICAgIHRleHQtYWxpZ246IGNlbnRlcjsKICAgICAgICB9CgogICAgICAgIC5jb250ZW50IGgyIHsKICAgICAgICAgICAgZm9udC1zaXplOiAyMHB4OwogICAgICAgICAgICBtYXJnaW46IDIwcHggMDsKICAgICAgICB9CgogICAgICAgIC5jb250ZW50IHAgewogICAgICAgICAgICBmb250LXNpemU6IDE2cHg7CiAgICAgICAgICAgIG1hcmdpbjogMTBweCAwOwogICAgICAgIH0KCiAgICAgICAgLmNvZGUgewogICAgICAgICAgICBmb250LXNpemU6IDI0cHg7CiAgICAgICAgICAgIGZvbnQtd2VpZ2h0OiBib2xkOwogICAgICAgICAgICBjb2xvcjogIzAwN2JmZjsKICAgICAgICAgICAgbWFyZ2luOiAyMHB4IDA7CiAgICAgICAgfQoKICAgICAgICAuZm9vdGVyIHsKICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI2Y0ZjRmNDsKICAgICAgICAgICAgY29sb3I6ICM3Nzc7CiAgICAgICAgICAgIHRleHQtYWxpZ246IGNlbnRlcjsKICAgICAgICAgICAgcGFkZGluZzogMTBweDsKICAgICAgICAgICAgZm9udC1zaXplOiAxMnB4OwogICAgICAgIH0KICAgIDwvc3R5bGU+CjwvaGVhZD4KCjxib2R5PgogICAgPGRpdiBjbGFzcz0iY29udGFpbmVyIj4KICAgICAgICA8ZGl2IGNsYXNzPSJoZWFkZXIiPgogICAgICAgICAgICA8aDE+V2VsY29tZSB0byBGbGFzaDwvaDE+CiAgICAgICAgICAgIDxpbWcgc3JjPSJodHRwczovL2dldGZsYXNoLmlvL2Fzc2V0cy9pbWcvbG9nby13aGl0ZS5wbmciIGFsdD0iV2VsY29tZSBJbWFnZSI+CiAgICAgICAgPC9kaXY+CiAgICAgICAgPGRpdiBjbGFzcz0iY29udGVudCI+CiAgICAgICAgICAgIDxoMj5Db25maXJtIFlvdXIgQWNjZXNzPC9oMj4KICAgICAgICAgICAgPHA+SGksPC9wPgogICAgICAgICAgICA8cD5Db25maXJtIGFjY2VzcyB0byB5b3VyIEZsYXNoIGFjY291bnQgdXNpbmcgdGhlIGZvbGxvd2luZyBjb2RlOjwvcD4KICAgICAgICAgICAgPGRpdiBjbGFzcz0iY29kZSI+e3sgLlJlY292ZXJ5Q29kZSB9fTwvZGl2PgogICAgICAgICAgICA8cD5UaGlzIGNvZGUgd2lsbCBvbmx5IGJlIHVzZWQgb25jZS4gRG8gbm90IHNoYXJlIGl0IHdpdGggYW55b25lLjwvcD4KICAgICAgICA8L2Rpdj4KICAgICAgICA8ZGl2IGNsYXNzPSJmb290ZXIiPgogICAgICAgICAgICA8cD4mY29weTsgMjAyNCBGbGFzaC4gQWxsIHJpZ2h0cyByZXNlcnZlZC48L3A+CiAgICAgICAgPC9kaXY+CiAgICA8L2Rpdj4KPC9ib2R5PgoKPC9odG1sPgo= - tracing: + tracing: service_name: "kratos" provider: otel providers: