Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Nada/88951/change chat url #7798

Merged
merged 14 commits into from
Mar 21, 2023
Merged

Nada/88951/change chat url #7798

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6513b96
fix: get chat url from p2p_order_create instead of p2p_chat_create
nada-deriv Mar 2, 2023
7bdb4d2
fix: merged with dev
nada-deriv Mar 2, 2023
1e8a097
fix: merged with latest dev
nada-deriv Mar 3, 2023
2c93f30
fix: fixed issue with order details page
nada-deriv Mar 6, 2023
a8ef7ae
fix: chat channel url empty issue fixed for p2p_order_create response
nada-deriv Mar 7, 2023
6e6e640
fix: function added to store
nada-deriv Mar 7, 2023
8246dbc
fix: added timeout for setting chat_channel in order details
nada-deriv Mar 7, 2023
cfcac46
fix: pr comments fixed
nada-deriv Mar 7, 2023
8514089
fix: updated with latest master
nada-deriv Mar 8, 2023
38a6a98
fix: udpated with latest master
nada-deriv Mar 9, 2023
021036a
fix: increased time out
nada-deriv Mar 9, 2023
9fc1696
fix: updated with latest master
nada-deriv Mar 13, 2023
991bd13
fix: removed delay for going to details page from list
nada-deriv Mar 14, 2023
e0fcbcb
fix: merged with latest master
nada-deriv Mar 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/p2p/src/components/order-details/order-details.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ const OrderDetails = observer(() => {
order_store.setIsRecommended(undefined);
my_profile_store.getPaymentMethodsList();

// TODO: remove condition check once access chat_channel_url from p2p_order_create is activated in BO
if (order_channel_url) {
sendbird_store.setChatChannelUrl(order_channel_url);
} else {
Expand Down
3 changes: 3 additions & 0 deletions packages/p2p/src/stores/buy-sell-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ export default class BuySellStore extends BaseStore {
}

handleSubmit = async (isMountedFn, values, { setSubmitting }) => {
const { sendbird_store } = this.root_store;
if (isMountedFn()) {
setSubmitting(true);
}
Expand All @@ -272,6 +273,7 @@ export default class BuySellStore extends BaseStore {
advert_id: this.advert.id,
amount: values.amount,
payment_method_ids: this.payment_method_ids,
subscribe: 1,
...(values.payment_info && this.is_sell_advert ? { payment_info: values.payment_info } : {}),
// Validate extra information for sell adverts.
...(this.is_sell_advert
Expand All @@ -293,6 +295,7 @@ export default class BuySellStore extends BaseStore {
this.form_props.setErrorMessage(null);
this.root_store.general_store.hideModal();
this.root_store.floating_rate_store.setIsMarketRateChanged(false);
sendbird_store.setChatChannelUrl(order?.p2p_order_create?.chat_channel_url ?? '');
const response = await requestWS({ p2p_order_info: 1, id: order.p2p_order_create.id });
this.form_props.handleConfirm(response.p2p_order_info);
this.form_props.handleClose();
Expand Down
1 change: 1 addition & 0 deletions packages/p2p/src/stores/sendbird-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export default class SendbirdStore extends BaseStore {
this.chat_messages.push(chat_message);
}

// TODO: remove when access chat_channel_url from p2p_order_create is activated in BO
createChatForNewOrder(id) {
if (!this.chat_channel_url) {
// If order_information doesn't have chat_channel_url this is a new order
Expand Down