Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.

Add websocket handling #3

Merged
merged 13 commits into from
Jun 21, 2019
Merged

Add websocket handling #3

merged 13 commits into from
Jun 21, 2019

Conversation

OskarAhl
Copy link
Contributor

No description provided.

const server = isProduction() && is_real ? 'green' : 'blue'

server_url = `${server}.binaryws.com`
server_url = `blue.binaryws.com`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's connect to default or green

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok 👍

@@ -35,7 +36,7 @@ const Header = ({ siteTitle }) => (
padding: `0.5rem`,
}}
>
Home
<Localize i18n_text="Home" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what an ugly syntax 😃

Copy link
Contributor Author

@OskarAhl OskarAhl Jun 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Got a more elegant suggestion? 😅 Either way can change it later when we add translations

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe just text instead of i18n_text?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zaki yeah text is cleaner but I think we want to keep it more specific incase we need a extract translations script?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

translate?

@OskarAhl OskarAhl merged commit 01c46b2 into binary-com:dev Jun 21, 2019
mustofa-binary pushed a commit that referenced this pull request Oct 23, 2020
* feat:update multiplier content

* fix:resolve PR comments

* fix:Qa comments

* fix:Qa comments #2

* fix:qa comments #3

* fix:qa issues

* fix: Qa comments

* update: image and fix qa comments

* fix:margin problem on text

* update: messages.json ( translation:extract )

Co-authored-by: Kevin <[email protected]>
mustofa-binary pushed a commit that referenced this pull request Nov 6, 2020
* feat:update multiplier content

* fix:resolve PR comments

* fix:Qa comments

* fix:Qa comments #2

* fix:qa comments #3

* fix:qa issues

* fix: Qa comments

* update: image and fix qa comments

* fix:margin problem on text

* update: messages.json ( translation:extract )

