Skip to content

Commit cbc56fb

Browse files
denengineerdenengineer
committed
refactor: API /info resposne format updated
1 parent 9adb42b commit cbc56fb

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎app/sources/src/components/PaymentConfirmation/view.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@ export class PaymentConfirmation extends Component {
246246
payments.estimate.error.code === '403RPA01'
247247
}
248248
/>
249-
{info.get.data && info.get.data.status === 'maintenance' && info.get.data.statusMessage ? (
249+
{info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance' && info.get.data.status.message ? (
250250
<Maintenance>
251-
<Span>{info.get.data.statusMessage.split('\n')[0]}</Span>
252-
{info.get.data.statusMessage.split('\n').slice(1).join('\n')}
251+
<Span>{info.get.data.status.message.split('\n')[0]}</Span>
252+
{info.get.data.status.message.split('\n').slice(1).join('\n')}
253253
</Maintenance>
254254
) : null}
255255
{payments.estimate.error && !payments.estimate.loading && !payments.estimate.debouncing && (
@@ -321,7 +321,7 @@ export class PaymentConfirmation extends Component {
321321
primary
322322
type="submit"
323323
disabled={
324-
payments.estimate.loading || payments.estimate.debouncing || payments.estimate.error || info.get.data && info.get.data.status === 'maintenance'
324+
payments.estimate.loading || payments.estimate.debouncing || payments.estimate.error || info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance'
325325
}
326326
>
327327
<Span>Pay</Span>

‎app/sources/src/scenes/Payments/view.js

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -140,10 +140,10 @@ const Payments = ({ settings, payments, accounts, ui, info, t }) => {
140140
<Settings to="/settings" />
141141
<Support unreadCounter={LiveChatUnread} className="openIntercom" />
142142
</Header>
143-
{info.get.data && info.get.data.status === 'maintenance' && info.get.data.statusMessage ? (
143+
{info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance' && info.get.data.status.message ? (
144144
<Maintenance>
145-
<Span>{info.get.data.statusMessage.split('\n')[0]}</Span>
146-
{info.get.data.statusMessage
145+
<Span>{info.get.data.status.message.split('\n')[0]}</Span>
146+
{info.get.data.status.message
147147
.split('\n')
148148
.slice(1)
149149
.join('\n')}
@@ -154,7 +154,7 @@ const Payments = ({ settings, payments, accounts, ui, info, t }) => {
154154
<PayButton
155155
id="payButton"
156156
to={totalBalance === 0 ? '/payments/receive/check' : '/payments/check'}
157-
disabled={info.get.data && info.get.data.status === 'maintenance'}
157+
disabled={info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance'}
158158
>
159159
{/* <Img src={newPaymentIcon} /> */}
160160
<Span>{totalBalance === 0 ? 'Receive funds' : 'Pay'}</Span>
@@ -177,10 +177,10 @@ const Payments = ({ settings, payments, accounts, ui, info, t }) => {
177177
<Settings to="/settings" />
178178
<Support unreadCounter={LiveChatUnread} className="openIntercom" />
179179
</Header>
180-
{info.get.data && info.get.data.status === 'maintenance' && info.get.data.statusMessage ? (
180+
{info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance' && info.get.data.status.message ? (
181181
<Maintenance>
182-
<Span>{info.get.data.statusMessage.split('\n')[0]}</Span>
183-
{info.get.data.statusMessage
182+
<Span>{info.get.data.status.message.split('\n')[0]}</Span>
183+
{info.get.data.status.message
184184
.split('\n')
185185
.slice(1)
186186
.join('\n')}
@@ -191,7 +191,7 @@ const Payments = ({ settings, payments, accounts, ui, info, t }) => {
191191
<PayButton
192192
id="payButton"
193193
to={totalBalance === 0 ? '/payments/receive/check' : '/payments/check'}
194-
disabled={info.get.data && info.get.data.status === 'maintenance'}
194+
disabled={info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance'}
195195
>
196196
{/* <Img src={newPaymentIcon} /> */}
197197
<Span>{totalBalance === 0 ? 'Receive funds' : 'Pay'}</Span>
@@ -214,10 +214,10 @@ const Payments = ({ settings, payments, accounts, ui, info, t }) => {
214214
<Settings to="/settings" />
215215
<Support unreadCounter={LiveChatUnread} className="openIntercom" />
216216
</Header>
217-
{info.get.data && info.get.data.status === 'maintenance' && info.get.data.statusMessage ? (
217+
{info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance' && info.get.data.status.message ? (
218218
<Maintenance>
219-
<Span>{info.get.data.statusMessage.split('\n')[0]}</Span>
220-
{info.get.data.statusMessage
219+
<Span>{info.get.data.status.message.split('\n')[0]}</Span>
220+
{info.get.data.status.message
221221
.split('\n')
222222
.slice(1)
223223
.join('\n')}
@@ -245,7 +245,7 @@ const Payments = ({ settings, payments, accounts, ui, info, t }) => {
245245
<PayButton
246246
id="payButton"
247247
to={totalBalance === 0 ? '/payments/receive/check' : '/payments/check'}
248-
disabled={info.get.data && info.get.data.status === 'maintenance'}
248+
disabled={info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance'}
249249
>
250250
{/* <Img src={newPaymentIcon} /> */}
251251
<Span>{totalBalance === 0 ? 'Receive funds' : 'Pay'}</Span>
@@ -321,10 +321,10 @@ const Payments = ({ settings, payments, accounts, ui, info, t }) => {
321321
<Settings to="/settings" />
322322
<Support unreadCounter={LiveChatUnread} className="openIntercom" />
323323
</Header>
324-
{info.get.data && info.get.data.status === 'maintenance' && info.get.data.statusMessage ? (
324+
{info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance' && info.get.data.status.message ? (
325325
<Maintenance>
326-
<Span>{info.get.data.statusMessage.split('\n')[0]}</Span>
327-
{info.get.data.statusMessage
326+
<Span>{info.get.data.status.message.split('\n')[0]}</Span>
327+
{info.get.data.status.message
328328
.split('\n')
329329
.slice(1)
330330
.join('\n')}
@@ -389,7 +389,7 @@ const Payments = ({ settings, payments, accounts, ui, info, t }) => {
389389
<PayButton
390390
id="payButton"
391391
to={totalBalance === 0 ? '/payments/receive/check' : '/payments/check'}
392-
disabled={info.get.data && info.get.data.status === 'maintenance'}
392+
disabled={info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance'}
393393
>
394394
{window.scrollY === 0 &&
395395
document.querySelector('.intercom-messenger-frame') === null &&

‎app/sources/src/scenes/Select/view.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ const Select = ({ payments, info, t }) => (
2929
})}
3030
</Message>
3131
) : null}
32-
{info.get.data && info.get.data.status === 'maintenance' && info.get.data.statusMessage ? (
32+
{info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance' && info.get.data.status.message ? (
3333
<Maintenance>
34-
<Span>{info.get.data.statusMessage.split('\n')[0]}</Span>
35-
{info.get.data.statusMessage
34+
<Span>{info.get.data.status.message.split('\n')[0]}</Span>
35+
{info.get.data.status.message
3636
.split('\n')
3737
.slice(1)
3838
.join('\n')}
3939
</Maintenance>
4040
) : null}
4141
<SelectReceiveAsset
42-
disabled={payments.receive.error || (info.get.data && info.get.data.status === 'maintenance')}
42+
disabled={payments.receive.error || (info.get.data && info.get.data.status && info.get.data.status.type === 'maintenance')}
4343
/>
4444
</Root>
4545
);

0 commit comments

Comments
 (0)