Co-authored-by: Kevin <[email protected]>
mustofa-binary added a commit that referenced this pull request Nov 6, 2020
* Sara / Update commission text (#1132)

* Removed up to

* Removed up to from who-can-apply

Co-authored-by: sara-fs <[email protected]>

* Kevin/Update multiplier content (#1134)

* feat:update multiplier content

* fix:resolve PR comments

* fix:Qa comments

* fix:Qa comments #2

* fix:qa comments #3

* fix:qa issues

* fix: Qa comments

* update: image and fix qa comments

* fix:margin problem on text

* update: messages.json ( translation:extract )

Co-authored-by: Kevin <[email protected]>

* fix: updated text for UK and non-UK clients (#1146)

* text:update eu footer content (#1141)

Co-authored-by: Kevin <[email protected]>

* text:add apostrophe on option description (#1120)

Co-authored-by: Kevin <[email protected]>

* text: update hero content (#1139)

Co-authored-by: Kevin <[email protected]>

* translate:extract upload download

* translate: download

* translate: download chinese

Co-authored-by: sara-fs <[email protected]>
Co-authored-by: sara-fs <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: sean-binary <[email protected]>
Co-authored-by: mustofa-binary <[email protected]>
mustofa-binary added a commit that referenced this pull request Nov 17, 2020
* Sara / Update commission text (#1132)

* Removed up to

* Removed up to from who-can-apply

Co-authored-by: sara-fs <[email protected]>

* Kevin/Update multiplier content (#1134)

* feat:update multiplier content

* fix:resolve PR comments

* fix:Qa comments

* fix:Qa comments #2

* fix:qa comments #3

* fix:qa issues

* fix: Qa comments

* update: image and fix qa comments

* fix:margin problem on text

* update: messages.json ( translation:extract )

Co-authored-by: Kevin <[email protected]>

* fix: updated text for UK and non-UK clients (#1146)

* text:update eu footer content (#1141)

Co-authored-by: Kevin <[email protected]>

* text:add apostrophe on option description (#1120)

Co-authored-by: Kevin <[email protected]>

* text: update hero content (#1139)

Co-authored-by: Kevin <[email protected]>

* translate:extract upload download

* translate: download

* translate: download chinese

* amam/add_fiat_onramp (#1164)

* feat: add onramp payment methods

* update: hide wyre and xanpool for now

Co-authored-by: mustofa-binary <[email protected]>

* translate: download

* feat: trader-tools-page-calculators

* feat: handleError onclick for X icon

* fix:PR#1

* Fix:PR comments#2

* fix:PR - make use of Flex component instead of div

* fix: handle error, and buttond default disabled

* Fix: Qa comments #4 & add symbols

* fix: update validation text

* fix:margin to show decimal if necessary

* fix: minor styling

* remove: unecessary duplicate validation

* fix:PR comments : update validation, and styling

* fix: code review

* update:dropdown

* fix qa comments

* improve: styling and fix qa comment

* fix: max 2 digit decimals input, refactor validation, calculate bug

* fix: placeholder issue

* fix: placeholder issue

* fix: issue 35,36,37

* fix: issue 35,36,37

* remove: max 2 input decimal

* resolve: qa comments

* remove extra 0 on submit

* fix: qa comment focus on clicked error

* removed selected symbol dropdown

* resize font on smaller screen

* fix: different font for dropdown and input field

* fix:styling of subheader calculator

* add: scrollable margin value without showing scrollbar

* fix: border radius and scientific annotation removal on swap calc

* fix:different color in ios browser

* fix:different color in ios browser

* update: text area to flex

* fix: dropdown label on tab change, error on mozilla, color on safari

* fix: image for mobile version and remove some unused image & script

* added special case for step index, range break 100,200 on margin calculation

* fix: value and currency symbol alignment

* refactor: major refactor

* fix: image and formula

* fix: backround on label input (active) and link on synthetic

* fix: wrong text on swap-forex formula

* fix: text content on swap-forex

* fix: tab selector

* fix: add color blues

* fix: icons

* fix: add alt on icons

* fix:refactor codes

Co-authored-by: sara-fs <[email protected]>
Co-authored-by: sara-fs <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: sean-binary <[email protected]>
Co-authored-by: mustofa-binary <[email protected]>
Co-authored-by: Mustofa Ghaleb Amami (Front End) <[email protected]>
mustofa-binary added a commit that referenced this pull request Dec 1, 2020
* Sara / Update commission text (#1132)

* Removed up to

* Removed up to from who-can-apply

Co-authored-by: sara-fs <[email protected]>

* Kevin/Update multiplier content (#1134)

* feat:update multiplier content

* fix:resolve PR comments

* fix:Qa comments

* fix:Qa comments #2

* fix:qa comments #3

* fix:qa issues

* fix: Qa comments

* update: image and fix qa comments

* fix:margin problem on text

* update: messages.json ( translation:extract )

Co-authored-by: Kevin <[email protected]>

* fix: updated text for UK and non-UK clients (#1146)

* text:update eu footer content (#1141)

Co-authored-by: Kevin <[email protected]>

* text:add apostrophe on option description (#1120)

Co-authored-by: Kevin <[email protected]>

* text: update hero content (#1139)

Co-authored-by: Kevin <[email protected]>

* translate:extract upload download

* translate: download

* translate: download chinese

* amam/add_fiat_onramp (#1164)

* feat: add onramp payment methods

* update: hide wyre and xanpool for now

Co-authored-by: mustofa-binary <[email protected]>

* translate: download

* feat: trader-tools-page-calculators

* feat: handleError onclick for X icon

* fix:PR#1

* Fix:PR comments#2

* fix:PR - make use of Flex component instead of div

* fix: handle error, and buttond default disabled

* Fix: Qa comments #4 & add symbols

* fix: update validation text

* fix:margin to show decimal if necessary

* fix: minor styling

* remove: unecessary duplicate validation

* fix:PR comments : update validation, and styling

* fix: code review

* update:dropdown

* fix qa comments

* improve: styling and fix qa comment

* fix: max 2 digit decimals input, refactor validation, calculate bug

* fix: placeholder issue

* fix: placeholder issue

* fix: issue 35,36,37

* fix: issue 35,36,37

* remove: max 2 input decimal

* resolve: qa comments

* remove extra 0 on submit

* fix: qa comment focus on clicked error

* removed selected symbol dropdown

* resize font on smaller screen

* fix: different font for dropdown and input field

* fix:styling of subheader calculator

* add: scrollable margin value without showing scrollbar

* fix: border radius and scientific annotation removal on swap calc

* fix:different color in ios browser

* fix:different color in ios browser

* update: text area to flex

* fix: dropdown label on tab change, error on mozilla, color on safari

* fix: image for mobile version and remove some unused image & script

* added special case for step index, range break 100,200 on margin calculation

* fix: value and currency symbol alignment

* refactor: major refactor

* fix: image and formula

* fix: backround on label input (active) and link on synthetic

* fix: wrong text on swap-forex formula

* fix: text content on swap-forex

* fix: tab selector

* fix: add color blues

* fix: icons

* fix: add alt on icons

* fix:refactor codes

Co-authored-by: sara-fs <[email protected]>
Co-authored-by: sara-fs <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: sean-binary <[email protected]>
Co-authored-by: mustofa-binary <[email protected]>
Co-authored-by: Mustofa Ghaleb Amami (Front End) <[email protected]>
mustofa-binary added a commit that referenced this pull request Dec 1, 2020
* Kevin/ Add Tradertools page (calculators) (#1125)

* Sara / Update commission text (#1132)

* Removed up to

* Removed up to from who-can-apply

Co-authored-by: sara-fs <[email protected]>

* Kevin/Update multiplier content (#1134)

* feat:update multiplier content

* fix:resolve PR comments

* fix:Qa comments

* fix:Qa comments #2

* fix:qa comments #3

* fix:qa issues

* fix: Qa comments

* update: image and fix qa comments

* fix:margin problem on text

* update: messages.json ( translation:extract )

Co-authored-by: Kevin <[email protected]>

* fix: updated text for UK and non-UK clients (#1146)

* text:update eu footer content (#1141)

Co-authored-by: Kevin <[email protected]>

* text:add apostrophe on option description (#1120)

Co-authored-by: Kevin <[email protected]>

* text: update hero content (#1139)

Co-authored-by: Kevin <[email protected]>

* translate:extract upload download

* translate: download

* translate: download chinese

* amam/add_fiat_onramp (#1164)

* feat: add onramp payment methods

* update: hide wyre and xanpool for now

Co-authored-by: mustofa-binary <[email protected]>

* translate: download

* feat: trader-tools-page-calculators

* feat: handleError onclick for X icon

* fix:PR#1

* Fix:PR comments#2

* fix:PR - make use of Flex component instead of div

* fix: handle error, and buttond default disabled

* Fix: Qa comments #4 & add symbols

* fix: update validation text

* fix:margin to show decimal if necessary

* fix: minor styling

* remove: unecessary duplicate validation

* fix:PR comments : update validation, and styling

* fix: code review

* update:dropdown

* fix qa comments

* improve: styling and fix qa comment

* fix: max 2 digit decimals input, refactor validation, calculate bug

* fix: placeholder issue

* fix: placeholder issue

* fix: issue 35,36,37

* fix: issue 35,36,37

* remove: max 2 input decimal

* resolve: qa comments

* remove extra 0 on submit

* fix: qa comment focus on clicked error

* removed selected symbol dropdown

* resize font on smaller screen

* fix: different font for dropdown and input field

* fix:styling of subheader calculator

* add: scrollable margin value without showing scrollbar

* fix: border radius and scientific annotation removal on swap calc

* fix:different color in ios browser

* fix:different color in ios browser

* update: text area to flex

* fix: dropdown label on tab change, error on mozilla, color on safari

* fix: image for mobile version and remove some unused image & script

* added special case for step index, range break 100,200 on margin calculation

* fix: value and currency symbol alignment

* refactor: major refactor

* fix: image and formula

* fix: backround on label input (active) and link on synthetic

* fix: wrong text on swap-forex formula

* fix: text content on swap-forex

* fix: tab selector

* fix: add color blues

* fix: icons

* fix: add alt on icons

* fix:refactor codes

Co-authored-by: sara-fs <[email protected]>
Co-authored-by: sara-fs <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: sean-binary <[email protected]>
Co-authored-by: mustofa-binary <[email protected]>
Co-authored-by: Mustofa Ghaleb Amami (Front End) <[email protected]>

* Sean / fix: added KID notice (#1182)

* fix: added KID notice

* fix: added padding

* Sean / Landing page for DP2P (#1173)

* feat: [WIP]P2P landing page

* fix: mobile responsiveness for P2P page

* fix: navbar logo spacing for mobile

* fix: background image positioning

* fix: redirect links

* fix: reduced image file sizes

* fix: reducing media queries

* Replaced mobile prop with show component

* fix: button wording

* fix: copyright svg color to white

* revert last commit

* fix: white copyright svg

* fix: created v1 & v2 of DP2P page

* fix: fixed console errors and paddings & margins

* fix: button resizing

* fix: redirect links and adding new span link text component

* fix: blurry images and section margins

* fix: hero font sizes and margins

* fix: padding changes to reflect design

* fix: issues regarding mobile paddings and margins

* fix: issues with mobile design not matching

* fix: added show component to handle mobile hero background

* fix: redirect notice prompt

* fix: mobile header center align

* fix: redirecting before confirmation

* fix: redirecting before confirmation for EU

* fix: redirecting before confirmation for EU

* fix: redirecting before confirmation for EU

* fix: redirecting before confirmation for EU

* fix: redirecting before confirmation for EU

* fix: redirecting before confirmation for EU

* revert back to 3adbc50

* replaced p2p_v1 prop to general nav_type prop

Co-authored-by: Sean <[email protected]>

* translate: extract upload

* Sean / DP2P QR code (#1206)

* feat: add QR code and desktop copywriting

* moved p2p related assets into its own folder

* translate: extract, upload

* Matin/Add DP2P in Payment Method Page (#1204)

* Matin/Add DP2P in Payment Method Page

* Matin/Improvement: use Show component to separate Mobile and Desktop
* Use pixel inside media queries

* Matin/Fix/Improvement: Added mobileOsDetect
* Fix dp2p buttons size and misalignments
* Todo IOS os to redirect to apple store

Co-authored-by: matin-binary <[email protected]>

* translate: upload, extract dp2p payment method

* fix: image alt

* translate: download

* translate: download chinese

* translate: download fix zh cn and tw

* translate: download pl

* Sean/trading responsibly page not accessible (#1229)

* fix: refactor using svgr syntax

* Empty commit

* fix: update svg

* replace svg component with img element

* Sean/dp2p page translatation ui (#1232)

* fix: translation UI breaking

* responsive button sizes for all languages

* fix: translation UI breaking

* fix: translation UI breaking

* fix: translation UI breaking

* fix: banner header size to cater all languages

* translate: hotfix upload download

* translate: download hotfix

* feat: add p2p allowed country check for payment methods (#1239)

Co-authored-by: mustofa-binary <[email protected]>

* translate: download for calculator fix

Co-authored-by: Kevin <[email protected]>
Co-authored-by: sara-fs <[email protected]>
Co-authored-by: sara-fs <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: sean-binary <[email protected]>
Co-authored-by: mustofa-binary <[email protected]>
Co-authored-by: Sean <[email protected]>
Co-authored-by: matin-binary <[email protected]>
Co-authored-by: matin-binary <[email protected]>
mustofa-binary pushed a commit that referenced this pull request Jan 20, 2021
* feat: update ib contents and styling v1

* feat: fix all desktop styling except border radius for faqs, update all contents

* fix: header style for faq (radius)

* feat: mobile responsiveness #1

* fix: mobile responsiveness #2

* fix: responsiveness #3

* fix: deriv-ib new style

* fix: image

* fix: rebase and minor style

* fix: qa comments #1

* fix: margin

* fix: qa comments

* fix:qa comments

* fix: ios button problem

* fix: major QA issues

* fix: qa issues

* fix: nav responsiveness

* fix: padding on other browser

* fix: qa issuess

* fix: qa comments

* fix:symbol dot issue

* update: language switcher on top header, minor alignment

* fix: login

* ib-content:redeploy

* fix: rest of comments

* fix merge issue

* update: fix header issues

Co-authored-by: Kevin <[email protected]>
Co-authored-by: Kevin <[email protected]>
mustofa-binary pushed a commit that referenced this pull request Jan 25, 2021
* feat: update ib contents and styling v1

* feat: fix all desktop styling except border radius for faqs, update all contents

* fix: header style for faq (radius)

* feat: mobile responsiveness #1

* fix: mobile responsiveness #2

* fix: responsiveness #3

* fix: deriv-ib new style

* fix: image

* fix: rebase and minor style

* fix: qa comments #1

* fix: margin

* fix: qa comments

* fix:qa comments

* fix: ios button problem

* fix: major QA issues

* fix: qa issues

* fix: nav responsiveness

* fix: padding on other browser

* fix: qa issuess

* fix: qa comments

* fix:symbol dot issue

* update: language switcher on top header, minor alignment

* fix: login

* ib-content:redeploy

* fix: rest of comments

* fix merge issue

* update: fix header issues

Co-authored-by: Kevin <[email protected]>
Co-authored-by: Kevin <[email protected]>
mustofa-binary added a commit that referenced this pull request Feb 9, 2021
* Fixed CFD risk value (#1343)

Co-authored-by: Mahdi Aryayi <[email protected]>

* yashim/fix: update payment agents page (#1355)

* Updated payment agents page

* updated alt

* Abdalla/Add: new instruments to Markets->Forex->margin (#1309)

* Add: new instruments to Markets->Forex->margin

* Replace: rem -> px

* Fix: USD/JPY in major pairs

* translate: new ru

* update:story and partner numbers jan 2021 (#1345)

* fix:trading signal add dot (#1314)

* feat:calc remove is before formula (#1341)

* Kevin/update ib contents (#1199)

* feat: update ib contents and styling v1

* feat: fix all desktop styling except border radius for faqs, update all contents

* fix: header style for faq (radius)

* feat: mobile responsiveness #1

* fix: mobile responsiveness #2

* fix: responsiveness #3

* fix: deriv-ib new style

* fix: image

* fix: rebase and minor style

* fix: qa comments #1

* fix: margin

* fix: qa comments

* fix:qa comments

* fix: ios button problem

* fix: major QA issues

* fix: qa issues

* fix: nav responsiveness

* fix: padding on other browser

* fix: qa issuess

* fix: qa comments

* fix:symbol dot issue

* update: language switcher on top header, minor alignment

* fix: login

* ib-content:redeploy

* fix: rest of comments

* fix merge issue

* update: fix header issues

Co-authored-by: Kevin <[email protected]>
Co-authored-by: Kevin <[email protected]>

* translate: download (#1370)

Co-authored-by: sean-binary <[email protected]>

* Suthesh/multiplier page (#1323)

* added available trading instruments(wip)

* added forex and synthetic tabs in multiplier page

* updated content for available trades for multipliers section

* Suthesh/margin trading page update (#1208)

* modified margin trading page (wip)

* completed updating margin trading page

* fix image size and position

* fix image layout

* suthesh/fix-seo-description (#1216)

* update seo descriptions, title and remove keywords tag from all pages

* fix seo description in help centre

* translate: new crowdin texts

* translate: after rebase extract, upload, download

* translate: download for regression

* fix: footer texts

* change inc to clean resource

* Kevin/ hotfix ib page fixes (#1403)

* hotfix for ib content

* refactor: dev comments

* yashim/hotfix: removed extra language switcher & Resources link at partner navbar (#1401)

* Fixed - removed extra language switcher at navbar

Co-authored-by: Yashim Wong <[email protected]>

* Removed Resources Link

Co-authored-by: Yashim Wong <[email protected]>

Co-authored-by: Yashim Wong <[email protected]>

* fix: tab headers breaking for certain languages (#1406)

Co-authored-by: sean-binary <[email protected]>

* Reverted layout changes (#1412)

Co-authored-by: Yashim Wong <[email protected]>

Co-authored-by: Yashim Wong <[email protected]>

* Kevin/Hotfix: ib programme card content translation (#1418)

* fix: ib content translation

* fix: qa comments

* fix: margin

* fix: button for indonesian language - sign up

* fix: button for indonesian language - sign up

* button text and ru comission

* fix: button for ru on smaller screen

Co-authored-by: Mahdi Aryayi <[email protected]>
Co-authored-by: Mahdi Aryayi <[email protected]>
Co-authored-by: yashim-deriv <[email protected]>
Co-authored-by: Abdalla Mourad <[email protected]>
Co-authored-by: mustofa-binary <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: Kevin <[email protected]>
Co-authored-by: sean-binary <[email protected]>
Co-authored-by: sean-binary <[email protected]>
Co-authored-by: Suthesan Kanagasabai <[email protected]>
Co-authored-by: Yashim Wong <[email protected]>
khalid-deriv added a commit to khalid-deriv/deriv-com that referenced this pull request Dec 21, 2021
prince-deriv added a commit that referenced this pull request May 8, 2022
NikitK-deriv referenced this pull request in NikitK-deriv/deriv-com Dec 1, 2022
mayuran-deriv referenced this pull request in mayuran-deriv/deriv-com May 22, 2023
fix: common component instrumental table
konstantinosG-deriv pushed a commit to konstantinosG-deriv/deriv-com that referenced this pull request May 26, 2023
mayuran-deriv referenced this pull request in mayuran-deriv/deriv-com Jun 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants